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

Commit 111048ad authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Add pixelWidthHeightRatio to MediaParser 

Bug: 132153067
Test: CTS.
Change-Id: I6603fdba0eff9a37016678e57345cf5763747fa2
parent 4ea6fce1

apex/media/framework/java/android/media/MediaParser.java

+15 −5
Original line number Diff line number Diff line
@@ -858,11 +858,21 @@ public final class MediaParser { 


        setOptionalMediaFormatInt(result, MediaFormat.KEY_ENCODER_DELAY, format.encoderDelay);

        setOptionalMediaFormatInt(result, MediaFormat.KEY_ENCODER_PADDING, format.encoderPadding);

        // TODO: Implement float to fraction conversion.

        // if (format.pixelWidthHeightRatio != Format.NO_VALUE) {

        //     result.setInteger(MediaFormat.KEY_PIXEL_ASPECT_RATIO_WIDTH, );

        //     result.setInteger(MediaFormat.KEY_PIXEL_ASPECT_RATIO_HEIGHT, );

        // }



        if (format.pixelWidthHeightRatio != Format.NO_VALUE && format.pixelWidthHeightRatio != 0) {

            int parWidth = 1;

            int parHeight = 1;

            if (format.pixelWidthHeightRatio < 1.0f) {

                parHeight = 1 << 30;

                parWidth = (int) (format.pixelWidthHeightRatio * parHeight);

            } else if (format.pixelWidthHeightRatio > 1.0f) {

                parWidth = 1 << 30;

                parHeight = (int) (parWidth / format.pixelWidthHeightRatio);

            }

            result.setInteger(MediaFormat.KEY_PIXEL_ASPECT_RATIO_WIDTH, parWidth);

            result.setInteger(MediaFormat.KEY_PIXEL_ASPECT_RATIO_HEIGHT, parHeight);

            result.setFloat("pixel-width-height-ratio-float", format.pixelWidthHeightRatio);

        }



        // LACK OF SUPPORT FOR:

        //    format.accessibilityChannel;