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

Commit b3962d24 authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Android (Google) Code Review
Browse files

Merge "media: Set the correct display width/height in muxer."

parents 844800fb 776daeee

media/libstagefright/MPEG4Writer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -3260,8 +3260,8 @@ void MPEG4Writer::Track::writeTkhdBox(uint32_t now) { 
        mOwner->writeInt32(0);

    } else {

        int32_t width, height;

        bool success = mMeta->findInt32(kKeyWidth, &width);

        success = success && mMeta->findInt32(kKeyHeight, &height);

        bool success = mMeta->findInt32(kKeyDisplayWidth, &width);

        success = success && mMeta->findInt32(kKeyDisplayHeight, &height);

        CHECK(success);



        mOwner->writeInt32(width << 16);   // 32-bit fixed-point value