working video decoder callback

Author: havlenapetr

jni/libmediaplayer/decoder_video.cpp

@@ -1,12 +1,6 @@
 #include <android/log.h>
 #include "decoder_video.h"
 
-#include "output.h"
-
-extern "C" {
-#include "libswscale/swscale.h"
-} // end of extern C
-
 #define TAG "FFMpegVideoDecoder"
 
 static uint64_t global_video_pkt_pts = AV_NOPTS_VALUE;
@@ -23,51 +17,10 @@ DecoderVideo::~DecoderVideo()
 
 bool DecoderVideo::prepare()
 {
-	void*		pixels;
-	
 	mFrame = avcodec_alloc_frame();
 	if (mFrame == NULL) {
-		//err = "Couldn't allocate mFrame";
-		return false;
-	}
-	
-	mTempFrame = avcodec_alloc_frame();
-	if (mTempFrame == NULL) {
-		//err = "Couldn't allocate mTempFrame";
-		return false;
-	}
-
-	mConvertCtx = sws_getContext(mStream->codec->width,
-								 mStream->codec->height,
-								 mStream->codec->pix_fmt,
-								 mStream->codec->width,
-								 mStream->codec->height,
-								 PIX_FMT_RGB565,
-								 SWS_POINT,
-								 NULL,
-								 NULL,
-								 NULL);
-	if (mConvertCtx == NULL) {
-		//err = "Couldn't allocate mConvertCtx";
-		return false;
-	}
-
-	if(Output::VideoDriver_getPixels(mStream->codec->width,
-									 mStream->codec->height,
-									 &pixels) != ANDROID_SURFACE_RESULT_SUCCESS) {
-		//err = "Couldn't get pixels from android surface wrapper";
 		return false;
 	}
-	
-	// Assign appropriate parts of buffer to image planes in pFrameRGB
-	// Note that pFrameRGB is an AVFrame, but AVFrame is a superset
-	// of AVPicture
-	avpicture_fill((AVPicture *) mFrame, 
-				   (uint8_t *)pixels, 
-				   PIX_FMT_RGB565, 
-				   mStream->codec->width,
-				   mStream->codec->height);
-	
 	return true;
 }
 
@@ -97,14 +50,14 @@ bool DecoderVideo::process(AVPacket *packet)
 
 	// Decode video frame
 	avcodec_decode_video(mStream->codec,
-						 mTempFrame,
+						 mFrame,
 						 &completed,
 						 packet->data, 
 						 packet->size);
 
-	if (packet->dts == AV_NOPTS_VALUE && mTempFrame->opaque
-			&& *(uint64_t*) mTempFrame->opaque != AV_NOPTS_VALUE) {
-		pts = *(uint64_t *) mTempFrame->opaque;
+	if (packet->dts == AV_NOPTS_VALUE && mFrame->opaque
+			&& *(uint64_t*) mFrame->opaque != AV_NOPTS_VALUE) {
+		pts = *(uint64_t *) mFrame->opaque;
 	} else if (packet->dts != AV_NOPTS_VALUE) {
 		pts = packet->dts;
 	} else {
@@ -113,20 +66,10 @@ bool DecoderVideo::process(AVPacket *packet)
 	pts *= av_q2d(mStream->time_base);
 
 	if (completed) {
-		pts = synchronize(mTempFrame, pts);
+		pts = synchronize(mFrame, pts);
 
-		//onDecode(frame, pts);
+		onDecode(mFrame, pts);
 
-		// Convert the image from its native format to RGB
-		sws_scale(mConvertCtx,
-			      mTempFrame->data,
-			      mTempFrame->linesize,
-				  0,
-				  mStream->codec->height,
-				  mFrame->data,
-				  mFrame->linesize);
-
-		Output::VideoDriver_updateSurface();
 		return true;
 	}
 	return false;
@@ -158,8 +101,6 @@ bool DecoderVideo::decode(void* ptr)
 
     // Free the RGB image
     av_free(mFrame);
-    // Free the RGB image
-    av_free(mTempFrame);
 
     return true;
 }

jni/libmediaplayer/decoder_video.h

@@ -15,8 +15,6 @@ class DecoderVideo : public IDecoder
 
 private:
 	AVFrame*					mFrame;
-	AVFrame*					mTempFrame;
-	struct SwsContext*			mConvertCtx;
 	double						mVideoClock;
 
     bool                        prepare();

jni/libmediaplayer/mediaplayer.cpp

@@ -112,8 +112,9 @@ status_t MediaPlayer::prepareVideo()
 		return INVALID_OPERATION;
 	}
 
