aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Saffores <ryan.d.saffores@intel.com>2015-03-23 09:12:58 -0700
committerPat Tjin <pattjin@google.com>2015-03-27 01:01:13 +0000
commit758a9e8f240d094c4cbc2cf0be6721ff97aae1fb (patch)
tree425a84953eb1b07d95f1ea7aa9e57789d5f604b4
parentced69386c75e4fdcdb58edab60328d1d0829c4cf (diff)
downloadlibmix-lollipop-mr1-wfc-release.tar.gz
Bug: 19572523 Change-Id: I938d05f666fb40601201d06feb07793cba2ebbb5 Signed-off-by: Ryan Saffores <ryan.d.saffores@intel.com>
-rw-r--r--videodecoder/VideoDecoderBase.cpp10
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;