commit a6925e6149faf4a936a5b557a769d117454413d8
author Andreas Huber <andih@google.com> Wed Jun 01 09:12:59 2011 -0700
committer Andreas Huber <andih@google.com> Mon Jun 20 10:34:43 2011 -0700
tree 2cd05ac5dcf3650228a44fe26bd116b07a5f4629
parent e6ebb09642944b1d0cc06a788308e9b843dee595

Parse RTP-Info even for live streams.

Change-Id: Ib2c39ce8d5366f5ea350e71b7a54f5f7c2b510b9

media/libstagefright/rtsp/ASessionDescription.cpp

diff --git a/media/libstagefright/rtsp/ASessionDescription.cpp b/media/libstagefright/rtsp/ASessionDescription.cpp
index f03f7a2..fd0505e 100644
--- a/media/libstagefright/rtsp/ASessionDescription.cpp
+++ b/media/libstagefright/rtsp/ASessionDescription.cpp
@@ -301,6 +301,9 @@
 // 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.
     }

media/libstagefright/rtsp/MyHandler.h

diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h
index d15d9c5..f89f8e2 100644
--- a/media/libstagefright/rtsp/MyHandler.h
+++ b/media/libstagefright/rtsp/MyHandler.h
@@ -995,10 +995,12 @@
         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.
-            return;
+            seekable = false;
         }
 
         i = response->mHeaders.indexOfKey("rtp-info");
@@ -1044,7 +1046,7 @@
             ++n;
         }
 
-        mSeekable = true;
+        mSeekable = seekable;
     }
 
     sp<APacketSource> getPacketSource(size_t index) {