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

Commit 6ac9da6b authored by Lajos Molnar's avatar Lajos Molnar
Browse files

MediaCodeInfo: fix support for feature-can-swap-width-height 

Also fix an issue with limiting size based on number of
blocks allowed.

Bug: 11990740
Change-Id: I3b01be4031dce6b425e8573da5de527ba2a0995c
parent c54a76cb

media/java/android/media/MediaCodecInfo.java

+27 −2
Original line number Diff line number Diff line
@@ -959,6 +959,23 @@ public final class MediaCodecInfo { 
                        }

                    }

                }

                // for now this just means using the smaller max size as 2nd

                // upper limit.

                // for now we are keeping the profile specific "width/height

                // in macroblocks" limits.

                if (Integer.valueOf(1).equals(map.get("feature-can-swap-width-height"))) {

                    if (widths != null) {

                        mSmallerDimensionUpperLimit =

                            Math.min(widths.getUpper(), heights.getUpper());

                        widths = heights = widths.extend(heights);

                    } else {

                        Log.w(TAG, "feature can-swap-width-height is best used with size-range");

                        mSmallerDimensionUpperLimit =

                            Math.min(mWidthRange.getUpper(), mHeightRange.getUpper());

                        mWidthRange = mHeightRange = mWidthRange.extend(mHeightRange);

                    }

                }



                ratios = Utils.parseRationalRange(

                        map.get("block-aspect-ratio-range"), null);

                blockRatios = Utils.parseRationalRange(
@@ -1124,9 +1141,17 @@ public final class MediaCodecInfo { 
            private void updateLimits() {

                // pixels -> blocks <- counts

                mHorizontalBlockRange = mHorizontalBlockRange.intersect(

                        Utils.factorRange(mWidthRange, mBlockWidth)).intersect(mBlockCountRange);

                        Utils.factorRange(mWidthRange, mBlockWidth));

                mHorizontalBlockRange = mHorizontalBlockRange.intersect(

                        Range.create(

                                mBlockCountRange.getLower() / mVerticalBlockRange.getUpper(),

                                mBlockCountRange.getUpper() / mVerticalBlockRange.getLower()));

                mVerticalBlockRange = mVerticalBlockRange.intersect(

                        Utils.factorRange(mHeightRange, mBlockHeight)).intersect(mBlockCountRange);

                        Utils.factorRange(mHeightRange, mBlockHeight));

                mVerticalBlockRange = mVerticalBlockRange.intersect(

                        Range.create(

                                mBlockCountRange.getLower() / mHorizontalBlockRange.getUpper(),

                                mBlockCountRange.getUpper() / mHorizontalBlockRange.getLower()));

                mBlockCountRange = mBlockCountRange.intersect(

                        Range.create(

                                mHorizontalBlockRange.getLower()