update input API

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit e6edcbcfa584 · 2014-02-21T15:48:44.000+01:00
diff --git a/src/AvTranscoder/InputFile.cpp b/src/AvTranscoder/InputFile.cpp
@@ -42,6 +42,11 @@ InputFile::InputFile( const std::string& filename )
 		m_formatContext = NULL;
 		throw std::runtime_error( "unable to find stream informations" );
 	}
+
+	for( size_t streamIndex = 0; streamIndex < m_formatContext->nb_streams; ++streamIndex )
+	{
+		m_inputStreams.push_back( InputStream( m_filename, streamIndex ) );
+	}
 }
 
 InputFile::~InputFile()
@@ -118,9 +123,9 @@ InputFile& InputFile::analyse()
 	return *this;
 }
 
-InputStream InputFile::getStream( size_t index )
+InputStream& InputFile::getStream( size_t index )
 {
-	return InputStream( m_filename, index );
+	return m_inputStreams.at( index );
 }
 
 }
diff --git a/src/AvTranscoder/InputFile.hpp b/src/AvTranscoder/InputFile.hpp
@@ -29,15 +29,16 @@ class InputFile
 	// *** Metadatas section ***
 	// run the analyse on the file after a setup.
 	InputFile& analyse();
-	// get properties on the file
+	/// get file properties
 	const Properties& getProperties() const { return m_properties; }
 
-	InputStream getStream( size_t index );
+	InputStream& getStream( size_t index );
 
 protected:
-	AVFormatContext* m_formatContext;
-	Properties       m_properties;
-	std::string      m_filename;
+	AVFormatContext*         m_formatContext;
+	Properties               m_properties;
+	std::string              m_filename;
+	std::vector<InputStream> m_inputStreams;
 };
 
 }
diff --git a/src/AvTranscoder/InputStream.cpp b/src/AvTranscoder/InputStream.cpp
@@ -38,16 +38,22 @@ bool InputStream::readNextPacket( DataStream& data ) const
 	AVPacket packet;
 	av_init_packet( &packet );
 
-	readNextPacket( packet );
-
-	// is it possible to remove this copy ?
-	// using : av_packet_unref ?
-	data.getBuffer().resize( packet.size );
-	memcpy( data.getPtr(), packet.data, packet.size );
+	if( readNextPacket( packet ) )
+	{
+		// is it possible to remove this copy ?
+		// using : av_packet_unref ?
+		data.getBuffer().resize( packet.size );
+		if( packet.size != 0 )
+			memcpy( data.getPtr(), packet.data, packet.size );
+	}
+	else
+	{
+		data.getBuffer().resize( 0 );
+	}
 
 	av_free_packet( &packet );
 
-	return true;
+	return data.getBuffer().size() != 0;
 }
 
 bool InputStream::readNextPacket( AVPacket& packet ) const
@@ -66,6 +72,11 @@ bool InputStream::readNextPacket( AVPacket& packet ) const
 		{
 			return true;
 		}
+
+		// do not delete these 2 lines
+		// need to skip packet, delete this one and re-init for reading the next one
+		av_free_packet( &packet );
+		av_init_packet( &packet );
 	}
 }
 
diff --git a/src/AvTranscoder/InputStream.hpp b/src/AvTranscoder/InputStream.hpp
@@ -54,7 +54,7 @@ class InputStream
 
 private:
 	AVFormatContext* m_formatContext;
-	const size_t     m_streamIndex;
+	size_t           m_streamIndex;
 };
 
 }
diff --git a/src/AvTranscoder/InputStreamVideo.cpp b/src/AvTranscoder/InputStreamVideo.cpp
@@ -64,7 +64,7 @@ InputStreamVideo::~InputStreamVideo()
 	}
 	if( m_frame != NULL )
 	{
-		//av_frame_free( &m_frame );
+		av_frame_free( &m_frame );
 		m_frame = NULL;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,11 @@ InputFile::InputFile( const std::string& filename )`
`42`	`42`	`m_formatContext = NULL;`
`43`	`43`	`throw std::runtime_error( "unable to find stream informations" );`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+ for( size_t streamIndex = 0; streamIndex < m_formatContext->nb_streams; ++streamIndex )`
	`47`	`+ {`
	`48`	`+ m_inputStreams.push_back( InputStream( m_filename, streamIndex ) );`
	`49`	`+ }`
`45`	`50`	`}`
`46`	`51`
`47`	`52`	`InputFile::~InputFile()`
`@@ -118,9 +123,9 @@ InputFile& InputFile::analyse()`
`118`	`123`	`return *this;`
`119`	`124`	`}`
`120`	`125`
`121`		`-InputStream InputFile::getStream( size_t index )`
	`126`	`+InputStream& InputFile::getStream( size_t index )`
`122`	`127`	`{`
`123`		`- return InputStream( m_filename, index );`
	`128`	`+ return m_inputStreams.at( index );`
`124`	`129`	`}`
`125`	`130`
`126`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class InputStream`
`54`	`54`
`55`	`55`	`private:`
`56`	`56`	`AVFormatContext* m_formatContext;`
`57`		`- const size_t m_streamIndex;`
	`57`	`+ size_t m_streamIndex;`
`58`	`58`	`};`
`59`	`59`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ InputStreamVideo::~InputStreamVideo()`
`64`	`64`	`}`
`65`	`65`	`if( m_frame != NULL )`
`66`	`66`	`{`
`67`		`- //av_frame_free( &m_frame );`
	`67`	`+ av_frame_free( &m_frame );`
`68`	`68`	`m_frame = NULL;`
`69`	`69`	`}`
`70`	`70`	`}`