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

Commit f62bd57c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Merge "Merge "[PATCH] Add attribute 'startOffsetMs' to... 

Merge "Merge "Merge "Merge "[PATCH] Add attribute 'startOffsetMs' to media_profiles.xsd" into android12-tests-dev am: 78e27d42" into android12L-tests-dev am: 16d792e7" into android13-tests-dev am: 62eb5133" am: 57c7a347 am: dcf78d5d

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2244796



Change-Id: I01a0ea3a313bf3d9095ede4f600a79d59f01b83a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b123a5b1 dcf78d5d

media/libmedia/xsd/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -47,7 +47,9 @@ package media.profiles { 
    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 int getStartOffsetMs();

    method public void setCameraId(int);

    method public void setStartOffsetMs(int);

  }



  public static class CamcorderProfiles.ImageDecodingOptional {

media/libmedia/xsd/media_profiles.xsd

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
            </xs:element>

        </xs:choice>

        <xs:attribute name="cameraId" type="xs:int"/>

        <xs:attribute name="startOffsetMs" type="xs:int"/>

    </xs:complexType>

    <xs:complexType name="EncoderProfile">

        <xs:sequence>