diff options
| author | Andreas Huber <andih@google.com> | 2012-09-04 09:31:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-04 09:31:12 -0700 |
| commit | ebb5047fca788f89188158cc764fbb5ad2321f7a (patch) | |
| tree | e0b07ffdb053a68d741f66301a18200bda1bf7b5 /media/libmediaplayerservice/nuplayer | |
| parent | d99d678228fee4baa74d1bae463a59cc0aa13cd5 (diff) | |
| parent | 5205152968957c51b597ddeabe6a5e17b2a84e38 (diff) | |
| download | frameworks_av-ebb5047fca788f89188158cc764fbb5ad2321f7a.zip frameworks_av-ebb5047fca788f89188158cc764fbb5ad2321f7a.tar.gz frameworks_av-ebb5047fca788f89188158cc764fbb5ad2321f7a.tar.bz2 | |
Merge "Improvements to our MPEG2 Transport Stream parser" into jb-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
| -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 |