diff options
| author | Andreas Huber <andih@google.com> | 2012-09-04 09:35:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-04 09:35:52 -0700 |
| commit | 23ed3d9cd183c845bed846ecf050aa8cbd6f4c0f (patch) | |
| tree | 8771365c6443d15136ace93e8cdb984cee278316 /media/libmediaplayerservice | |
| parent | 31b7c57a37e1c682591764e04f964112da65c74b (diff) | |
| parent | b1244f55fcc80d638e8c3d6791a41050ba1a600d (diff) | |
| download | frameworks_av-23ed3d9cd183c845bed846ecf050aa8cbd6f4c0f.zip frameworks_av-23ed3d9cd183c845bed846ecf050aa8cbd6f4c0f.tar.gz frameworks_av-23ed3d9cd183c845bed846ecf050aa8cbd6f4c0f.tar.bz2 | |
am 76fd1ea5: am 7323115c: Merge "Improvements to our MPEG2 Transport Stream parser" into jb-mr1-dev
* commit '76fd1ea58835094e84d36f2353d1390c24d14bfc':
Improvements to our MPEG2 Transport Stream parser
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/StreamingSource.cpp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp index b696aa4..a1fd2ed 100644 --- a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp +++ b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp @@ -42,7 +42,15 @@ NuPlayer::StreamingSource::~StreamingSource() { void NuPlayer::StreamingSource::start() { mStreamListener = new NuPlayerStreamListener(mSource, 0); - mTSParser = new ATSParser(ATSParser::TS_TIMESTAMPS_ARE_ABSOLUTE); + + uint32_t sourceFlags = mSource->flags(); + + uint32_t parserFlags = ATSParser::TS_TIMESTAMPS_ARE_ABSOLUTE; + if (sourceFlags & IStreamSource::kFlagAlignedVideoData) { + parserFlags |= ATSParser::ALIGNED_VIDEO_DATA; + } + + mTSParser = new ATSParser(parserFlags); mStreamListener->start(); } @@ -138,7 +146,17 @@ status_t NuPlayer::StreamingSource::dequeueAccessUnit( return finalResult == OK ? -EWOULDBLOCK : finalResult; } - return source->dequeueAccessUnit(accessUnit); + status_t err = source->dequeueAccessUnit(accessUnit); + +#if !defined(LOG_NDEBUG) || LOG_NDEBUG == 0 + if (err == OK) { + int64_t timeUs; + CHECK((*accessUnit)->meta()->findInt64("timeUs", &timeUs)); + ALOGV("dequeueAccessUnit timeUs=%lld us", timeUs); + } +#endif + + return err; } } // namespace android |