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

Commit 031c93df authored by Marco Nelissen's avatar Marco Nelissen Committed by Gerrit Code Review
Browse files

Merge "Bug fix for the MediaPlayer::prepare() api."

parents 251c04b1 ffd6ffc5

media/libstagefright/MP3Extractor.cpp

+4 −2
Original line number Diff line number Diff line
@@ -350,8 +350,10 @@ MP3Extractor::MP3Extractor( 


    mInitCheck = OK;



    // get iTunes-style gapless info if present

    ID3 id3(mDataSource);

    // Get iTunes-style gapless info if present.

    // When getting the id3 tag, skip the V1 tags to prevent the source cache

    // from being iterated to the end of the file.

    ID3 id3(mDataSource, true);

    if (id3.isValid()) {

        ID3::Iterator *com = new ID3::Iterator(id3, "COM");

        if (com->done()) {

media/libstagefright/id3/ID3.cpp

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ namespace android { 


static const size_t kMaxMetadataSize = 3 * 1024 * 1024;



ID3::ID3(const sp<DataSource> &source)

ID3::ID3(const sp<DataSource> &source, bool ignoreV1)

    : mIsValid(false),

      mData(NULL),

      mSize(0),
@@ -38,7 +38,7 @@ ID3::ID3(const sp<DataSource> &source) 
      mVersion(ID3_UNKNOWN) {

    mIsValid = parseV2(source);



    if (!mIsValid) {

    if (!mIsValid && !ignoreV1) {

        mIsValid = parseV1(source);

    }

}

media/libstagefright/include/ID3.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ struct ID3 { 
        ID3_V2_4,

    };



    ID3(const sp<DataSource> &source);

    ID3(const sp<DataSource> &source, bool ignoreV1 = false);

    ~ID3();



    bool isValid() const;