commit 0226d74dc46ccae5e678fe6617ed77a8eb995623
author Ryan Saffores <ryan.d.saffores@intel.com> Mon Mar 23 09:12:58 2015 -0700
committer The Android Automerger <android-build@google.com> Fri Mar 27 15:02:06 2015 -0700
tree 425a84953eb1b07d95f1ea7aa9e57789d5f604b4
parent 01c9654a678d6ff08a8cbf2565bef712b402a8af

libmix: fix out of order decode issue on FUGU

Bug: 19572523

Change-Id: I938d05f666fb40601201d06feb07793cba2ebbb5
Signed-off-by: Ryan Saffores <ryan.d.saffores@intel.com>

videodecoder/VideoDecoderBase.cpp

diff --git a/videodecoder/VideoDecoderBase.cpp b/videodecoder/VideoDecoderBase.cpp
index 8c66e80..19b3c5e 100644
--- a/videodecoder/VideoDecoderBase.cpp
+++ b/videodecoder/VideoDecoderBase.cpp
@@ -295,9 +295,6 @@
         return &(outputByPos->renderBuffer);
     }
 
-    // output by presentation time stamp (the smallest pts)
-    VideoSurfaceBuffer *outputByPts = findOutputByPts();
-
     VideoSurfaceBuffer *output = NULL;
     if (mOutputMethod == OUTPUT_BY_POC) {
         output = findOutputByPoc(draining);
@@ -312,13 +309,6 @@
         return NULL;
     }
 
-    if (output != outputByPts) {
-        // swap time stamp
-        uint64_t ts = output->renderBuffer.timeStamp;
-        output->renderBuffer.timeStamp = outputByPts->renderBuffer.timeStamp;
-        outputByPts->renderBuffer.timeStamp = ts;
-    }
-
     if (output != outputByPos) {
         // remove this output from middle or end of the list
         VideoSurfaceBuffer *p = outputByPos;