InputFile: into readNextPacket, return expected data (instead of caching it)

Valentin Noel · Valentin Noel · commit 342608247c76 · 2014-12-03T19:10:27.000+01:00
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -144,7 +144,7 @@ AvInputStream& InputFile::getStream( size_t index )
 	return *_inputStreams.at( index );
 }
 
-bool InputFile::readNextPacket( const size_t streamIndex )
+bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )
 {
 	AVPacket packet;
 	av_init_packet( &packet );
@@ -157,15 +157,21 @@ bool InputFile::readNextPacket( const size_t streamIndex )
 			return false;
 		}
 
-		// send packet to stream buffer
-		_inputStreams.at( packet.stream_index )->addPacket( packet );
-
-		// We only read one stream and skip others
+		// if the packet stream is the expected one
+		// copy and return the packet data
 		if( packet.stream_index == (int)streamIndex )
 		{
+			data.getBuffer().resize( packet.size );
+			if( packet.size != 0 )
+				memcpy( data.getPtr(), packet.data, packet.size );
 			av_free_packet( &packet );
 			return true;
 		}
+		// else add the packet data to the stream cache
+		else
+		{
+			_inputStreams.at( packet.stream_index )->addPacket( packet );
+		}
 
 		// do not delete these 2 lines
 		// need to skip packet, delete this one and re-init for reading the next one
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -86,16 +86,17 @@ class AvExport InputFile
 	AVFormatContext& getFormatContext() const { return *_formatContext; }
 
 	/**
-	 * @brief Read the next packet for the specified stream
-	 * @note For performances, each readed stream needs to be bufferized using the readStream() method.
-	 * @return if next packet was succefully readed
+	 * @brief Read the next packet of the specified stream
+	 * @param data: data of next packet read
+	 * @note For performances, each read stream needs to be bufferized using the readStream() method.
+	 * @return if next packet was succefully read
 	 **/
-	bool readNextPacket( const size_t streamIndex );
+	bool readNextPacket( CodedData& data, const size_t streamIndex );
 
 	/**
 	 * @brief Seek input stream at specified frame
 	 * @note clean also buffers in each InputStream
-	 * @return if next packet was succefully readed
+	 * @return if next packet was succefully read
 	 **/
 	void seekAtFrame( const size_t frame );
 
