commit b7b790ef84dcff7205abf0c86988d8c9d3e71a8f
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jul 13 08:24:11 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jul 13 08:24:11 2018 +0000
tree 7103a37facd18afd5c660a2e8113ec17d80118a3
parent fd8da9c45dd1a08497272f94dbad141903aad81c
parent a3acb4c0f2131f954a0f1a3328694ac1864ce3b9

[automerger] M3UParser: handle missing EXT-X-MEDIA URIs am: b8c3a74de5 am: a3acb4c0f2

Change-Id: I4cb61df3694d28593a6ba5da948ec470b0416b64

media/libstagefright/httplive/M3UParser.cpp

diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp
index 28d034b..d7bfbb3 100644
--- a/media/libstagefright/httplive/M3UParser.cpp
+++ b/media/libstagefright/httplive/M3UParser.cpp
@@ -233,7 +233,11 @@
         if (mSelectedIndex >= 0 && i == (size_t)mSelectedIndex) {
             const Media &item = mMediaItems.itemAt(i);
 
-            *uri = item.makeURL(baseURL);
+            if (item.mURI.empty()) {
+                *uri = "";
+            } else {
+                *uri = item.makeURL(baseURL);
+            }
             return true;
         }
     }
@@ -464,7 +468,7 @@
         }
 
         if ((*uri).empty()) {
-            *uri = mItems.itemAt(index).mURI;
+            *uri = mItems.itemAt(index).makeURL(mBaseURI.c_str());
         }
     }