commit 1175ce579a69e847027026f615a053af76b792d5
author Tianmi Chen <tianmi.chen@intel.com> Wed Apr 29 17:10:50 2015 +0800
committer Pat Tjin <pattjin@google.com> Mon Jun 01 20:05:21 2015 +0000
tree 206253f86110d1745f19af19e83c1b971f97c4a3
parent 4a085deb383b88ece9d4c157cc3e1242da93e165

enable meta data mode on FUGU

Use meta data mode for adaptive playback.

Bug: 19197299

Change-Id: I13d992a1c74c11ce5b2fd7a9f1e543789befc947
Signed-off-by: Tianmi Chen <tianmi.chen@intel.com>

videodecoder/VideoDecoderMPEG2.cpp

diff --git a/videodecoder/VideoDecoderMPEG2.cpp b/videodecoder/VideoDecoderMPEG2.cpp
index 5b79a58..928ee9b 100644
--- a/videodecoder/VideoDecoderMPEG2.cpp
+++ b/videodecoder/VideoDecoderMPEG2.cpp
@@ -103,15 +103,31 @@
         (data->codec_data->frame_width > 0) && (data->codec_data->frame_height)) {
         // update  encoded image size
         ITRACE("Video size is changed. from %dx%d to %dx%d\n",mVideoFormatInfo.width,mVideoFormatInfo.height, data->codec_data->frame_width,data->codec_data->frame_height);
-        bool needFlush = false;
+        if (useGraphicbuffer && mStoreMetaData) {
+            pthread_mutex_lock(&mFormatLock);
+        }
         mVideoFormatInfo.width = data->codec_data->frame_width;
         mVideoFormatInfo.height = data->codec_data->frame_height;
+        bool needFlush = false;
         if (useGraphicbuffer) {
-            needFlush = (mVideoFormatInfo.width > mVideoFormatInfo.surfaceWidth)
-                    || (mVideoFormatInfo.height > mVideoFormatInfo.surfaceHeight);
+            if (mStoreMetaData) {
+                needFlush = true;
+
+                mVideoFormatInfo.valid = false;
+                pthread_mutex_unlock(&mFormatLock);
+            } else {
+                needFlush = (mVideoFormatInfo.width > mVideoFormatInfo.surfaceWidth)
+                         || (mVideoFormatInfo.height > mVideoFormatInfo.surfaceHeight);
+            }
         }
+
         if (needFlush) {
-            flushSurfaceBuffers();
+            if (mStoreMetaData) {
+                status = endDecodingFrame(false);
+                CHECK_STATUS("endDecodingFrame");
+            } else {
+                flushSurfaceBuffers();
+            }
             mSizeChanged = false;
             return DECODE_FORMAT_CHANGE;
         } else {
@@ -119,6 +135,10 @@
         }
 
         setRenderRect();
+    } else {
+        if (useGraphicbuffer && mStoreMetaData) {
+            mVideoFormatInfo.valid = true;
+        }
     }
 
     VideoDecoderBase::setRotationDegrees(buffer->rotationDegrees);