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

Commit 035f6c9c authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

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

* commit 'b54cedab':
  Use default values when MPEG4 audio config parsing fails.
parents 0b39e8c4 cc4e6091
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);
}