Merge "Modify the media_profiles.xsd" into qt-dev am: eba3386fab am: cdb2c638ee
am: c0a1a3875e
Change-Id: I04be76880b0bf64028fc763abd19e901dea36e98
diff --git a/media/libmedia/xsd/api/current.txt b/media/libmedia/xsd/api/current.txt
index 05e8a49..73b5f8d 100644
--- a/media/libmedia/xsd/api/current.txt
+++ b/media/libmedia/xsd/api/current.txt
@@ -44,20 +44,20 @@
public class CamcorderProfiles {
ctor public CamcorderProfiles();
method public int getCameraId();
- method public java.util.List<media.profiles.EncoderProfile> getEncoderProfile();
- method public java.util.List<media.profiles.CamcorderProfiles.ImageDecoding> getImageDecoding();
- method public java.util.List<media.profiles.CamcorderProfiles.ImageEncoding> getImageEncoding();
+ method public java.util.List<media.profiles.EncoderProfile> getEncoderProfile_optional();
+ method public java.util.List<media.profiles.CamcorderProfiles.ImageDecodingOptional> getImageDecoding_optional();
+ method public java.util.List<media.profiles.CamcorderProfiles.ImageEncodingOptional> getImageEncoding_optional();
method public void setCameraId(int);
}
- public static class CamcorderProfiles.ImageDecoding {
- ctor public CamcorderProfiles.ImageDecoding();
+ public static class CamcorderProfiles.ImageDecodingOptional {
+ ctor public CamcorderProfiles.ImageDecodingOptional();
method public int getMemCap();
method public void setMemCap(int);
}
- public static class CamcorderProfiles.ImageEncoding {
- ctor public CamcorderProfiles.ImageEncoding();
+ public static class CamcorderProfiles.ImageEncodingOptional {
+ ctor public CamcorderProfiles.ImageEncodingOptional();
method public int getQuality();
method public void setQuality(int);
}
diff --git a/media/libmedia/xsd/media_profiles.xsd b/media/libmedia/xsd/media_profiles.xsd
index a02252a..9664456 100644
--- a/media/libmedia/xsd/media_profiles.xsd
+++ b/media/libmedia/xsd/media_profiles.xsd
@@ -35,19 +35,19 @@
</xs:complexType>
</xs:element>
<xs:complexType name="CamcorderProfiles">
- <xs:sequence>
- <xs:element name="EncoderProfile" type="EncoderProfile" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="ImageEncoding" minOccurs="0" maxOccurs="unbounded">
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="EncoderProfile" type="EncoderProfile"/>
+ <xs:element name="ImageEncoding">
<xs:complexType>
<xs:attribute name="quality" type="xs:int"/>
</xs:complexType>
</xs:element>
- <xs:element name="ImageDecoding" minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="ImageDecoding">
<xs:complexType>
<xs:attribute name="memCap" type="xs:int"/>
</xs:complexType>
</xs:element>
- </xs:sequence>
+ </xs:choice>
<xs:attribute name="cameraId" type="xs:int"/>
</xs:complexType>
<xs:complexType name="EncoderProfile">