diff options
| author | Ryan Saffores <ryan.d.saffores@intel.com> | 2015-03-27 17:57:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-27 17:57:36 +0000 |
| commit | 4a085deb383b88ece9d4c157cc3e1242da93e165 (patch) | |
| tree | db91363b69551cdb69337b0ff18d72ece9428093 | |
| parent | 98c0349840fc047b137db8c1708f9dc748e97ce5 (diff) | |
| parent | 7aa9eddb7c98edb197a7e63f48f579d4dbbe342c (diff) | |
| download | libmix-4a085deb383b88ece9d4c157cc3e1242da93e165.tar.gz | |
am 7aa9eddb: am 758a9e8f: libmix: fix out of order decode issue on FUGU
* commit '7aa9eddb7c98edb197a7e63f48f579d4dbbe342c':
libmix: fix out of order decode issue on FUGU
| -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 74670e8..291441f 100644 --- a/videodecoder/VideoDecoderBase.cpp +++ b/videodecoder/VideoDecoderBase.cpp @@ -294,9 +294,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); @@ -311,13 +308,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; |