commit 9b819cf6013bd4b05ef6644d448a402598506eb8
author Robert Shih <robertshih@google.com> Sat Jul 14 01:16:45 2018 -0700
committer android-build-merger <android-build-merger@google.com> Sat Jul 14 01:16:45 2018 -0700
tree 90608599296eac1335b2f4daad86728f6a518dd2
parent 8d695e8e4e3e8dc5a7c00b16058a4f3468d76555
parent d9fa62c40ed188b1ed8380e2c4f1ea322055698d

Merge changes from topic "am-3d7d15cb-f02b-474d-adb3-adb7e033539e" into oc-dev am: 11eddd5a22 am: 9353b051f9 am: ff404db0d6 am: a2a604341a
am: d9fa62c40e

Change-Id: I39df27c3b40d98daf99cd7d4439bbff87e7279c1

media/libstagefright/httplive/M3UParser.cpp

diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp
index 52791b9..8ab33f7 100644
--- a/media/libstagefright/httplive/M3UParser.cpp
+++ b/media/libstagefright/httplive/M3UParser.cpp
@@ -234,7 +234,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;
         }
     }
@@ -465,7 +469,7 @@
         }
 
         if ((*uri).empty()) {
-            *uri = mItems.itemAt(index).mURI;
+            *uri = mItems.itemAt(index).makeURL(mBaseURI.c_str());
         }
     }