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

Commit b37b477e authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "Remove some triage comments from an earlier commit." am: 7df706ae am:... 

Merge "Remove some triage comments from an earlier commit." am: 7df706ae am: 33562a4e am: 793be716 am: 833c230b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2585175



Change-Id: Icd7867b1e881c7e0cd5fd094880f5a24533e134d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 33c6a21e 833c230b

media/module/extractors/mp3/VBRISeeker.cpp

+1 −4
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ VBRISeeker *VBRISeeker::CreateFromSource( 
         scale,

         entrySize);



    // RBE check on the small end too

    // b/280693435, which is duped to b/155563985

    if (entrySize < 1 || entrySize > 4) {

        ALOGE("invalid VBRI entry size: %zu", entrySize);

        return NULL;
@@ -124,13 +122,12 @@ VBRISeeker *VBRISeeker::CreateFromSource( 


    off64_t offset = post_id3_pos;

    for (size_t i = 0; i < numEntries; ++i) {

        uint32_t numBytes;

        uint32_t numBytes = 0;

        // entrySize is known to be [1..4]

        switch (entrySize) {

            case 1: numBytes = buffer[i]; break;

            case 2: numBytes = U16_AT(buffer + 2 * i); break;

            case 3: numBytes = U24_AT(buffer + 3 * i); break;

            default:

            case 4: numBytes = U32_AT(buffer + 4 * i); break;

        }