move all playback stuff to mediaplayer class

havlenapetr · havlenapetr · commit ce60158a5cac · 2010-08-05T13:14:07.000+02:00
diff --git a/jni/libmediaplayer/decoder_audio.cpp b/jni/libmediaplayer/decoder_audio.cpp
@@ -1,8 +1,6 @@
 #include <android/log.h>
 #include "decoder_audio.h"
 
-#include "output.h"
-
 #define TAG "FFMpegAudioDecoder"
 
 DecoderAudio::DecoderAudio(AVStream* stream) : IDecoder(stream)
@@ -20,30 +18,16 @@ bool DecoderAudio::prepare()
     if(mSamples == NULL) {
     	return false;
     }
-
-    if(Output::AudioDriver_set(MUSIC,
-							   mStream->codec->sample_rate,
-							   PCM_16_BIT,
-							   (mStream->codec->channels == 2) ?
-									   CHANNEL_OUT_STEREO : CHANNEL_OUT_MONO) != ANDROID_AUDIOTRACK_RESULT_SUCCESS)
-    {
-       //err = "Couldnt' set audio track";
-       return false;
-    }
-    if(Output::AudioDriver_start() != ANDROID_AUDIOTRACK_RESULT_SUCCESS) {
-       //err = "Couldnt' start audio track";
-       return false;
-    }
     return true;
 }
 
 bool DecoderAudio::process(AVPacket *packet)
 {
     int size = mSamplesSize;
     int len = avcodec_decode_audio3(mStream->codec, mSamples, &size, packet);
-    if(Output::AudioDriver_write(mSamples, size) <= 0) {
-        return false;
-    }
+
+    onDecode(mSamples, size);
+
     return true;
 }
 
@@ -71,8 +55,6 @@ bool DecoderAudio::decode(void* ptr)
 
     __android_log_print(ANDROID_LOG_INFO, TAG, "decoding audio ended");
 
-    Output::AudioDriver_unregister();
-
     // Free audio samples buffer
     av_free(mSamples);
     return true;
diff --git a/jni/libmediaplayer/decoder_audio.h b/jni/libmediaplayer/decoder_audio.h
@@ -3,13 +3,17 @@
 
 #include "decoder.h"
 
+typedef void (*AudioDecodingHandler) (int16_t*,int);
+
 class DecoderAudio : public IDecoder
 {
 public:
     DecoderAudio(AVStream* stream);
 
     ~DecoderAudio();
 
+    AudioDecodingHandler		onDecode;
+
 private:
     int16_t*                    mSamples;
     int                         mSamplesSize;
diff --git a/jni/libmediaplayer/decoder_video.cpp b/jni/libmediaplayer/decoder_video.cpp
@@ -94,7 +94,7 @@ bool DecoderVideo::process(AVPacket *packet)
 {
     int	completed;
     int pts = 0;
-	
+
 	// Decode video frame
 	avcodec_decode_video(mStream->codec,
 						 mTempFrame,
@@ -114,6 +114,9 @@ bool DecoderVideo::process(AVPacket *packet)
 
 	if (completed) {
 		pts = synchronize(mTempFrame, pts);
+
+		//onDecode(frame, pts);
+
 		// Convert the image from its native format to RGB
 		sws_scale(mConvertCtx,
 			      mTempFrame->data,
diff --git a/jni/libmediaplayer/decoder_video.h b/jni/libmediaplayer/decoder_video.h
@@ -3,12 +3,16 @@
 
 #include "decoder.h"
 
+typedef void (*VideoDecodingHandler) (AVFrame*,double);
+
 class DecoderVideo : public IDecoder
 {
 public:
     DecoderVideo(AVStream* stream);
     ~DecoderVideo();
 
+    VideoDecodingHandler		onDecode;
+
 private:
 	AVFrame*					mFrame;
 	AVFrame*					mTempFrame;
diff --git a/jni/libmediaplayer/mediaplayer.cpp b/jni/libmediaplayer/mediaplayer.cpp
@@ -66,9 +66,10 @@ status_t MediaPlayer::prepareAudio()
 	if (mAudioStreamIndex == -1) {
 		return INVALID_OPERATION;
 	}
-	
+
+	AVStream* stream = mMovieFile->streams[mAudioStreamIndex];
 	// Get a pointer to the codec context for the video stream
-	AVCodecContext* codec_ctx = mMovieFile->streams[mAudioStreamIndex]->codec;
+	AVCodecContext* codec_ctx = stream->codec;
 	AVCodec* codec = avcodec_find_decoder(codec_ctx->codec_id);
 	if (codec == NULL) {
 		return INVALID_OPERATION;
@@ -78,6 +79,20 @@ status_t MediaPlayer::prepareAudio()
 	if (avcodec_open(codec_ctx, codec) < 0) {
 		return INVALID_OPERATION;
 	}
+
+	// prepare os output
+	if (Output::AudioDriver_set(MUSIC,
+								stream->codec->sample_rate,
+								PCM_16_BIT,
+								(stream->codec->channels == 2) ? CHANNEL_OUT_STEREO
+										: CHANNEL_OUT_MONO) != ANDROID_AUDIOTRACK_RESULT_SUCCESS) {
+		return INVALID_OPERATION;
+	}
+
+	if (Output::AudioDriver_start() != ANDROID_AUDIOTRACK_RESULT_SUCCESS) {
+		return INVALID_OPERATION;
+	}
+
 	return NO_ERROR;
 }
 
@@ -179,6 +194,9 @@ status_t MediaPlayer::suspend() {
 	
 	// Close the video file
 	av_close_input_file(mMovieFile);
+
+	Output::AudioDriver_unregister();
+
     return NO_ERROR;
 }
 
@@ -223,18 +241,49 @@ bool MediaPlayer::shouldCancel(PacketQueue* queue)
                         frames = 0;
                 }
                 frames++;
-                */
+
+               */
+
+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,
+			  0,
+			  mStream->codec->height,
+			  buffFrame->data,
+			  buffFrame->linesize);
+
+	Output::VideoDriver_updateSurface();
+	*/
+}
+
+void MediaPlayer::decode(int16_t* buffer, int buffer_size)
+{
+	if(Output::AudioDriver_write(buffer, buffer_size) <= 0) {
+		__android_log_print(ANDROID_LOG_ERROR, TAG, "Couldn't write samples to audio track");
+	}
+}
 
 void MediaPlayer::decodeMovie(void* ptr)
 {
 	AVPacket pPacket;
 	
 	AVStream* stream_audio = mMovieFile->streams[mAudioStreamIndex];
 	mDecoderAudio = new DecoderAudio(stream_audio);
+	mDecoderAudio->onDecode = decode;
 	mDecoderAudio->startAsync();
 	
 	AVStream* stream_video = mMovieFile->streams[mVideoStreamIndex];
 	mDecoderVideo = new DecoderVideo(stream_video);
+	mDecoderVideo->onDecode = decode;
 	mDecoderVideo->startAsync();
 	
 	mCurrentState = MEDIA_PLAYER_STARTED;
diff --git a/jni/libmediaplayer/mediaplayer.h b/jni/libmediaplayer/mediaplayer.h
@@ -147,6 +147,10 @@ class MediaPlayer
 	bool						shouldCancel(PacketQueue* queue);
 	static void					ffmpegNotify(void* ptr, int level, const char* fmt, va_list vl);
 	static void*				startPlayer(void* ptr);
+
+	static void 				decode(AVFrame* frame, double pts);
+	static void 				decode(int16_t* buffer, int buffer_size);
+
 	void						decodeMovie(void* ptr);
 	
 	double 						mTime;
