commit b5bfa8fdd50307af30fd00b84bcd48e255fe908b
author Pawin Vongmasa <pawin@google.com> Mon May 08 17:06:22 2017 -0700
committer Pawin Vongmasa <pawin@google.com> Tue May 16 19:03:13 2017 -0700
tree dc7fc5c6484f338f923251fc943ab1d7e91a42f0
parent d7db05b2fea5125d7833fa87a445ec819c54e10d

Update schema for media_profiles_V1_0.xml

Test: Small CtsMediaTestCases
Test: "xmllint --valid ..." now produces no error

Bug: 36430270
Merged-In: I1270a9357d444047f463e3da25510ae69930a451
Change-Id: I1270a9357d444047f463e3da25510ae69930a451

media/libmedia/xml/media_profiles_V1_0.dtd

diff --git a/media/libmedia/xml/media_profiles_V1_0.dtd b/media/libmedia/xml/media_profiles_V1_0.dtd
index 627bb68..40900e0 100644
--- a/media/libmedia/xml/media_profiles_V1_0.dtd
+++ b/media/libmedia/xml/media_profiles_V1_0.dtd
@@ -1,15 +1,15 @@
-<!ELEMENT MediaSettings (CamcorderProfiles,
+<!ELEMENT MediaSettings (CamcorderProfiles+,
                          EncoderOutputFileFormat+,
                          VideoEncoderCap+,
                          AudioEncoderCap+,
                          VideoDecoderCap,
                          AudioDecoderCap)>
-<!ELEMENT CamcorderProfiles (EncoderProfile+, ImageEncoding+, ImageDecoding, Camera)>
+<!ELEMENT CamcorderProfiles (EncoderProfile|ImageEncoding|ImageDecoding|Camera)+>
+<!ATTLIST CamcorderProfiles cameraId (0|1) #REQUIRED>
 <!ELEMENT EncoderProfile (Video, Audio)>
-<!ATTLIST EncoderProfile quality (high|low) #REQUIRED>
+<!ATTLIST EncoderProfile quality CDATA #REQUIRED>
 <!ATTLIST EncoderProfile fileFormat (mp4|3gp) #REQUIRED>
 <!ATTLIST EncoderProfile duration (30|60) #REQUIRED>
-<!ATTLIST EncoderProfile cameraId (0|1) #REQUIRED>
 <!ELEMENT Video EMPTY>
 <!ATTLIST Video codec (h264|h263|m4v) #REQUIRED>
 <!ATTLIST Video bitRate CDATA #REQUIRED>
@@ -22,7 +22,7 @@
 <!ATTLIST Audio sampleRate CDATA #REQUIRED>
 <!ATTLIST Audio channels (1|2) #REQUIRED>
 <!ELEMENT ImageEncoding EMPTY>
-<!ATTLIST ImageEncoding quality (90|80|70|60|50|40) #REQUIRED>
+<!ATTLIST ImageEncoding quality (95|90|80|70|60|50|40) #REQUIRED>
 <!ELEMENT ImageDecoding EMPTY>
 <!ATTLIST ImageDecoding memCap CDATA #REQUIRED>
 <!ELEMENT Camera EMPTY>
@@ -40,7 +40,7 @@
 <!ATTLIST VideoEncoderCap minFrameRate CDATA #REQUIRED>
 <!ATTLIST VideoEncoderCap maxFrameRate CDATA #REQUIRED>
 <!ELEMENT AudioEncoderCap EMPTY>
-<!ATTLIST AudioEncoderCap name (amrnb|amrwb|aac|wma) #REQUIRED>
+<!ATTLIST AudioEncoderCap name (amrnb|amrwb|aac|wma|heaac|aaceld) #REQUIRED>
 <!ATTLIST AudioEncoderCap enabled (true|false) #REQUIRED>
 <!ATTLIST AudioEncoderCap minBitRate CDATA #REQUIRED>
 <!ATTLIST AudioEncoderCap maxBitRate CDATA #REQUIRED>