+	AVStream* stream = mMovieFile->streams[mVideoStreamIndex];
 	// Get a pointer to the codec context for the video stream
-	AVCodecContext* codec_ctx = mMovieFile->streams[mVideoStreamIndex]->codec;
+	AVCodecContext* codec_ctx = stream->codec;
 	AVCodec* codec = avcodec_find_decoder(codec_ctx->codec_id);
 	if (codec == NULL) {
 		return INVALID_OPERATION;
@@ -128,6 +129,41 @@ status_t MediaPlayer::prepareVideo()
 	mVideoHeight = codec_ctx->height;
 	mDuration =  mMovieFile->duration;
 
+	mConvertCtx = sws_getContext(stream->codec->width,
+								 stream->codec->height,
+								 stream->codec->pix_fmt,
+								 stream->codec->width,
+								 stream->codec->height,
+								 PIX_FMT_RGB565,
+								 SWS_POINT,
+								 NULL,
+								 NULL,
+								 NULL);
+
+	if (mConvertCtx == NULL) {
+		return INVALID_OPERATION;
+	}
+
+	void*		pixels;
+	if (Output::VideoDriver_getPixels(stream->codec->width,
+									  stream->codec->height,
+									  &pixels) != ANDROID_SURFACE_RESULT_SUCCESS) {
+		return INVALID_OPERATION;
+	}
+
+	mFrame = avcodec_alloc_frame();
+	if (mFrame == NULL) {
+		return INVALID_OPERATION;
+	}
+	// Assign appropriate parts of buffer to image planes in pFrameRGB
+	// Note that pFrameRGB is an AVFrame, but AVFrame is a superset
+	// of AVPicture
+	avpicture_fill((AVPicture *) mFrame,
+				   (uint8_t *) pixels,
+				   PIX_FMT_RGB565,
+				   stream->codec->width,
+				   stream->codec->height);
+
 	return NO_ERROR;
 }
 
@@ -248,23 +284,16 @@ bool MediaPlayer::shouldCancel(PacketQueue* queue)
 
 void MediaPlayer::decode(AVFrame* frame, double pts)
 {
-	/*
-	AVFrame* buffFrame = avcodec_alloc_frame();
-	if (frame == NULL) {
-		return false;
-	}
-
 	// Convert the image from its native format to RGB
-	sws_scale(mConvertCtx,
-			  frame->data,
-			  frame->linesize,
+	sws_scale(sPlayer->mConvertCtx,
+		      frame->data,
+		      frame->linesize,
 			  0,
-			  mStream->codec->height,
-			  buffFrame->data,
-			  buffFrame->linesize);
+			  sPlayer->mVideoHeight,
+			  sPlayer->mFrame->data,
+			  sPlayer->mFrame->linesize);
 
 	Output::VideoDriver_updateSurface();
-	*/
 }
 
 void MediaPlayer::decode(int16_t* buffer, int buffer_size)

jni/libmediaplayer/mediaplayer.h

@@ -165,6 +165,8 @@ class MediaPlayer
     int 						mVideoStreamIndex;
     DecoderAudio*				mDecoderAudio;
 	DecoderVideo*             	mDecoderVideo;
+	AVFrame*					mFrame;
+	struct SwsContext*			mConvertCtx;
 
     void*                       mCookie;
     media_player_states         mCurrentState;