diff options
| author | Andreas Huber <andih@google.com> | 2011-06-30 11:21:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-30 11:21:14 -0700 |
| commit | 69c2b29eb72396068b9d116c2a54f283025c7d6b (patch) | |
| tree | 2327936c53ec2dd2fda576fc158f0bbf195ad0c1 /media | |
| parent | e5bf6409774fe73f968b7db215f535b64de66139 (diff) | |
| parent | ac5767a96df9fae46a37ffba62611472135a0f6d (diff) | |
| download | frameworks_av-69c2b29eb72396068b9d116c2a54f283025c7d6b.zip frameworks_av-69c2b29eb72396068b9d116c2a54f283025c7d6b.tar.gz frameworks_av-69c2b29eb72396068b9d116c2a54f283025c7d6b.tar.bz2 | |
Merge "Revert "Parse RTP-Info even for live streams.""
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/rtsp/ASessionDescription.cpp | 3 | ||||
| -rw-r--r-- | media/libstagefright/rtsp/MyHandler.h | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/media/libstagefright/rtsp/ASessionDescription.cpp b/media/libstagefright/rtsp/ASessionDescription.cpp index fd0505e..f03f7a2 100644 --- a/media/libstagefright/rtsp/ASessionDescription.cpp +++ b/media/libstagefright/rtsp/ASessionDescription.cpp @@ -301,9 +301,6 @@ void ASessionDescription::ParseFormatDesc( // static bool ASessionDescription::parseNTPRange( const char *s, float *npt1, float *npt2) { - *npt1 = 0.0f; - *npt2 = 0.0f; - if (s[0] == '-') { return false; // no start time available. } diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h index f89f8e2..d15d9c5 100644 --- a/media/libstagefright/rtsp/MyHandler.h +++ b/media/libstagefright/rtsp/MyHandler.h @@ -995,12 +995,10 @@ struct MyHandler : public AHandler { AString val; CHECK(GetAttribute(range.c_str(), "npt", &val)); - bool seekable = true; - float npt1, npt2; if (!ASessionDescription::parseNTPRange(val.c_str(), &npt1, &npt2)) { // This is a live stream and therefore not seekable. - seekable = false; + return; } i = response->mHeaders.indexOfKey("rtp-info"); @@ -1046,7 +1044,7 @@ struct MyHandler : public AHandler { ++n; } - mSeekable = seekable; + mSeekable = true; } sp<APacketSource> getPacketSource(size_t index) { |