add decoder interface which must all decoders inherit

huuguanghui · Jul 30, 2010 · 4479902 · 4479902
1 parent 69d00b3
commit 4479902
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/jni/libmediaplayer/decoder.h b/jni/libmediaplayer/decoder.h
@@ -0,0 +1,30 @@
+#ifndef FFMPEG_DECODER_H
+#define FFMPEG_DECODER_H
+
+#include <pthread.h>
+
+// map system drivers methods
+#include <drivers_map.h>
+
+#include "packetqueue.h"
+
+class IDecoder
+{
+public:
+    virtual bool start(const char* err);
+    virtual bool startAsync(const char* err);
+    virtual int wait();
+    virtual void stop();
+
+protected:
+    PacketQueue*                mQueue;
+    AVCodecContext*             mCodecCtx;
+    bool                        mDecoding;
+    pthread_t                   mThread;
+
+    virtual bool                prepare(const char *err);
+    virtual bool                decode(void* ptr);
+    virtual bool                process(AVPacket *packet);
+};
+
+#endif //FFMPEG_DECODER_H
diff --git a/jni/libmediaplayer/decoder_audio.cpp b/jni/libmediaplayer/decoder_audio.cpp
@@ -14,10 +14,10 @@ static DecoderAudio* sInstance;
 
 DecoderAudio::DecoderAudio(PacketQueue*               queue,
                            AVCodecContext*            codec_ctx,
-                           struct DecoderAudioConfig* config)
+			   struct DecoderAudioConfig* config)
 {
     mQueue = queue;
-    mCodecCtx = codec_ctx;
+    mCodecCtx = codec_ctx; 
     mConfig = config;
     sInstance = this;
 }

diff --git a/jni/libmediaplayer/decoder_audio.h b/jni/libmediaplayer/decoder_audio.h
@@ -6,6 +6,7 @@
 // map system drivers methods
 #include <drivers_map.h>
 
+#include "decoder.h"
 #include "packetqueue.h"
 
 struct DecoderAudioConfig
@@ -16,7 +17,7 @@ struct DecoderAudioConfig
      int                channels;
 };
 
-class DecoderAudio
+class DecoderAudio : public IDecoder
 {
 public:
     DecoderAudio(PacketQueue*               queue,
@@ -31,11 +32,7 @@ class DecoderAudio
     void stop();
 
 private:
-    PacketQueue*                mQueue;
-    AVCodecContext*             mCodecCtx;
     struct DecoderAudioConfig*  mConfig;
-    bool                        mDecoding;
-    pthread_t                   mThread;
     int16_t*                    mSamples;
     int                         mSamplesSize;