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

Commit fcc10c66 authored by Sundong Ahn's avatar Sundong Ahn
Browse files

Modify the media_profiles.xsd 

On some devices, ImageEncoding and ImageDecoding tags are used in any
order. And parser in libmedia library can support it.
So xsd file is modified for supporting any orther.

Bug: 132049541
Test: make -j40 vts
Test: vts-tradefed run vts -m VtsValidateMediaProfiles

Change-Id: Ib32cfcce82fc72294533905c29227f6e443aa7d6
parent b904fe47

media/libmedia/xsd/api/current.txt

+7 −7
Original line number Diff line number Diff line
@@ -44,20 +44,20 @@ package media.profiles { 
  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);

  }

media/libmedia/xsd/media_profiles.xsd

+5 −5
Original line number Diff line number Diff line
@@ -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">