diff options
author | Ryan Saffores <ryan.d.saffores@intel.com> | 2015-03-23 09:12:58 -0700 |
---|---|---|
committer | Pat Tjin <pattjin@google.com> | 2015-03-27 01:01:13 +0000 |
commit | 758a9e8f240d094c4cbc2cf0be6721ff97aae1fb (patch) | |
tree | 425a84953eb1b07d95f1ea7aa9e57789d5f604b4 | |
parent | ced69386c75e4fdcdb58edab60328d1d0829c4cf (diff) | |
download | libmix-lollipop-mr1-wfc-release.tar.gz |
libmix: fix out of order decode issue on FUGUandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-release
Bug: 19572523
Change-Id: I938d05f666fb40601201d06feb07793cba2ebbb5
Signed-off-by: Ryan Saffores <ryan.d.saffores@intel.com>
-rw-r--r-- | videodecoder/VideoDecoderBase.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
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 @@ const VideoRenderBuffer* VideoDecoderBase::getOutput(bool draining, VideoErrorBu 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 @@ const VideoRenderBuffer* VideoDecoderBase::getOutput(bool draining, VideoErrorBu 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; |