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

Commit 9a79692e authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge "API access to mediametrics"

parents 90572a4a 0e0fee1e

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -21320,6 +21320,7 @@ package android.media { 
    method public deprecated java.nio.ByteBuffer[] getInputBuffers();

    method public final android.media.MediaFormat getInputFormat();

    method public android.media.Image getInputImage(int);

    method public android.os.Bundle getMetrics();

    method public final java.lang.String getName();

    method public java.nio.ByteBuffer getOutputBuffer(int);

    method public deprecated java.nio.ByteBuffer[] getOutputBuffers();
@@ -22145,6 +22146,7 @@ package android.media { 
    method public int getCurrentPosition();

    method public android.media.BufferingParams getDefaultBufferingParams();

    method public int getDuration();

    method public android.os.Bundle getMetrics();

    method public android.media.PlaybackParams getPlaybackParams();

    method public int getSelectedTrack(int) throws java.lang.IllegalStateException;

    method public android.media.SyncParams getSyncParams();

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -22924,6 +22924,7 @@ package android.media { 
    method public deprecated java.nio.ByteBuffer[] getInputBuffers();

    method public final android.media.MediaFormat getInputFormat();

    method public android.media.Image getInputImage(int);

    method public android.os.Bundle getMetrics();

    method public final java.lang.String getName();

    method public java.nio.ByteBuffer getOutputBuffer(int);

    method public deprecated java.nio.ByteBuffer[] getOutputBuffers();
@@ -23749,6 +23750,7 @@ package android.media { 
    method public int getCurrentPosition();

    method public android.media.BufferingParams getDefaultBufferingParams();

    method public int getDuration();

    method public android.os.Bundle getMetrics();

    method public android.media.PlaybackParams getPlaybackParams();

    method public int getSelectedTrack(int) throws java.lang.IllegalStateException;

    method public android.media.SyncParams getSyncParams();

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -21412,6 +21412,7 @@ package android.media { 
    method public deprecated java.nio.ByteBuffer[] getInputBuffers();

    method public final android.media.MediaFormat getInputFormat();

    method public android.media.Image getInputImage(int);

    method public android.os.Bundle getMetrics();

    method public final java.lang.String getName();

    method public java.nio.ByteBuffer getOutputBuffer(int);

    method public deprecated java.nio.ByteBuffer[] getOutputBuffers();
@@ -22237,6 +22238,7 @@ package android.media { 
    method public int getCurrentPosition();

    method public android.media.BufferingParams getDefaultBufferingParams();

    method public int getDuration();

    method public android.os.Bundle getMetrics();

    method public android.media.PlaybackParams getPlaybackParams();

    method public int getSelectedTrack(int) throws java.lang.IllegalStateException;

    method public android.media.SyncParams getSyncParams();

media/java/android/media/MediaCodec.java

+9 −0
Original line number Diff line number Diff line
@@ -3133,6 +3133,15 @@ final public class MediaCodec { 
    @NonNull

    public native final String getName();



    /**

     *  Returns Analytics/Metrics data about the current content being

     *

     * @return a Bundle containint the set of attributes and values available

     * for the media being handled by this instance of MediaCodec

     *

     */

    public native Bundle getMetrics();



    /**

     * Change a video encoder's target bitrate on the fly. The value is an

     * Integer object containing the new bitrate in bps.

media/java/android/media/MediaPlayer.java

+9 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.res.AssetFileDescriptor;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.IBinder;
@@ -1386,6 +1387,14 @@ public class MediaPlayer extends PlayerBase 
     */

    public native int getVideoHeight();



    /**

     *  Returns Analytics/Metrics data about the current video in this player.

     *

     * @return the a map of attributes and values available for this video

     * player or null if no metrics are available.

     */

    public native Bundle getMetrics();



    /**

     * Checks whether the MediaPlayer is playing.

     *