add output class which handles access to system audio and video drivers

Author: havlenapetr

jni/include/drivers_map.h

@@ -10,6 +10,7 @@ LOCAL_C_INCLUDES += \
 LOCAL_SRC_FILES += \
 	mediaplayer.cpp \
 	packetqueue.cpp \
+	output.cpp \
 	decoder.cpp \
 	decoder_audio.cpp \
 	decoder_video.cpp

jni/libmediaplayer/Android.mk

@@ -1,7 +1,7 @@
 #include <android/log.h>
 #include "decoder_audio.h"
 
-#include <drivers_map.h>
+#include "output.h"
 
 #define TAG "FFMpegAudioDecoder"
 
@@ -29,14 +29,14 @@ bool DecoderAudio::prepare(const char *err)
     mSamplesSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
     mSamples = (int16_t *) av_malloc(mSamplesSize);
 
-    if(AudioDriver_set(mConfig->streamType,
+    if(Output::AudioDriver_set(mConfig->streamType,
                        mConfig->sampleRate,
                        mConfig->format,
                        mConfig->channels) != ANDROID_AUDIOTRACK_RESULT_SUCCESS) {
        err = "Couldnt' set audio track";
        return false;
     }
-    if(AudioDriver_start() != ANDROID_AUDIOTRACK_RESULT_SUCCESS) {
+    if(Output::AudioDriver_start() != ANDROID_AUDIOTRACK_RESULT_SUCCESS) {
        err = "Couldnt' start audio track";
        return false;
     }
@@ -47,7 +47,7 @@ bool DecoderAudio::process(AVPacket *packet)
 {
     int size = mSamplesSize;
     int len = avcodec_decode_audio3(mCodecCtx, mSamples, &size, packet);
-    if(AudioDriver_write(mSamples, size) <= 0) {
+    if(Output::AudioDriver_write(mSamples, size) <= 0) {
         return false;
     }
     return true;
@@ -78,7 +78,7 @@ bool DecoderAudio::decode(void* ptr)
 
     __android_log_print(ANDROID_LOG_INFO, TAG, "decoding audio ended");
 
-    AudioDriver_unregister();
+    Output::AudioDriver_unregister();
 
     // Free audio samples buffer
     av_free(mSamples);

jni/libmediaplayer/decoder_audio.cpp

@@ -22,10 +22,8 @@ extern "C" {
 
 #include <android/log.h>
 
-// map system drivers methods
-#include <drivers_map.h>
-
 #include "mediaplayer.h"
+#include "output.h"
 
 static MediaPlayer* sPlayer;
 
@@ -188,7 +186,7 @@ AVFrame* MediaPlayer::createAndroidFrame()
 		return NULL;
 	}
 
-	if(VideoDriver_getPixels(mVideoWidth, 
+	if(Output::VideoDriver_getPixels(mVideoWidth, 
 							 mVideoHeight, 
 							 &pixels) != ANDROID_SURFACE_RESULT_SUCCESS) {
 		return NULL;
@@ -237,10 +235,10 @@ status_t MediaPlayer::resume() {
 
 status_t MediaPlayer::setVideoSurface(JNIEnv* env, jobject jsurface)
 { 
-	if(VideoDriver_register(env, jsurface) != ANDROID_SURFACE_RESULT_SUCCESS) {
+	if(Output::VideoDriver_register(env, jsurface) != ANDROID_SURFACE_RESULT_SUCCESS) {
 		return INVALID_OPERATION;
 	}
-	if(AudioDriver_register() != ANDROID_AUDIOTRACK_RESULT_SUCCESS) {
+	if(Output::AudioDriver_register() != ANDROID_AUDIOTRACK_RESULT_SUCCESS) {
 		return INVALID_OPERATION;
 	}	
     return NO_ERROR;
@@ -267,7 +265,7 @@ status_t MediaPlayer::processVideo(AVPacket *packet, AVFrame *pFrame)
 				  pFrame->data, 
 				  pFrame->linesize);
 
-		VideoDriver_updateSurface();
+		Output::VideoDriver_updateSurface();
 		return NO_ERROR;
 	}
 	return INVALID_OPERATION;
@@ -277,7 +275,7 @@ status_t MediaPlayer::processAudio(AVPacket *packet, int16_t *samples, int sampl
 {
 	int size = samples_size;
 	int len = avcodec_decode_audio3(mFFmpegStorage.audio.codec_ctx, samples, &size, packet);
-	if(AudioDriver_write(samples, size) <= 0) {
+	if(Output::AudioDriver_write(samples, size) <= 0) {
 		return INVALID_OPERATION;
 	}
 	return NO_ERROR;
@@ -352,7 +350,7 @@ void MediaPlayer::decodeVideo(void* ptr)
 
 	__android_log_print(ANDROID_LOG_INFO, TAG, "decoding video ended");
 
-    VideoDriver_unregister();
+    Output::VideoDriver_unregister();
 
     // Free the RGB image
     av_free(pFrameRGB);
@@ -374,13 +372,13 @@ void MediaPlayer::decodeAudio(void* ptr)
 	int sampleRate = mFFmpegStorage.audio.codec_ctx->sample_rate;
 	int format = PCM_16_BIT;
 	int channels = (mFFmpegStorage.audio.codec_ctx->channels == 2) ? CHANNEL_OUT_STEREO : CHANNEL_OUT_MONO;
-	if(AudioDriver_set(streamType,
+	if(Output::AudioDriver_set(streamType,
 					   sampleRate, 
 					   format,
 					   channels) != ANDROID_AUDIOTRACK_RESULT_SUCCESS) {
 		goto end;
 	}
-	if(AudioDriver_start() != ANDROID_AUDIOTRACK_RESULT_SUCCESS) {
+	if(Output::AudioDriver_start() != ANDROID_AUDIOTRACK_RESULT_SUCCESS) {
 		goto end;
 	}
 
@@ -422,7 +420,7 @@ void MediaPlayer::decodeAudio(void* ptr)
 end:
 	__android_log_print(ANDROID_LOG_INFO, TAG, "decoding audio ended");
 
-    AudioDriver_unregister();
+    Output::AudioDriver_unregister();
 
     // Free audio samples buffer
     av_free(pAudioSamples);
@@ -436,19 +434,19 @@ void MediaPlayer::decodeMovie(void* ptr)
 	pthread_create(&mVideoThread, NULL, startVideoDecoding, NULL);
         pthread_create(&mAudioThread, NULL, startAudioDecoding, NULL);
 
-        /*
+	/*
         DecoderAudioConfig cfg;
         cfg.streamType = MUSIC;
         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(mAudioQueue, mFFmpegStorage.audio.codec_ctx, &cfg);
+        mDecoderAudio = new DecoderAudio(mFFmpegStorage.audio.codec_ctx, &cfg);
         if(!mDecoderAudio->startAsync(err))
         {
             __android_log_print(ANDROID_LOG_INFO, TAG, "Couldn't start audio decoder: %s", err);
             return;
         }
-        */
+	*/
 
 	mCurrentState = MEDIA_PLAYER_STARTED;
 	__android_log_print(ANDROID_LOG_INFO, TAG, "playing %ix%i", mVideoWidth, mVideoHeight);

jni/libmediaplayer/mediaplayer.cpp

@@ -7,7 +7,8 @@
 #include <android/Errors.h>
 
 #include "packetqueue.h"
-//#include "decoder_audio.h"
+#include "decoder_audio.h"
+//#include "decoder_video.h"
 
 #define FFMPEG_PLAYER_MAX_QUEUE_SIZE 10
 
@@ -190,7 +191,8 @@ class MediaPlayer
     //Mutex                       mNotifyLock;
     //Condition                   mSignal;
     MediaPlayerListener*		mListener;
-    //DecoderAudio*               mDecoderAudio;
+    DecoderAudio*				mDecoderAudio;
+	//DecoderVideo*             mDecoderVideo;
     void*                       mCookie;
     media_player_states         mCurrentState;
     int                         mDuration;

jni/libmediaplayer/mediaplayer.h

@@ -0,0 +1,74 @@
+#include <android/log.h>
+#include "output.h"
+
+#define TAG "FFMpegOutput"
+
+//-------------------- Audio driver --------------------
+
+int Output::AudioDriver_register()
+{
+	return AndroidAudioTrack_register();
+}
+
+int Output::AudioDriver_unregister()
+{
+	return AndroidAudioTrack_unregister();
+}
+
+int Output::AudioDriver_start()
+{
+	return AndroidAudioTrack_start();
+}
+
+int Output::AudioDriver_set(int streamType,
+							uint32_t sampleRate,
+							int format,
+							int channels)
+{
+	return AndroidAudioTrack_set(streamType,
+								 sampleRate,
+								 format,
+								 channels);
+}
+
+int Output::AudioDriver_flush()
+{
+	return AndroidAudioTrack_flush();
+}
+
+int Output::AudioDriver_stop()
+{
+	return AndroidAudioTrack_stop();
+}
+
+int Output::AudioDriver_reload()
+{
+	return AndroidAudioTrack_reload();
+}
+
+int Output::AudioDriver_write(void *buffer, int buffer_size)
+{
+	return AndroidAudioTrack_write(buffer, buffer_size);
+}
+
+//-------------------- Video driver --------------------
+
+int Output::VideoDriver_register(JNIEnv* env, jobject jsurface)
+{
+	return AndroidSurface_register(env, jsurface);
+}
+
+int Output::VideoDriver_unregister()
+{
+	return AndroidSurface_unregister();
+}
+
+int Output::VideoDriver_getPixels(int width, int height, void** pixels)
+{
+	return AndroidSurface_getPixels(width, height, pixels);
+}
+
+int Output::VideoDriver_updateSurface()
+{
+	return AndroidSurface_updateSurface();
+}

jni/libmediaplayer/output.cpp

@@ -0,0 +1,30 @@
+#ifndef FFMPEG_OUTPUT_H
+#define FFMPEG_OUTPUT_H
+
+#include <jni.h>
+
+#include <android/audiotrack.h>
+#include <android/surface.h>
+
+class Output
+{
+public:	
+	static int					AudioDriver_register();
+    static int					AudioDriver_set(int streamType,
+												uint32_t sampleRate,
+												int format,
+												int channels);
+    static int					AudioDriver_start();
+    static int					AudioDriver_flush();
+	static int					AudioDriver_stop();
+    static int					AudioDriver_reload();
+	static int					AudioDriver_write(void *buffer, int buffer_size);
+	static int					AudioDriver_unregister();
+	
+	static int					VideoDriver_register(JNIEnv* env, jobject jsurface);
+    static int					VideoDriver_getPixels(int width, int height, void** pixels);
+    static int					VideoDriver_updateSurface();
+    static int					VideoDriver_unregister();
+};
+
+#endif //FFMPEG_DECODER_H