pass stream not codecCtx to decoders

Author: havlenapetr

jni/libmediaplayer/decoder.cpp

@@ -3,9 +3,10 @@
 
 #define TAG "FFMpegIDecoder"
 
-IDecoder::IDecoder()
+IDecoder::IDecoder(AVStream* stream)
 {
 	mQueue = new PacketQueue();
+	mStream = stream;
 }
 
 IDecoder::~IDecoder()
@@ -58,13 +59,12 @@ int IDecoder::wait()
 void IDecoder::stop()
 {
     mQueue->abort();
-    __android_log_print(ANDROID_LOG_INFO, TAG, "waiting on end of audio IDecoder");
+    __android_log_print(ANDROID_LOG_INFO, TAG, "waiting on end of decoder thread");
     int ret = -1;
     if((ret = wait()) != 0) {
         __android_log_print(ANDROID_LOG_ERROR, TAG, "Couldn't cancel audio IDecoder: %i", ret);
         return;
     }
-    __android_log_print(ANDROID_LOG_INFO, TAG, "audio IDecoder ended");
 }
 
 void* IDecoder::startDecoding(void* ptr)
@@ -74,6 +74,7 @@ void* IDecoder::startDecoding(void* ptr)
 	decoder->mDecoding = true;
     decoder->decode(ptr);
 	decoder->mDecoding = false;
+	__android_log_print(ANDROID_LOG_INFO, TAG, "decoder thread ended");
 }
 
 bool IDecoder::prepare(const char *err)

jni/libmediaplayer/decoder.h

@@ -15,7 +15,7 @@ extern "C" {
 class IDecoder
 {
 public:
-	IDecoder();
+	IDecoder(AVStream* stream);
 	~IDecoder();
 
 	bool						start(const char* err);
@@ -27,7 +27,8 @@ class IDecoder
 
 protected:
     PacketQueue*                mQueue;
-    AVCodecContext*             mCodecCtx;
+    AVStream*             		mStream;
+    AVCodecContext*				mCodecCtx;
     bool                        mDecoding;
     pthread_t                   mThread;
 

jni/libmediaplayer/decoder_audio.cpp

@@ -5,10 +5,9 @@
 
 #define TAG "FFMpegAudioDecoder"
 
-DecoderAudio::DecoderAudio(AVCodecContext*            codec_ctx,
-						   struct DecoderAudioConfig* config)
+DecoderAudio::DecoderAudio(AVStream*            		stream,
+						   struct DecoderAudioConfig* 	config)  : IDecoder(stream)
 {
-    mCodecCtx = codec_ctx; 
     mConfig = config;
 }
 
@@ -42,7 +41,7 @@ bool DecoderAudio::prepare(const char *err)
 bool DecoderAudio::process(AVPacket *packet)
 {
     int size = mSamplesSize;
-    int len = avcodec_decode_audio3(mCodecCtx, mSamples, &size, packet);
+    int len = avcodec_decode_audio3(mStream->codec, mSamples, &size, packet);
     if(Output::AudioDriver_write(mSamples, size) <= 0) {
         return false;
     }

jni/libmediaplayer/decoder_audio.h

@@ -14,7 +14,7 @@ struct DecoderAudioConfig
 class DecoderAudio : public IDecoder
 {
 public:
-    DecoderAudio(AVCodecContext*            codec_ctx,
+    DecoderAudio(AVStream*            		stream,
                  struct DecoderAudioConfig* config);
 
     ~DecoderAudio();

jni/libmediaplayer/decoder_video.cpp

@@ -10,9 +10,9 @@ extern "C" {
 #define TAG "FFMpegVideoDecoder"
 
 DecoderVideo::DecoderVideo(AVCodecContext*				codec_ctx,
-						   struct DecoderVideoConfig*	config)
+						   struct DecoderVideoConfig*	config) : IDecoder(NULL)
 {
-    mCodecCtx = codec_ctx; 
+    mCodecCtx = codec_ctx;
 	mConfig = config;
 }
 

jni/libmediaplayer/mediaplayer.cpp

@@ -361,7 +361,8 @@ void MediaPlayer::decodeMovie(void* ptr)
 	cfg.sampleRate = mFFmpegStorage.audio.codec_ctx->sample_rate;
 	cfg.format = PCM_16_BIT;
 	cfg.channels = (mFFmpegStorage.audio.codec_ctx->channels == 2) ? CHANNEL_OUT_STEREO : CHANNEL_OUT_MONO;
-	mDecoderAudio = new DecoderAudio(mFFmpegStorage.audio.codec_ctx, &cfg);
+	AVStream* stream = mFFmpegStorage.pFormatCtx->streams[mFFmpegStorage.audio.stream];
+	mDecoderAudio = new DecoderAudio(stream, &cfg);
 	if(!mDecoderAudio->startAsync(err))
 	{
 		__android_log_print(ANDROID_LOG_INFO, TAG, "Couldn't start audio decoder: %s", err);