From d4a6cac34d9e75dc708f894863d1870e456c93d6 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Thu, 30 Jun 2011 10:59:19 -0700 Subject: Revert "Parse RTP-Info even for live streams." This reverts commit d873413ff9f742f259c29d7d0b58265db6b24529. --- media/libstagefright/rtsp/ASessionDescription.cpp | 3 --- 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 fd0505eb267c..f03f7a268fb2 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 f89f8e20054d..d15d9c5c0966 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 getPacketSource(size_t index) { -- cgit v1.2.3-59-g8ed1b