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

Commit b47983f0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add session ID" into sc-dev

parents ac5aec91 7dce143d

media/java/android/media/MediaCodec.java

+0 −1
Original line number Diff line number Diff line
@@ -1684,7 +1684,6 @@ final public class MediaCodec { 
    private MediaCodecInfo mCodecInfo;

    private final Object mCodecInfoLock = new Object();

    private MediaCrypto mCrypto;

    private String mPlaybackId;



    private static final int EVENT_CALLBACK = 1;

    private static final int EVENT_SET_CALLBACK = 2;

media/java/android/media/MediaFormat.java

+9 −0
Original line number Diff line number Diff line
@@ -218,6 +218,15 @@ public final class MediaFormat { 
    @UnsupportedAppUsage

    private Map<String, Object> mMap;



    /**

     * A key describing the log session ID for MediaCodec. The log session ID is a random 32-byte

     * hexadecimal string that is used to associate metrics from multiple media codec instances

     * to the same playback or recording session.

     * The associated value is a string.

     * @hide

     */

    public static final String LOG_SESSION_ID = "log-session-id";



    /**

     * A key describing the mime type of the MediaFormat.

     * The associated value is a string.