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

Commit cc4e6091 authored by James Dong's avatar James Dong Committed by Gerrit Code Review
Browse files

Merge "Use default values when MPEG4 audio config parsing fails."

parents 93c4d74d a45a600d
Loading
Loading
Loading
Loading
+10 −3
Original line number Diff line number Diff line
@@ -311,9 +311,7 @@ static status_t parseStreamMuxConfig(

        case 2:
        {
            // reserved
            TRESPASS();
            break;
            return ERROR_UNSUPPORTED;
        }

        case 3:
@@ -460,6 +458,15 @@ AMPEG4AudioAssembler::AMPEG4AudioAssembler(
            &mFixedFrameLength,
            &mOtherDataPresent, &mOtherDataLenBits);

    if (err == ERROR_UNSUPPORTED) {
        ALOGW("Failed to parse stream mux config, using default values for playback.");
        mMuxConfigPresent = false;
        mNumSubFrames = 0;
        mFrameLengthType = 0;
        mOtherDataPresent = false;
        mOtherDataLenBits = 0;
        return;
    }
    CHECK_EQ(err, (status_t)NO_ERROR);
}