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

Commit ba07cc25 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Fix missing video caps for HEIC type encoders" into pi-dev am: 773791a9 

am: 26bedfe4

Change-Id: I73bee318babe8063941d1e1230ad197ae36c0885
parents 10b25077 26bedfe4

media/java/android/media/MediaCodecInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -909,7 +909,8 @@ public final class MediaCodecInfo { 
            if (mMime.toLowerCase().startsWith("audio/")) {

                mAudioCaps = AudioCapabilities.create(info, this);

                mAudioCaps.getDefaultFormat(mDefaultFormat);

            } else if (mMime.toLowerCase().startsWith("video/")) {

            } else if (mMime.toLowerCase().startsWith("video/")

                    || mMime.equalsIgnoreCase(MediaFormat.MIMETYPE_IMAGE_ANDROID_HEIC)) {

                mVideoCaps = VideoCapabilities.create(info, this);

            }

            if (encoder) {