OutputStreamAudio: overlay encodeFrame

Clement Champetier · Clement Champetier · commit 3a719d02f4e1 · 2014-06-03T18:16:04.000+02:00
* This new function gets delayed encoded frames.
* Rewrapper: call this new function.
diff --git a/app/audioRewrapper/audioRewrapper.cpp b/app/audioRewrapper/audioRewrapper.cpp
@@ -100,6 +100,8 @@ void transcodeAudio( const char* inputfilename, const char* outputFilename )
 	}
 	std::cout << std::endl;
 	
+	outputStreamAudio.encodeFrame( codedFrame );
+
 	outputFile.endWrap();
 }
 
diff --git a/src/AvTranscoder/OutputStreamAudio.cpp b/src/AvTranscoder/OutputStreamAudio.cpp
@@ -101,7 +101,12 @@ bool OutputStreamAudio::encodeFrame( const AudioFrame& decodedFrame, DataStream&
 		memcpy( codedFrame.getPtr(), packet.data, packet.size );
 	}
 #else
-	// throw...
+	int ret = avcodec_encode_audio( codecContext, packet.data, packet.size, frame );
+	if( ret > 0 )
+	{
+		codedFrame.getBuffer().resize( packet.size );
+		memcpy( codedFrame.getPtr(), packet.data, packet.size );
+	}
 #endif
 	
 	av_free_packet( &packet );
@@ -120,4 +125,39 @@ bool OutputStreamAudio::encodeFrame( const AudioFrame& decodedFrame, DataStream&
 	return ret == 0;
 }
 
+bool OutputStreamAudio::encodeFrame( DataStream& codedFrame )
+{
+	AVCodecContext* codecContext = m_audioDesc.getCodecContext();
+
+	AVPacket packet;
+	av_init_packet( &packet );
+	
+	packet.size = 0;
+	packet.data = NULL;
+	packet.stream_index = 0;
+
+#if LIBAVCODEC_VERSION_MAJOR > 53
+	int gotPacket = 0;
+	int ret = avcodec_encode_audio2( codecContext, &packet, NULL, &gotPacket );
+	if( ret == 0 && gotPacket == 1 )
+	{
+		codedFrame.getBuffer().resize( packet.size );
+		memcpy( codedFrame.getPtr(), packet.data, packet.size );
+	}
+	av_free_packet( &packet );
+	return ret == 0 && gotPacket == 1;
+
+#else
+	int ret = avcodec_encode_audio( codecContext, packet.data, packet.size, NULL );
+	if( ret > 0 )
+	{
+		codedFrame.getBuffer().resize( packet.size );
+		memcpy( codedFrame.getPtr(), packet.data, packet.size );
+	}
+	av_free_packet( &packet );
+	return ret == 0;
+
+#endif
+}
+
 }
diff --git a/src/AvTranscoder/OutputStreamAudio.hpp b/src/AvTranscoder/OutputStreamAudio.hpp
@@ -24,7 +24,7 @@ class OutputStreamAudio : public OutputStream
 	/**
 	 * get delayed encoded frames
 	 */
-	//bool encodeFrame( DataStream& codedFrame );
+	bool encodeFrame( DataStream& codedFrame );
 	
 	AudioDesc& getAudioDesc() { return m_audioDesc; }
 

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,8 @@ void transcodeAudio( const char* inputfilename, const char* outputFilename )`
`100`	`100`	`}`
`101`	`101`	`std::cout << std::endl;`
`102`	`102`
	`103`	`+ outputStreamAudio.encodeFrame( codedFrame );`
	`104`	`+`
`103`	`105`	`outputFile.endWrap();`
`104`	`106`	`}`
`105`	`107`