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

Commit d00c4397 authored by Andrew Lewis's avatar Andrew Lewis Committed by Android (Google) Code Review
Browse files

Merge "Improve editing metrics APIs and documentation" into main

parents 591408db 862c82a0

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -26097,7 +26097,6 @@ package android.media.metrics { 
    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.media.metrics.MediaItemInfo> CREATOR;

    field public static final long DATA_TYPE_AUDIO = 4L; // 0x4L

    field public static final long DATA_TYPE_CUE_POINTS = 128L; // 0x80L

    field public static final long DATA_TYPE_DEPTH = 16L; // 0x10L

    field public static final long DATA_TYPE_GAIN_MAP = 32L; // 0x20L

    field public static final long DATA_TYPE_GAPLESS = 256L; // 0x100L
@@ -26106,6 +26105,7 @@ package android.media.metrics { 
    field public static final long DATA_TYPE_IMAGE = 1L; // 0x1L

    field public static final long DATA_TYPE_METADATA = 8L; // 0x8L

    field public static final long DATA_TYPE_SPATIAL_AUDIO = 512L; // 0x200L

    field public static final long DATA_TYPE_SPEED_SETTING_CUE_POINTS = 128L; // 0x80L

    field public static final long DATA_TYPE_VIDEO = 2L; // 0x2L

    field public static final int SOURCE_TYPE_CAMERA = 2; // 0x2

    field public static final int SOURCE_TYPE_EDITING_SESSION = 3; // 0x3

media/java/android/media/metrics/EditingEndedEvent.java

+5 −4
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ public final class EditingEndedEvent extends Event implements Parcelable { 
    /** Input audio was edited. */

    public static final long OPERATION_TYPE_AUDIO_EDIT = 1L << 3;



    /** Input video samples were writted (muxed) directly to the output file without transcoding. */

    /** Input video samples were written (muxed) directly to the output file without transcoding. */

    public static final long OPERATION_TYPE_VIDEO_TRANSMUX = 1L << 4;



    /** Input audio samples were written (muxed) directly to the output file without transcoding. */
@@ -272,7 +272,8 @@ public final class EditingEndedEvent extends Event implements Parcelable { 
    }



    /**

     * Returns the name of the library implementing the exporting operation, or {@code null} if

     * Returns the name of the library implementing the exporting operation, for example, a Maven

     * artifact ID like "androidx.media3.media3-transformer:1.3.0-beta01", or {@code null} if

     * unknown.

     */

    @Nullable
@@ -281,8 +282,8 @@ public final class EditingEndedEvent extends Event implements Parcelable { 
    }



    /**

     * Returns the name of the library implementing the media muxing operation, or {@code null} if

     * unknown.

     * Returns the name of the library implementing the media muxing operation, for example, a Maven

     * artifact ID like "androidx.media3.media3-muxer:1.3.0-beta01", or {@code null} if unknown.

     */

    @Nullable

    public String getMuxerName() {

media/java/android/media/metrics/MediaItemInfo.java

+10 −4
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ public final class MediaItemInfo implements Parcelable { 
                DATA_TYPE_DEPTH,

                DATA_TYPE_GAIN_MAP,

                DATA_TYPE_HIGH_FRAME_RATE,

                DATA_TYPE_CUE_POINTS,

                DATA_TYPE_SPEED_SETTING_CUE_POINTS,

                DATA_TYPE_GAPLESS,

                DATA_TYPE_SPATIAL_AUDIO,

                DATA_TYPE_HIGH_DYNAMIC_RANGE_VIDEO,
@@ -109,7 +109,10 @@ public final class MediaItemInfo implements Parcelable { 
    /** The media item includes audio data. */

    public static final long DATA_TYPE_AUDIO = 1L << 2;



    /** The media item includes metadata. */

    /**

     * The media item includes static media container metadata (for example, capture frame rate or

     * location information).

     */

    public static final long DATA_TYPE_METADATA = 1L << 3;



    /** The media item includes depth (z-distance) information. */
@@ -121,8 +124,11 @@ public final class MediaItemInfo implements Parcelable { 
    /** The media item includes high frame rate video data. */

    public static final long DATA_TYPE_HIGH_FRAME_RATE = 1L << 6;



    /** The media item includes time-dependent speed setting metadata. */

    public static final long DATA_TYPE_CUE_POINTS = 1L << 7;

    /**

     * The media item includes time-dependent speed information (for example, slow motion cue

     * points).

     */

    public static final long DATA_TYPE_SPEED_SETTING_CUE_POINTS = 1L << 7;



    /** The media item includes gapless audio metadata. */

    public static final long DATA_TYPE_GAPLESS = 1L << 8;