commit 4a085deb383b88ece9d4c157cc3e1242da93e165
author Ryan Saffores <ryan.d.saffores@intel.com> Fri Mar 27 17:57:36 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 27 17:57:36 2015 +0000
tree db91363b69551cdb69337b0ff18d72ece9428093
parent 98c0349840fc047b137db8c1708f9dc748e97ce5
parent 7aa9eddb7c98edb197a7e63f48f579d4dbbe342c

am 7aa9eddb: am 758a9e8f: libmix: fix out of order decode issue on FUGU

* commit '7aa9eddb7c98edb197a7e63f48f579d4dbbe342c':
  libmix: fix out of order decode issue on FUGU

videodecoder/VideoDecoderBase.cpp

diff --git a/videodecoder/VideoDecoderBase.cpp b/videodecoder/VideoDecoderBase.cpp
index 74670e8..291441f 100644
--- a/videodecoder/VideoDecoderBase.cpp
+++ b/videodecoder/VideoDecoderBase.cpp
@@ -294,9 +294,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);
@@ -311,13 +308,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;