Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11eddd5a authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-3d7d15cb-f02b-474d-adb3-adb7e033539e" into oc-dev 

* changes:
  [automerger] M3UParser: handle missing EXT-X-MEDIA URIs am: b8c3a74d am: a3acb4c0 am: b7b790ef am: 17ae2087 am: c60f2ff6
  [automerger] M3UParser: handle missing EXT-X-MEDIA URIs am: b8c3a74d am: a3acb4c0 am: b7b790ef am: 17ae2087
  [automerger] M3UParser: handle missing EXT-X-MEDIA URIs am: b8c3a74d am: a3acb4c0 am: b7b790ef
  [automerger] M3UParser: handle missing EXT-X-MEDIA URIs am: b8c3a74d am: a3acb4c0
  [automerger] M3UParser: handle missing EXT-X-MEDIA URIs am: b8c3a74d
  M3UParser: handle missing EXT-X-MEDIA URIs
parents d8cbab14 7fd048b3

media/libstagefright/httplive/M3UParser.cpp

+6 −2
Original line number Diff line number Diff line
@@ -233,7 +233,11 @@ bool M3UParser::MediaGroup::getActiveURI(AString *uri, const char *baseURL) cons 
        if (mSelectedIndex >= 0 && i == (size_t)mSelectedIndex) {

            const Media &item = mMediaItems.itemAt(i);



            if (item.mURI.empty()) {

                *uri = "";

            } else {

                *uri = item.makeURL(baseURL);

            }

            return true;

        }

    }
@@ -464,7 +468,7 @@ bool M3UParser::getTypeURI(size_t index, const char *key, AString *uri) const { 
        }



        if ((*uri).empty()) {

            *uri = mItems.itemAt(index).mURI;

            *uri = mItems.itemAt(index).makeURL(mBaseURI.c_str());

        }

    }