Merge "transcoding: Fix a bug in ApplicationMediaCapabilites."
diff --git a/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java b/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java
index 25ccec2..13c4953 100644
--- a/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java
+++ b/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java
@@ -192,12 +192,25 @@
for (int readCount = 0; readCount < count; ++readCount) {
builder.addSupportedVideoMimeType(in.readString());
}
+
+ // Parse unsupported video codec mime types.
+ count = in.readInt();
+ for (int readCount = 0; readCount < count; ++readCount) {
+ builder.addUnsupportedVideoMimeType(in.readString());
+ }
+
// Parse supported hdr types.
count = in.readInt();
for (int readCount = 0; readCount < count; ++readCount) {
builder.addSupportedHdrType(in.readString());
}
+ // Parse unsupported hdr types.
+ count = in.readInt();
+ for (int readCount = 0; readCount < count; ++readCount) {
+ builder.addUnsupportedHdrType(in.readString());
+ }
+
boolean supported = in.readBoolean();
builder.setSlowMotionSupported(supported);