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

Commit 3f60a22f authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

[automerger] Handle bad bitrate index in mp3dec. am: 8b638123 am: 1c388693... 

[automerger] Handle bad bitrate index in mp3dec. am: 8b638123 am: 1c388693 am: d1cd373b am: b589cde3 am: c512ab83 am: 1527d621 am: 93783a21 am: 04ba4099 am: c8d96838
am: 2bd167ec

Change-Id: I730b7ba31244faf09e73fce236740cde695dcdf6
parents 6579d3cd 2bd167ec

media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -184,7 +184,7 @@ ERROR_CODE pvmp3_decode_header(tmp3Bits *inputStream, 
    info->emphasis           = (temp << 30) >> 30;  /* 2 */

    info->emphasis           = (temp << 30) >> 30;  /* 2 */









    if (!info->bitrate_index || info->sampling_frequency == 3)

    if (!info->bitrate_index || info->bitrate_index == 15 || info->sampling_frequency == 3)

    {

    {

        err = UNSUPPORTED_FREE_BITRATE;

        err = UNSUPPORTED_FREE_BITRATE;

    }

    }