commit e71dcef63a746970d5c11c83207201fe8de02a78
author Chong Zhang <chz@google.com> Sat Jul 12 02:47:22 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 11 16:34:41 2014 +0000
tree 4267ac2a10922609f01fe613a06fed23ba6df009
parent 388742df51084f02a362818a884f3bde71b7ef8d
parent 749dafad09d85f2aaf6902a7ff16b4087e3bc4c7

Merge "MediaCodec: change onError cb to return CodecException"

include/media/stagefright/MediaCodec.h

diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h
index 046496c..a0ff997 100644
--- a/include/media/stagefright/MediaCodec.h
+++ b/include/media/stagefright/MediaCodec.h
@@ -279,7 +279,7 @@
 
     void onInputBufferAvailable();
     void onOutputBufferAvailable();
-    void onError(int32_t actionCode, status_t err);
+    void onError(status_t err, int32_t actionCode, const char *detail = NULL);
     void onOutputFormatChanged();
 
     status_t onSetParameters(const sp<AMessage> &params);

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index f286659..24fd7ad 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -664,7 +664,7 @@
                             cancelPendingDequeueOperations();
 
                             if (mFlags & kFlagIsAsync) {
-                                onError(0, omxError);
+                                onError(omxError, 0);
                             }
                             setState(UNINITIALIZED);
                             break;
@@ -678,7 +678,7 @@
                             postActivityNotificationIfPossible();
 
                             if (mFlags & kFlagIsAsync) {
-                                onError(0, omxError);
+                                onError(omxError, 0);
                             }
                             setState(UNINITIALIZED);
                             break;
@@ -1916,12 +1916,16 @@
     }
 }
 
-void MediaCodec::onError(int32_t actionCode, status_t err) {
+void MediaCodec::onError(status_t err, int32_t actionCode, const char *detail) {
     if (mCallback != NULL) {
         sp<AMessage> msg = mCallback->dup();
         msg->setInt32("callbackID", CB_ERROR);
-        msg->setInt32("actionCode", actionCode);
         msg->setInt32("err", err);
+        msg->setInt32("actionCode", actionCode);
+
+        if (detail != NULL) {
+            msg->setString("detail", detail);
+        }
 
         msg->post();
     }