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

Commit 7970b6ad authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "media: avoid recursion when evaluating profile support" into nyc-dev am: a72a83a1 

am: c4da6b99

* commit 'c4da6b99':
  media: avoid recursion when evaluating profile support

Change-Id: I2d4105e27d4842c54015b8e51769a459eb7c4d1f
parents 8b979155 c4da6b99

media/java/android/media/MediaCodecInfo.java

+6 −1
Original line number Diff line number Diff line
@@ -591,7 +591,12 @@ public final class MediaCodecInfo { 
                    }

                }

                levelCaps = createFromProfileLevel(mMime, profile, maxLevel);

                if (levelCaps != null && !levelCaps.isFormatSupported(format)) {

                // remove profile from this format otherwise levelCaps.isFormatSupported will

                // get into this same conditon and loop forever.

                Map<String, Object> mapWithoutProfile = new HashMap<>(map);

                mapWithoutProfile.remove(MediaFormat.KEY_PROFILE);

                MediaFormat formatWithoutProfile = new MediaFormat(mapWithoutProfile);

                if (levelCaps != null && !levelCaps.isFormatSupported(formatWithoutProfile)) {

                    return false;

                }

            }