diff options
| author | Andreas Huber <andih@google.com> | 2012-05-21 13:56:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-21 13:56:06 -0700 |
| commit | 9ec3547e741f72adcf0ce5d173b1f4ab2cdd5db1 (patch) | |
| tree | 6637faeac038fd9cf4f0bb87c0a71a2cff238b1b /media | |
| parent | cd8a36fdc49a823f78d45e8e1a464dc261553b26 (diff) | |
| parent | c9d1696d214d2175327067ccc1991bcb36976404 (diff) | |
| download | frameworks_av-9ec3547e741f72adcf0ce5d173b1f4ab2cdd5db1.zip frameworks_av-9ec3547e741f72adcf0ce5d173b1f4ab2cdd5db1.tar.gz frameworks_av-9ec3547e741f72adcf0ce5d173b1f4ab2cdd5db1.tar.bz2 | |
Merge "For an RTSP live stream we won't map rtp time to normal play time," into jb-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/RTSPSource.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp index a138be8..c910488 100644 --- a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp +++ b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp @@ -276,14 +276,9 @@ void NuPlayer::RTSPSource::onMessageReceived(const sp<AMessage> &msg) { if (!info->mNPTMappingValid) { // This is a live stream, we didn't receive any normal - // playtime mapping. Assume the first packets correspond - // to time 0. - - ALOGV("This is a live stream, assuming time = 0"); - - info->mRTPTime = rtpTime; - info->mNormalPlaytimeUs = 0ll; - info->mNPTMappingValid = true; + // playtime mapping. We won't map to npt time. + source->queueAccessUnit(accessUnit); + break; } int64_t nptUs = |