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

Commit 2754cb49 authored by Wonsik Kim's avatar Wonsik Kim Committed by android-build-merger
Browse files

Merge "stagefright: fix typo in HEVC handing at MPEG4Writer" into nyc-dev 

am: 690e3676

* commit '690e3676':
  stagefright: fix typo in HEVC handing at MPEG4Writer

Change-Id: Id2245f15a0b90a74cd3e1351bbcd6347befa35f9
parents 5391b916 690e3676

media/libstagefright/MPEG4Writer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -2261,6 +2261,7 @@ status_t MPEG4Writer::Track::makeHEVCCodecSpecificData( 


    HevcParameterSets paramSets;

    if (parseHEVCCodecSpecificData(data, size, paramSets) != OK) {

        ALOGE("failed parsing codec specific data");

        return ERROR_MALFORMED;

    }
@@ -2271,8 +2272,9 @@ status_t MPEG4Writer::Track::makeHEVCCodecSpecificData( 
        return NO_MEMORY;

    }

    status_t err = paramSets.makeHvcc((uint8_t *)mCodecSpecificData,

            &mCodecSpecificDataSize, mOwner->useNalLengthFour() ? 5 : 2);

            &mCodecSpecificDataSize, mOwner->useNalLengthFour() ? 4 : 2);

    if (err != OK) {

        ALOGE("failed constructing HVCC atom");

        return err;

    }