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

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

Merge "media: handle AVC constrained profiles" into oc-mr1-dev am: 794a8f9d 

am: 1bce851e

Change-Id: Id9da2c0e1c48dff6262dc05b83c0b733dcffab42
parents 8c0d16cf 1bce851e

media/java/android/media/MediaCodecInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -2095,6 +2095,7 @@ public final class MediaCodecInfo { 
                            errors |= ERROR_UNRECOGNIZED;

                    }

                    switch (profileLevel.profile) {

                        case CodecProfileLevel.AVCProfileConstrainedHigh:

                        case CodecProfileLevel.AVCProfileHigh:

                            BR *= 1250; break;

                        case CodecProfileLevel.AVCProfileHigh10:
@@ -2107,6 +2108,7 @@ public final class MediaCodecInfo { 
                            errors |= ERROR_UNSUPPORTED;

                            supported = false;

                            // fall through - treat as base profile

                        case CodecProfileLevel.AVCProfileConstrainedBaseline:

                        case CodecProfileLevel.AVCProfileBaseline:

                        case CodecProfileLevel.AVCProfileMain:

                            BR *= 1000; break;