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

Commit 1e47be9a authored by Chong Zhang's avatar Chong Zhang
Browse files

Add XMP offset/size to MediaMetadataRetriever 

bug: 159373092
test: local manual test that ExifInterface gets the XMP offset/size
correctly

Change-Id: I718a8819ea348b4268beaac3efbbe0cb428f1b01
parent cf453637

core/api/module-lib-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ package android.media { 


  public class MediaMetadataRetriever implements java.lang.AutoCloseable {

    field public static final int METADATA_KEY_VIDEO_CODEC_MIME_TYPE = 40; // 0x28

    field public static final int METADATA_KEY_XMP_LENGTH = 42; // 0x2a

    field public static final int METADATA_KEY_XMP_OFFSET = 41; // 0x29

  }



}

media/java/android/media/MediaMetadataRetriever.java

+19 −3
Original line number Diff line number Diff line
@@ -1313,14 +1313,14 @@ public class MediaMetadataRetriever implements AutoCloseable { 
    public static final int METADATA_KEY_VIDEO_FRAME_COUNT = 32;



    /**

     * If the media contains EXIF data, this key retrieves the offset value

     * If the media contains EXIF data, this key retrieves the offset (in bytes)

     * of the data.

     */

    public static final int METADATA_KEY_EXIF_OFFSET = 33;



    /**

     * If the media contains EXIF data, this key retrieves the length of the

     * data.

     * If the media contains EXIF data, this key retrieves the length (in bytes)

     * of the data.

     */

    public static final int METADATA_KEY_EXIF_LENGTH = 34;
@@ -1371,5 +1371,21 @@ public class MediaMetadataRetriever implements AutoCloseable { 
    @SystemApi(client = MODULE_LIBRARIES)

    public static final int METADATA_KEY_VIDEO_CODEC_MIME_TYPE = 40;



    /**

     * If the media contains XMP data, this key retrieves the offset (in bytes)

     * of the data.

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int METADATA_KEY_XMP_OFFSET = 41;



    /**

     * If the media contains XMP data, this key retrieves the length (in bytes)

     * of the data.

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int METADATA_KEY_XMP_LENGTH = 42;



    // Add more here...

}