Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rework getMetrics() api per API council" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-15 18:52:01 +00:00
committed by Android (Google) Code Review
parent 35edfc1fdc 10353e3601
commit abbea1df6b
13 changed files with 527 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
api/current.txt
View File

@@ -21906,7 +21906,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.media.MediaMetricsSet getMetrics();
method public android.os.PersistableBundle getMetrics();
method public final java.lang.String getName();
method public java.nio.ByteBuffer getOutputBuffer(int);
method public deprecated java.nio.ByteBuffer[] getOutputBuffers();
@@ -22004,6 +22004,19 @@ package android.media {
method public void set(int, int);
}
public static final class MediaCodec.MetricsConstants {
field public static final java.lang.String CODEC = "android.media.mediacodec.codec";
field public static final java.lang.String ENCODER = "android.media.mediacodec.encoder";
field public static final java.lang.String HEIGHT = "android.media.mediacodec.height";
field public static final java.lang.String MIME_TYPE = "android.media.mediacodec.mime";
field public static final java.lang.String MODE = "android.media.mediacodec.mode";
field public static final java.lang.String MODE_AUDIO = "audio";
field public static final java.lang.String MODE_VIDEO = "video";
field public static final java.lang.String ROTATION = "android.media.mediacodec.rotation";
field public static final java.lang.String SECURE = "android.media.mediacodec.secure";
field public static final java.lang.String WIDTH = "android.media.mediacodec.width";
}
public static abstract interface MediaCodec.OnFrameRenderedListener {
method public abstract void onFrameRendered(android.media.MediaCodec, long, long);
}
@@ -22459,7 +22472,7 @@ package android.media {
method public long getCachedDuration();
method public android.media.MediaExtractor.CasInfo getCasInfo(int);
method public android.media.DrmInitData getDrmInitData();
method public android.media.MediaMetricsSet getMetrics();
method public android.os.PersistableBundle getMetrics();
method public java.util.Map<java.util.UUID, byte[]> getPsshInfo();
method public boolean getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo);
method public int getSampleFlags();
@@ -22494,6 +22507,12 @@ package android.media {
method public int getSystemId();
}
public static final class MediaExtractor.MetricsConstants {
field public static final java.lang.String FORMAT = "android.media.mediaextractor.fmt";
field public static final java.lang.String MIME_TYPE = "android.media.mediaextractor.mime";
field public static final java.lang.String TRACKS = "android.media.mediaextractor.ntrk";
}
public final class MediaFormat {
ctor public MediaFormat();
method public final boolean containsKey(java.lang.String);
@@ -22719,69 +22738,6 @@ package android.media {
field public static final int OPTION_PREVIOUS_SYNC = 0; // 0x0
}
public final class MediaMetricsSet {
method public double getDouble(java.lang.String, double);
method public int getInt(java.lang.String, int);
method public long getLong(java.lang.String, long);
method public java.lang.String getString(java.lang.String, java.lang.String);
method public boolean isEmpty();
method public java.util.Set<java.lang.String> keySet();
method public int size();
}
public static final class MediaMetricsSet.MediaCodec {
field public static final java.lang.String KEY_CODEC = "android.media.mediacodec.codec";
field public static final java.lang.String KEY_ENCODER = "android.media.mediacodec.encoder";
field public static final java.lang.String KEY_HEIGHT = "android.media.mediacodec.height";
field public static final java.lang.String KEY_MIME = "android.media.mediacodec.mime";
field public static final java.lang.String KEY_MODE = "android.media.mediacodec.mode";
field public static final java.lang.String KEY_ROTATION = "android.media.mediacodec.rotation";
field public static final java.lang.String KEY_SECURE = "android.media.mediacodec.secure";
field public static final java.lang.String KEY_WIDTH = "android.media.mediacodec.width";
field public static final java.lang.String MODE_AUDIO = "audio";
field public static final java.lang.String MODE_VIDEO = "video";
}
public static final class MediaMetricsSet.MediaExtractor {
field public static final java.lang.String KEY_FORMAT = "android.media.mediaextractor.fmt";
field public static final java.lang.String KEY_MIME = "android.media.mediaextractor.mime";
field public static final java.lang.String KEY_TRACKS = "android.media.mediaextractor.ntrk";
}
public static final class MediaMetricsSet.MediaPlayer {
field public static final java.lang.String KEY_CODEC_AUDIO = "android.media.mediaplayer.audio.codec";
field public static final java.lang.String KEY_CODEC_VIDEO = "android.media.mediaplayer.video.codec";
field public static final java.lang.String KEY_DURATION = "android.media.mediaplayer.durationMs";
field public static final java.lang.String KEY_ERRORS = "android.media.mediaplayer.err";
field public static final java.lang.String KEY_ERROR_CODE = "android.media.mediaplayer.errcode";
field public static final java.lang.String KEY_FRAMES = "android.media.mediaplayer.frames";
field public static final java.lang.String KEY_FRAMES_DROPPED = "android.media.mediaplayer.dropped";
field public static final java.lang.String KEY_HEIGHT = "android.media.mediaplayer.height";
field public static final java.lang.String KEY_MIME_AUDIO = "android.media.mediaplayer.audio.mime";
field public static final java.lang.String KEY_MIME_VIDEO = "android.media.mediaplayer.video.mime";
field public static final java.lang.String KEY_PLAYING = "android.media.mediaplayer.playingMs";
field public static final java.lang.String KEY_WIDTH = "android.media.mediaplayer.width";
}
public static final class MediaMetricsSet.MediaRecorder {
field public static final java.lang.String KEY_AUDIO_BITRATE = "android.media.mediarecorder.audio-bitrate";
field public static final java.lang.String KEY_AUDIO_CHANNELS = "android.media.mediarecorder.audio-channels";
field public static final java.lang.String KEY_AUDIO_SAMPLERATE = "android.media.mediarecorder.audio-samplerate";
field public static final java.lang.String KEY_AUDIO_TIMESCALE = "android.media.mediarecorder.audio-timescale";
field public static final java.lang.String KEY_CAPTURE_FPS = "android.media.mediarecorder.capture-fps";
field public static final java.lang.String KEY_CAPTURE_FPS_ENABLE = "android.media.mediarecorder.capture-fpsenable";
field public static final java.lang.String KEY_FRAMERATE = "android.media.mediarecorder.frame-rate";
field public static final java.lang.String KEY_HEIGHT = "android.media.mediarecorder.height";
field public static final java.lang.String KEY_MOVIE_TIMESCALE = "android.media.mediarecorder.movie-timescale";
field public static final java.lang.String KEY_ROTATION = "android.media.mediarecorder.rotation";
field public static final java.lang.String KEY_VIDEO_BITRATE = "android.media.mediarecorder.video-bitrate";
field public static final java.lang.String KEY_VIDEO_IFRAME_INTERVAL = "android.media.mediarecorder.video-iframe-interval";
field public static final java.lang.String KEY_VIDEO_LEVEL = "android.media.mediarecorder.video-encoder-level";
field public static final java.lang.String KEY_VIDEO_PROFILE = "android.media.mediarecorder.video-encoder-profile";
field public static final java.lang.String KEY_VIDEO_TIMESCALE = "android.media.mediarecorder.video-timescale";
field public static final java.lang.String KEY_WIDTH = "android.media.mediarecorder.width";
}
public final class MediaMuxer {
ctor public MediaMuxer(java.lang.String, int) throws java.io.IOException;
ctor public MediaMuxer(java.io.FileDescriptor, int) throws java.io.IOException;
@@ -22820,7 +22776,7 @@ package android.media {
method public java.lang.String getDrmPropertyString(java.lang.String) throws android.media.MediaPlayer.NoDrmSchemeException;
method public int getDuration();
method public android.media.MediaDrm.KeyRequest getKeyRequest(byte[], java.lang.String, int, java.util.Map<java.lang.String, java.lang.String>) throws android.media.MediaPlayer.NoDrmSchemeException;
method public android.media.MediaMetricsSet getMetrics();
method public android.os.PersistableBundle getMetrics();
method public android.media.PlaybackParams getPlaybackParams();
method public int getSelectedTrack(int) throws java.lang.IllegalStateException;
method public android.media.SyncParams getSyncParams();
@@ -22915,6 +22871,21 @@ package android.media {
method public java.util.UUID[] getSupportedSchemes();
}
public static final class MediaPlayer.MetricsConstants {
field public static final java.lang.String CODEC_AUDIO = "android.media.mediaplayer.audio.codec";
field public static final java.lang.String CODEC_VIDEO = "android.media.mediaplayer.video.codec";
field public static final java.lang.String DURATION = "android.media.mediaplayer.durationMs";
field public static final java.lang.String ERRORS = "android.media.mediaplayer.err";
field public static final java.lang.String ERROR_CODE = "android.media.mediaplayer.errcode";
field public static final java.lang.String FRAMES = "android.media.mediaplayer.frames";
field public static final java.lang.String FRAMES_DROPPED = "android.media.mediaplayer.dropped";
field public static final java.lang.String HEIGHT = "android.media.mediaplayer.height";
field public static final java.lang.String MIME_TYPE_AUDIO = "android.media.mediaplayer.audio.mime";
field public static final java.lang.String MIME_TYPE_VIDEO = "android.media.mediaplayer.video.mime";
field public static final java.lang.String PLAYING = "android.media.mediaplayer.playingMs";
field public static final java.lang.String WIDTH = "android.media.mediaplayer.width";
}
public static final class MediaPlayer.NoDrmSchemeException extends android.media.MediaDrmException {
ctor public MediaPlayer.NoDrmSchemeException(java.lang.String);
}
@@ -22989,7 +22960,7 @@ package android.media {
ctor public MediaRecorder();
method public static final int getAudioSourceMax();
method public int getMaxAmplitude() throws java.lang.IllegalStateException;
method public android.media.MediaMetricsSet getMetrics();
method public android.os.PersistableBundle getMetrics();
method public android.view.Surface getSurface();
method public void pause() throws java.lang.IllegalStateException;
method public void prepare() throws java.io.IOException, java.lang.IllegalStateException;
@@ -23057,6 +23028,25 @@ package android.media {
field public static final int VOICE_UPLINK = 2; // 0x2
}
public static final class MediaRecorder.MetricsConstants {
field public static final java.lang.String AUDIO_BITRATE = "android.media.mediarecorder.audio-bitrate";
field public static final java.lang.String AUDIO_CHANNELS = "android.media.mediarecorder.audio-channels";
field public static final java.lang.String AUDIO_SAMPLERATE = "android.media.mediarecorder.audio-samplerate";
field public static final java.lang.String AUDIO_TIMESCALE = "android.media.mediarecorder.audio-timescale";
field public static final java.lang.String CAPTURE_FPS = "android.media.mediarecorder.capture-fps";
field public static final java.lang.String CAPTURE_FPS_ENABLE = "android.media.mediarecorder.capture-fpsenable";
field public static final java.lang.String FRAMERATE = "android.media.mediarecorder.frame-rate";
field public static final java.lang.String HEIGHT = "android.media.mediarecorder.height";
field public static final java.lang.String MOVIE_TIMESCALE = "android.media.mediarecorder.movie-timescale";
field public static final java.lang.String ROTATION = "android.media.mediarecorder.rotation";
field public static final java.lang.String VIDEO_BITRATE = "android.media.mediarecorder.video-bitrate";
field public static final java.lang.String VIDEO_IFRAME_INTERVAL = "android.media.mediarecorder.video-iframe-interval";
field public static final java.lang.String VIDEO_LEVEL = "android.media.mediarecorder.video-encoder-level";
field public static final java.lang.String VIDEO_PROFILE = "android.media.mediarecorder.video-encoder-profile";
field public static final java.lang.String VIDEO_TIMESCALE = "android.media.mediarecorder.video-timescale";
field public static final java.lang.String WIDTH = "android.media.mediarecorder.width";
}
public static abstract interface MediaRecorder.OnErrorListener {
method public abstract void onError(android.media.MediaRecorder, int, int);
}

124
api/system-current.txt
View File

@@ -23739,7 +23739,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.media.MediaMetricsSet getMetrics();
method public android.os.PersistableBundle getMetrics();
method public final java.lang.String getName();
method public java.nio.ByteBuffer getOutputBuffer(int);
method public deprecated java.nio.ByteBuffer[] getOutputBuffers();
@@ -23837,6 +23837,19 @@ package android.media {
method public void set(int, int);
}
public static final class MediaCodec.MetricsConstants {
field public static final java.lang.String CODEC = "android.media.mediacodec.codec";
field public static final java.lang.String ENCODER = "android.media.mediacodec.encoder";
field public static final java.lang.String HEIGHT = "android.media.mediacodec.height";
field public static final java.lang.String MIME_TYPE = "android.media.mediacodec.mime";
field public static final java.lang.String MODE = "android.media.mediacodec.mode";
field public static final java.lang.String MODE_AUDIO = "audio";
field public static final java.lang.String MODE_VIDEO = "video";
field public static final java.lang.String ROTATION = "android.media.mediacodec.rotation";
field public static final java.lang.String SECURE = "android.media.mediacodec.secure";
field public static final java.lang.String WIDTH = "android.media.mediacodec.width";
}
public static abstract interface MediaCodec.OnFrameRenderedListener {
method public abstract void onFrameRendered(android.media.MediaCodec, long, long);
}
@@ -24292,7 +24305,7 @@ package android.media {
method public long getCachedDuration();
method public android.media.MediaExtractor.CasInfo getCasInfo(int);
method public android.media.DrmInitData getDrmInitData();
method public android.media.MediaMetricsSet getMetrics();
method public android.os.PersistableBundle getMetrics();
method public java.util.Map<java.util.UUID, byte[]> getPsshInfo();
method public boolean getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo);
method public int getSampleFlags();
@@ -24327,6 +24340,12 @@ package android.media {
method public int getSystemId();
}
public static final class MediaExtractor.MetricsConstants {
field public static final java.lang.String FORMAT = "android.media.mediaextractor.fmt";
field public static final java.lang.String MIME_TYPE = "android.media.mediaextractor.mime";
field public static final java.lang.String TRACKS = "android.media.mediaextractor.ntrk";
}
public final class MediaFormat {
ctor public MediaFormat();
method public final boolean containsKey(java.lang.String);
@@ -24552,69 +24571,6 @@ package android.media {
field public static final int OPTION_PREVIOUS_SYNC = 0; // 0x0
}
public final class MediaMetricsSet {
method public double getDouble(java.lang.String, double);
method public int getInt(java.lang.String, int);
method public long getLong(java.lang.String, long);
method public java.lang.String getString(java.lang.String, java.lang.String);
method public boolean isEmpty();
method public java.util.Set<java.lang.String> keySet();
method public int size();
}
public static final class MediaMetricsSet.MediaCodec {
field public static final java.lang.String KEY_CODEC = "android.media.mediacodec.codec";
field public static final java.lang.String KEY_ENCODER = "android.media.mediacodec.encoder";
field public static final java.lang.String KEY_HEIGHT = "android.media.mediacodec.height";
field public static final java.lang.String KEY_MIME = "android.media.mediacodec.mime";
field public static final java.lang.String KEY_MODE = "android.media.mediacodec.mode";
field public static final java.lang.String KEY_ROTATION = "android.media.mediacodec.rotation";
field public static final java.lang.String KEY_SECURE = "android.media.mediacodec.secure";
field public static final java.lang.String KEY_WIDTH = "android.media.mediacodec.width";
field public static final java.lang.String MODE_AUDIO = "audio";
field public static final java.lang.String MODE_VIDEO = "video";
}
public static final class MediaMetricsSet.MediaExtractor {
field public static final java.lang.String KEY_FORMAT = "android.media.mediaextractor.fmt";
field public static final java.lang.String KEY_MIME = "android.media.mediaextractor.mime";
field public static final java.lang.String KEY_TRACKS = "android.media.mediaextractor.ntrk";
}
public static final class MediaMetricsSet.MediaPlayer {
field public static final java.lang.String KEY_CODEC_AUDIO = "android.media.mediaplayer.audio.codec";
field public static final java.lang.String KEY_CODEC_VIDEO = "android.media.mediaplayer.video.codec";
field public static final java.lang.String KEY_DURATION = "android.media.mediaplayer.durationMs";
field public static final java.lang.String KEY_ERRORS = "android.media.mediaplayer.err";
field public static final java.lang.String KEY_ERROR_CODE = "android.media.mediaplayer.errcode";
field public static final java.lang.String KEY_FRAMES = "android.media.mediaplayer.frames";
field public static final java.lang.String KEY_FRAMES_DROPPED = "android.media.mediaplayer.dropped";
field public static final java.lang.String KEY_HEIGHT = "android.media.mediaplayer.height";
field public static final java.lang.String KEY_MIME_AUDIO = "android.media.mediaplayer.audio.mime";
field public static final java.lang.String KEY_MIME_VIDEO = "android.media.mediaplayer.video.mime";
field public static final java.lang.String KEY_PLAYING = "android.media.mediaplayer.playingMs";
field public static final java.lang.String KEY_WIDTH = "android.media.mediaplayer.width";
}
public static final class MediaMetricsSet.MediaRecorder {
field public static final java.lang.String KEY_AUDIO_BITRATE = "android.media.mediarecorder.audio-bitrate";
field public static final java.lang.String KEY_AUDIO_CHANNELS = "android.media.mediarecorder.audio-channels";
field public static final java.lang.String KEY_AUDIO_SAMPLERATE = "android.media.mediarecorder.audio-samplerate";
field public static final java.lang.String KEY_AUDIO_TIMESCALE = "android.media.mediarecorder.audio-timescale";
field public static final java.lang.String KEY_CAPTURE_FPS = "android.media.mediarecorder.capture-fps";
field public static final java.lang.String KEY_CAPTURE_FPS_ENABLE = "android.media.mediarecorder.capture-fpsenable";
field public static final java.lang.String KEY_FRAMERATE = "android.media.mediarecorder.frame-rate";
field public static final java.lang.String KEY_HEIGHT = "android.media.mediarecorder.height";
field public static final java.lang.String KEY_MOVIE_TIMESCALE = "android.media.mediarecorder.movie-timescale";
field public static final java.lang.String KEY_ROTATION = "android.media.mediarecorder.rotation";
field public static final java.lang.String KEY_VIDEO_BITRATE = "android.media.mediarecorder.video-bitrate";
field public static final java.lang.String KEY_VIDEO_IFRAME_INTERVAL = "android.media.mediarecorder.video-iframe-interval";
field public static final java.lang.String KEY_VIDEO_LEVEL = "android.media.mediarecorder.video-encoder-level";
field public static final java.lang.String KEY_VIDEO_PROFILE = "android.media.mediarecorder.video-encoder-profile";
field public static final java.lang.String KEY_VIDEO_TIMESCALE = "android.media.mediarecorder.video-timescale";
field public static final java.lang.String KEY_WIDTH = "android.media.mediarecorder.width";
}
public final class MediaMuxer {
ctor public MediaMuxer(java.lang.String, int) throws java.io.IOException;
ctor public MediaMuxer(java.io.FileDescriptor, int) throws java.io.IOException;
@@ -24653,7 +24609,7 @@ package android.media {
method public java.lang.String getDrmPropertyString(java.lang.String) throws android.media.MediaPlayer.NoDrmSchemeException;
method public int getDuration();
method public android.media.MediaDrm.KeyRequest getKeyRequest(byte[], java.lang.String, int, java.util.Map<java.lang.String, java.lang.String>) throws android.media.MediaPlayer.NoDrmSchemeException;
method public android.media.MediaMetricsSet getMetrics();
method public android.os.PersistableBundle getMetrics();
method public android.media.PlaybackParams getPlaybackParams();
method public int getSelectedTrack(int) throws java.lang.IllegalStateException;
method public android.media.SyncParams getSyncParams();
@@ -24748,6 +24704,21 @@ package android.media {
method public java.util.UUID[] getSupportedSchemes();
}
public static final class MediaPlayer.MetricsConstants {
field public static final java.lang.String CODEC_AUDIO = "android.media.mediaplayer.audio.codec";
field public static final java.lang.String CODEC_VIDEO = "android.media.mediaplayer.video.codec";
field public static final java.lang.String DURATION = "android.media.mediaplayer.durationMs";
field public static final java.lang.String ERRORS = "android.media.mediaplayer.err";
field public static final java.lang.String ERROR_CODE = "android.media.mediaplayer.errcode";
field public static final java.lang.String FRAMES = "android.media.mediaplayer.frames";
field public static final java.lang.String FRAMES_DROPPED = "android.media.mediaplayer.dropped";
field public static final java.lang.String HEIGHT = "android.media.mediaplayer.height";
field public static final java.lang.String MIME_TYPE_AUDIO = "android.media.mediaplayer.audio.mime";
field public static final java.lang.String MIME_TYPE_VIDEO = "android.media.mediaplayer.video.mime";
field public static final java.lang.String PLAYING = "android.media.mediaplayer.playingMs";
field public static final java.lang.String WIDTH = "android.media.mediaplayer.width";
}
public static final class MediaPlayer.NoDrmSchemeException extends android.media.MediaDrmException {
ctor public MediaPlayer.NoDrmSchemeException(java.lang.String);
}
@@ -24822,7 +24793,7 @@ package android.media {
ctor public MediaRecorder();
method public static final int getAudioSourceMax();
method public int getMaxAmplitude() throws java.lang.IllegalStateException;
method public android.media.MediaMetricsSet getMetrics();
method public android.os.PersistableBundle getMetrics();
method public android.view.Surface getSurface();
method public void pause() throws java.lang.IllegalStateException;
method public void prepare() throws java.io.IOException, java.lang.IllegalStateException;
@@ -24892,6 +24863,25 @@ package android.media {
field public static final int VOICE_UPLINK = 2; // 0x2
}
public static final class MediaRecorder.MetricsConstants {
field public static final java.lang.String AUDIO_BITRATE = "android.media.mediarecorder.audio-bitrate";
field public static final java.lang.String AUDIO_CHANNELS = "android.media.mediarecorder.audio-channels";
field public static final java.lang.String AUDIO_SAMPLERATE = "android.media.mediarecorder.audio-samplerate";
field public static final java.lang.String AUDIO_TIMESCALE = "android.media.mediarecorder.audio-timescale";
field public static final java.lang.String CAPTURE_FPS = "android.media.mediarecorder.capture-fps";
field public static final java.lang.String CAPTURE_FPS_ENABLE = "android.media.mediarecorder.capture-fpsenable";
field public static final java.lang.String FRAMERATE = "android.media.mediarecorder.frame-rate";
field public static final java.lang.String HEIGHT = "android.media.mediarecorder.height";
field public static final java.lang.String MOVIE_TIMESCALE = "android.media.mediarecorder.movie-timescale";
field public static final java.lang.String ROTATION = "android.media.mediarecorder.rotation";
field public static final java.lang.String VIDEO_BITRATE = "android.media.mediarecorder.video-bitrate";
field public static final java.lang.String VIDEO_IFRAME_INTERVAL = "android.media.mediarecorder.video-iframe-interval";
field public static final java.lang.String VIDEO_LEVEL = "android.media.mediarecorder.video-encoder-level";
field public static final java.lang.String VIDEO_PROFILE = "android.media.mediarecorder.video-encoder-profile";
field public static final java.lang.String VIDEO_TIMESCALE = "android.media.mediarecorder.video-timescale";
field public static final java.lang.String WIDTH = "android.media.mediarecorder.width";
}
public static abstract interface MediaRecorder.OnErrorListener {
method public abstract void onError(android.media.MediaRecorder, int, int);
}

124
api/test-current.txt
View File

@@ -22013,7 +22013,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.media.MediaMetricsSet getMetrics();
method public android.os.PersistableBundle getMetrics();
method public final java.lang.String getName();
method public java.nio.ByteBuffer getOutputBuffer(int);
method public deprecated java.nio.ByteBuffer[] getOutputBuffers();
@@ -22111,6 +22111,19 @@ package android.media {
method public void set(int, int);
}
public static final class MediaCodec.MetricsConstants {
field public static final java.lang.String CODEC = "android.media.mediacodec.codec";
field public static final java.lang.String ENCODER = "android.media.mediacodec.encoder";
field public static final java.lang.String HEIGHT = "android.media.mediacodec.height";
field public static final java.lang.String MIME_TYPE = "android.media.mediacodec.mime";
field public static final java.lang.String MODE = "android.media.mediacodec.mode";
field public static final java.lang.String MODE_AUDIO = "audio";
field public static final java.lang.String MODE_VIDEO = "video";
field public static final java.lang.String ROTATION = "android.media.mediacodec.rotation";
field public static final java.lang.String SECURE = "android.media.mediacodec.secure";
field public static final java.lang.String WIDTH = "android.media.mediacodec.width";
}
public static abstract interface MediaCodec.OnFrameRenderedListener {
method public abstract void onFrameRendered(android.media.MediaCodec, long, long);
}
@@ -22566,7 +22579,7 @@ package android.media {
method public long getCachedDuration();
method public android.media.MediaExtractor.CasInfo getCasInfo(int);
method public android.media.DrmInitData getDrmInitData();
method public android.media.MediaMetricsSet getMetrics();
method public android.os.PersistableBundle getMetrics();
method public java.util.Map<java.util.UUID, byte[]> getPsshInfo();
method public boolean getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo);
method public int getSampleFlags();
@@ -22601,6 +22614,12 @@ package android.media {
method public int getSystemId();
}
public static final class MediaExtractor.MetricsConstants {
field public static final java.lang.String FORMAT = "android.media.mediaextractor.fmt";
field public static final java.lang.String MIME_TYPE = "android.media.mediaextractor.mime";
field public static final java.lang.String TRACKS = "android.media.mediaextractor.ntrk";
}
public final class MediaFormat {
ctor public MediaFormat();
method public final boolean containsKey(java.lang.String);
@@ -22826,69 +22845,6 @@ package android.media {
field public static final int OPTION_PREVIOUS_SYNC = 0; // 0x0
}
public final class MediaMetricsSet {
method public double getDouble(java.lang.String, double);
method public int getInt(java.lang.String, int);
method public long getLong(java.lang.String, long);
method public java.lang.String getString(java.lang.String, java.lang.String);
method public boolean isEmpty();
method public java.util.Set<java.lang.String> keySet();
method public int size();
}
public static final class MediaMetricsSet.MediaCodec {
field public static final java.lang.String KEY_CODEC = "android.media.mediacodec.codec";
field public static final java.lang.String KEY_ENCODER = "android.media.mediacodec.encoder";
field public static final java.lang.String KEY_HEIGHT = "android.media.mediacodec.height";
field public static final java.lang.String KEY_MIME = "android.media.mediacodec.mime";
field public static final java.lang.String KEY_MODE = "android.media.mediacodec.mode";
field public static final java.lang.String KEY_ROTATION = "android.media.mediacodec.rotation";
field public static final java.lang.String KEY_SECURE = "android.media.mediacodec.secure";
field public static final java.lang.String KEY_WIDTH = "android.media.mediacodec.width";
field public static final java.lang.String MODE_AUDIO = "audio";
field public static final java.lang.String MODE_VIDEO = "video";
}
public static final class MediaMetricsSet.MediaExtractor {
field public static final java.lang.String KEY_FORMAT = "android.media.mediaextractor.fmt";
field public static final java.lang.String KEY_MIME = "android.media.mediaextractor.mime";
field public static final java.lang.String KEY_TRACKS = "android.media.mediaextractor.ntrk";
}
public static final class MediaMetricsSet.MediaPlayer {
field public static final java.lang.String KEY_CODEC_AUDIO = "android.media.mediaplayer.audio.codec";
field public static final java.lang.String KEY_CODEC_VIDEO = "android.media.mediaplayer.video.codec";
field public static final java.lang.String KEY_DURATION = "android.media.mediaplayer.durationMs";
field public static final java.lang.String KEY_ERRORS = "android.media.mediaplayer.err";
field public static final java.lang.String KEY_ERROR_CODE = "android.media.mediaplayer.errcode";
field public static final java.lang.String KEY_FRAMES = "android.media.mediaplayer.frames";
field public static final java.lang.String KEY_FRAMES_DROPPED = "android.media.mediaplayer.dropped";
field public static final java.lang.String KEY_HEIGHT = "android.media.mediaplayer.height";
field public static final java.lang.String KEY_MIME_AUDIO = "android.media.mediaplayer.audio.mime";
field public static final java.lang.String KEY_MIME_VIDEO = "android.media.mediaplayer.video.mime";
field public static final java.lang.String KEY_PLAYING = "android.media.mediaplayer.playingMs";
field public static final java.lang.String KEY_WIDTH = "android.media.mediaplayer.width";
}
public static final class MediaMetricsSet.MediaRecorder {
field public static final java.lang.String KEY_AUDIO_BITRATE = "android.media.mediarecorder.audio-bitrate";
field public static final java.lang.String KEY_AUDIO_CHANNELS = "android.media.mediarecorder.audio-channels";
field public static final java.lang.String KEY_AUDIO_SAMPLERATE = "android.media.mediarecorder.audio-samplerate";
field public static final java.lang.String KEY_AUDIO_TIMESCALE = "android.media.mediarecorder.audio-timescale";
field public static final java.lang.String KEY_CAPTURE_FPS = "android.media.mediarecorder.capture-fps";
field public static final java.lang.String KEY_CAPTURE_FPS_ENABLE = "android.media.mediarecorder.capture-fpsenable";
field public static final java.lang.String KEY_FRAMERATE = "android.media.mediarecorder.frame-rate";
field public static final java.lang.String KEY_HEIGHT = "android.media.mediarecorder.height";
field public static final java.lang.String KEY_MOVIE_TIMESCALE = "android.media.mediarecorder.movie-timescale";
field public static final java.lang.String KEY_ROTATION = "android.media.mediarecorder.rotation";
field public static final java.lang.String KEY_VIDEO_BITRATE = "android.media.mediarecorder.video-bitrate";
field public static final java.lang.String KEY_VIDEO_IFRAME_INTERVAL = "android.media.mediarecorder.video-iframe-interval";
field public static final java.lang.String KEY_VIDEO_LEVEL = "android.media.mediarecorder.video-encoder-level";
field public static final java.lang.String KEY_VIDEO_PROFILE = "android.media.mediarecorder.video-encoder-profile";
field public static final java.lang.String KEY_VIDEO_TIMESCALE = "android.media.mediarecorder.video-timescale";
field public static final java.lang.String KEY_WIDTH = "android.media.mediarecorder.width";
}
public final class MediaMuxer {
ctor public MediaMuxer(java.lang.String, int) throws java.io.IOException;
ctor public MediaMuxer(java.io.FileDescriptor, int) throws java.io.IOException;
@@ -22927,7 +22883,7 @@ package android.media {
method public java.lang.String getDrmPropertyString(java.lang.String) throws android.media.MediaPlayer.NoDrmSchemeException;
method public int getDuration();
method public android.media.MediaDrm.KeyRequest getKeyRequest(byte[], java.lang.String, int, java.util.Map<java.lang.String, java.lang.String>) throws android.media.MediaPlayer.NoDrmSchemeException;
method public android.media.MediaMetricsSet getMetrics();
method public android.os.PersistableBundle getMetrics();
method public android.media.PlaybackParams getPlaybackParams();
method public int getSelectedTrack(int) throws java.lang.IllegalStateException;
method public android.media.SyncParams getSyncParams();
@@ -23022,6 +22978,21 @@ package android.media {
method public java.util.UUID[] getSupportedSchemes();
}
public static final class MediaPlayer.MetricsConstants {
field public static final java.lang.String CODEC_AUDIO = "android.media.mediaplayer.audio.codec";
field public static final java.lang.String CODEC_VIDEO = "android.media.mediaplayer.video.codec";
field public static final java.lang.String DURATION = "android.media.mediaplayer.durationMs";
field public static final java.lang.String ERRORS = "android.media.mediaplayer.err";
field public static final java.lang.String ERROR_CODE = "android.media.mediaplayer.errcode";
field public static final java.lang.String FRAMES = "android.media.mediaplayer.frames";
field public static final java.lang.String FRAMES_DROPPED = "android.media.mediaplayer.dropped";
field public static final java.lang.String HEIGHT = "android.media.mediaplayer.height";
field public static final java.lang.String MIME_TYPE_AUDIO = "android.media.mediaplayer.audio.mime";
field public static final java.lang.String MIME_TYPE_VIDEO = "android.media.mediaplayer.video.mime";
field public static final java.lang.String PLAYING = "android.media.mediaplayer.playingMs";
field public static final java.lang.String WIDTH = "android.media.mediaplayer.width";
}
public static final class MediaPlayer.NoDrmSchemeException extends android.media.MediaDrmException {
ctor public MediaPlayer.NoDrmSchemeException(java.lang.String);
}
@@ -23096,7 +23067,7 @@ package android.media {
ctor public MediaRecorder();
method public static final int getAudioSourceMax();
method public int getMaxAmplitude() throws java.lang.IllegalStateException;
method public android.media.MediaMetricsSet getMetrics();
method public android.os.PersistableBundle getMetrics();
method public android.view.Surface getSurface();
method public void pause() throws java.lang.IllegalStateException;
method public void prepare() throws java.io.IOException, java.lang.IllegalStateException;
@@ -23164,6 +23135,25 @@ package android.media {
field public static final int VOICE_UPLINK = 2; // 0x2
}
public static final class MediaRecorder.MetricsConstants {
field public static final java.lang.String AUDIO_BITRATE = "android.media.mediarecorder.audio-bitrate";
field public static final java.lang.String AUDIO_CHANNELS = "android.media.mediarecorder.audio-channels";
field public static final java.lang.String AUDIO_SAMPLERATE = "android.media.mediarecorder.audio-samplerate";
field public static final java.lang.String AUDIO_TIMESCALE = "android.media.mediarecorder.audio-timescale";
field public static final java.lang.String CAPTURE_FPS = "android.media.mediarecorder.capture-fps";
field public static final java.lang.String CAPTURE_FPS_ENABLE = "android.media.mediarecorder.capture-fpsenable";
field public static final java.lang.String FRAMERATE = "android.media.mediarecorder.frame-rate";
field public static final java.lang.String HEIGHT = "android.media.mediarecorder.height";
field public static final java.lang.String MOVIE_TIMESCALE = "android.media.mediarecorder.movie-timescale";
field public static final java.lang.String ROTATION = "android.media.mediarecorder.rotation";
field public static final java.lang.String VIDEO_BITRATE = "android.media.mediarecorder.video-bitrate";
field public static final java.lang.String VIDEO_IFRAME_INTERVAL = "android.media.mediarecorder.video-iframe-interval";
field public static final java.lang.String VIDEO_LEVEL = "android.media.mediarecorder.video-encoder-level";
field public static final java.lang.String VIDEO_PROFILE = "android.media.mediarecorder.video-encoder-profile";
field public static final java.lang.String VIDEO_TIMESCALE = "android.media.mediarecorder.video-timescale";
field public static final java.lang.String WIDTH = "android.media.mediarecorder.width";
}
public static abstract interface MediaRecorder.OnErrorListener {
method public abstract void onError(android.media.MediaRecorder, int, int);
}