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

Commit 9b819cf6 authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

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

Merge changes from topic "am-3d7d15cb-f02b-474d-adb3-adb7e033539e" into oc-dev am: 11eddd5a am: 9353b051 am: ff404db0 am: a2a60434
am: d9fa62c4

Change-Id: I39df27c3b40d98daf99cd7d4439bbff87e7279c1
parents 8d695e8e d9fa62c4

media/libstagefright/httplive/M3UParser.cpp

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

        if (mSelectedIndex >= 0 && i == (size_t)mSelectedIndex) {

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

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





            if (item.mURI.empty()) {

                *uri = "";

            } else {

                *uri = item.makeURL(baseURL);

                *uri = item.makeURL(baseURL);

            }

            return true;

            return true;

        }

        }

    }

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

        }





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

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

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

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

        }

        }

    }

    }