diff options
author | Marco Nelissen <marcone@google.com> | 2015-04-09 19:32:38 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-09 19:32:39 +0000 |
commit | e686cc0952176964684ce2487c5170e41d03c057 (patch) | |
tree | 3dbdf6e3e85ae8d839c7e773fd6ede5373068e0b /media/libstagefright/mpeg2ts | |
parent | 38c9d6cfd2db353ebebf291589fcceceebb9f2b8 (diff) | |
parent | 5d7c3eef1985ff15a56920c548cc4e41d6c9627a (diff) | |
download | frameworks_av-e686cc0952176964684ce2487c5170e41d03c057.zip frameworks_av-e686cc0952176964684ce2487c5170e41d03c057.tar.gz frameworks_av-e686cc0952176964684ce2487c5170e41d03c057.tar.bz2 |
Merge "Don't fail read when "seeking" to current position"
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-rw-r--r-- | media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp b/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp index 1f43d6d..33cfd1d 100644 --- a/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp +++ b/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp @@ -85,12 +85,6 @@ status_t MPEG2TSSource::read( MediaBuffer **out, const ReadOptions *options) { *out = NULL; - int64_t seekTimeUs; - ReadOptions::SeekMode seekMode; - if (mSeekable && options && options->getSeekTo(&seekTimeUs, &seekMode)) { - return ERROR_UNSUPPORTED; - } - status_t finalResult; while (!mImpl->hasBufferAvailable(&finalResult)) { if (finalResult != OK) { @@ -103,6 +97,17 @@ status_t MPEG2TSSource::read( } } + int64_t seekTimeUs; + ReadOptions::SeekMode seekMode; + if (mSeekable && options && options->getSeekTo(&seekTimeUs, &seekMode)) { + // A seek was requested, but we don't actually support seeking and so can only "seek" to + // the current position + int64_t nextBufTimeUs; + if (mImpl->nextBufferTime(&nextBufTimeUs) != OK || seekTimeUs != nextBufTimeUs) { + return ERROR_UNSUPPORTED; + } + } + return mImpl->read(out, options); } |