add support for audio decoder async and sync

huuguanghui · Jul 30, 2010 · 11b97ef · 11b97ef
1 parent 53ff5b7
commit 11b97ef
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/jni/libmediaplayer/decoder_audio.cpp b/jni/libmediaplayer/decoder_audio.cpp
@@ -34,6 +34,15 @@ DecoderAudio::~DecoderAudio()
 }
 
 bool DecoderAudio::start(const char* err)
+{
+    if(!prepare(err))
+    {
+        return false;
+    }
+    return decode(NULL);
+}
+
+bool DecoderAudio::startAsync(const char* err)
 {
     if(!prepare(err))
     {
@@ -91,7 +100,7 @@ bool DecoderAudio::process(AVPacket *packet)
     return true;
 }
 
-void DecoderAudio::decode(void* ptr)
+bool DecoderAudio::decode(void* ptr)
 {
     AVPacket        pPacket;
 
@@ -103,12 +112,12 @@ void DecoderAudio::decode(void* ptr)
         if(mQueue->get(&pPacket, true) < 0)
         {
             mDecoding = false;
-            continue;
+            return false;
         }
         if(!process(&pPacket))
         {
             mDecoding = false;
-            continue;
+            return false;
         }
         // Free the packet that was allocated by av_read_frame
         av_free_packet(&pPacket);
@@ -120,4 +129,5 @@ void DecoderAudio::decode(void* ptr)
 
     // Free audio samples buffer
     av_free(mSamples);
+    return true;
 }
diff --git a/jni/libmediaplayer/decoder_audio.h b/jni/libmediaplayer/decoder_audio.h
@@ -23,6 +23,7 @@ class DecoderAudio
     ~DecoderAudio();
 
     bool start(const char* err);
+    bool startAsync(const char* err);
     void stop();
 
 private:
@@ -35,7 +36,7 @@ class DecoderAudio
     int                         mSamplesSize;
 
     bool                        prepare(const char *err);
-    void                        decode(void* ptr);
+    bool                        decode(void* ptr);
     bool                        process(AVPacket *packet);
     static void*                startDecoding(void* ptr);
 };