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

Commit fb346428 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "media: Use width and height when dispWidth and dispHeight are not present."

parents 59ed2dbc 467743d4

media/libstagefright/MPEG4Writer.cpp

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

    } else {

        int32_t width, height;

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

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

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



        // Use width/height if display width/height are not present.

        if (!success) {

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

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

        }

        CHECK(success);



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