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

Commit 90fadd3f authored by Sundong Ahn's avatar Sundong Ahn Committed by android-build-merger
Browse files

Merge "Update media_codecs.xsd schema" into qt-dev 

am: b1292d82

Change-Id: Ifd350661c900d14c046b4094264afbe84cee21ed
parents ed11faff b1292d82

media/libstagefright/xmlparser/api/current.txt

+23 −1
Original line number Diff line number Diff line
@@ -68,16 +68,26 @@ package media.codecs { 
  public class MediaCodec {

    ctor public MediaCodec();

    method public java.util.List<media.codecs.Alias> getAlias_optional();

    method public java.util.List<media.codecs.Quirk> getAttribute_optional();

    method public String getDomain();

    method public String getEnabled();

    method public java.util.List<media.codecs.Feature> getFeature_optional();

    method public java.util.List<media.codecs.Limit> getLimit_optional();

    method public String getName();

    method public java.util.List<media.codecs.Quirk> getQuirk_optional();

    method public String getRank();

    method public String getType();

    method public java.util.List<media.codecs.Type> getType_optional();

    method public String getUpdate();

    method public String getVariant();

    method public java.util.List<media.codecs.Variant> getVariant_optional();

    method public void setDomain(String);

    method public void setEnabled(String);

    method public void setName(String);

    method public void setRank(String);

    method public void setType(String);

    method public void setUpdate(String);

    method public void setVariant(String);

  }



  public class MediaCodecs {
@@ -91,14 +101,18 @@ package media.codecs { 
  public class Quirk {

    ctor public Quirk();

    method public String getName();

    method public String getValue();

    method public void setName(String);

    method public void setValue(String);

  }



  public class Setting {

    ctor public Setting();

    method public String getEnabled();

    method public String getName();

    method public String getUpdate();

    method public String getValue();

    method public void setEnabled(String);

    method public void setName(String);

    method public void setUpdate(String);

    method public void setValue(String);
@@ -106,7 +120,9 @@ package media.codecs { 


  public class Settings {

    ctor public Settings();

    method public java.util.List<media.codecs.Setting> getSetting();

    method public java.util.List<media.codecs.Setting> getDomain_optional();

    method public java.util.List<media.codecs.Setting> getSetting_optional();

    method public java.util.List<media.codecs.Setting> getVariant_optional();

  }



  public class Type {
@@ -120,6 +136,12 @@ package media.codecs { 
    method public void setUpdate(String);

  }



  public class Variant {

    ctor public Variant();

    method public String getName();

    method public void setName(String);

  }



  public class XmlParser {

    ctor public XmlParser();

    method public static media.codecs.Included readIncluded(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;

media/libstagefright/xmlparser/media_codecs.xsd

+16 −3
Original line number Diff line number Diff line
@@ -49,24 +49,33 @@ 
        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="Settings">

        <xs:sequence>

            <xs:element name="Setting" type="Setting" maxOccurs="unbounded"/>

        </xs:sequence>

        <xs:choice minOccurs="0" maxOccurs="unbounded">

            <xs:element name="Setting" type="Setting"/>

            <xs:element name="Variant" type="Setting"/>

            <xs:element name="Domain" type="Setting"/>

        </xs:choice>

    </xs:complexType>

    <xs:complexType name="MediaCodec">

        <xs:choice minOccurs="0" maxOccurs="unbounded">

            <xs:element name="Quirk" type="Quirk" minOccurs="0" maxOccurs="unbounded"/>

            <xs:element name="Attribute" type="Quirk" minOccurs="0" maxOccurs="unbounded"/>

            <xs:element name="Type" type="Type" minOccurs="0" maxOccurs="unbounded"/>

            <xs:element name="Alias" type="Alias" minOccurs="0" maxOccurs="unbounded"/>

            <xs:element name="Limit" type="Limit" minOccurs="0" maxOccurs="unbounded"/>

            <xs:element name="Feature" type="Feature" minOccurs="0" maxOccurs="unbounded"/>

            <xs:element name="Variant" type="Variant" minOccurs="0" maxOccurs="unbounded"/>

        </xs:choice>

        <xs:attribute name="name" type="xs:string"/>

        <xs:attribute name="type" type="xs:string"/>

        <xs:attribute name="update" type="xs:string"/>

        <xs:attribute name="rank" type="xs:string"/>

        <xs:attribute name="domain" type="xs:string"/>

        <xs:attribute name="variant" type="xs:string"/>

        <xs:attribute name="enabled" type="xs:string"/>

    </xs:complexType>

    <xs:complexType name="Quirk">

        <xs:attribute name="name" type="xs:string"/>

        <xs:attribute name="value" type="xs:string"/>

    </xs:complexType>

    <xs:complexType name="Type">

        <xs:sequence>
@@ -97,9 +106,13 @@ 
        <xs:attribute name="required" type="xs:string"/>

        <xs:attribute name="value" type="xs:string"/>

    </xs:complexType>

    <xs:complexType name="Variant">

        <xs:attribute name="name" type="xs:string"/>

    </xs:complexType>

    <xs:complexType name="Setting">

        <xs:attribute name="name" type="xs:string"/>

        <xs:attribute name="value" type="xs:string"/>

        <xs:attribute name="enabled" type="xs:string"/>

        <xs:attribute name="update" type="xs:string"/>

    </xs:complexType>

    <xs:complexType name="Include">