From dbc908fba85ab610737eeb6170c0808ffdd44741 Mon Sep 17 00:00:00 2001 From: Lajos Molnar Date: Thu, 14 May 2015 12:13:32 -0700 Subject: media: remove setPlaybackRate from MediaPlayer and MediSync Condensed them to an internal easyPlaybackParams to create PlaybackParams from a rate and audio mode. Bug: 21045118 Change-Id: I89879a3034c905e34cabef8ff0237048e097a8e0 --- api/current.txt | 8 -------- api/system-current.txt | 8 -------- 2 files changed, 16 deletions(-) (limited to 'api') diff --git a/api/current.txt b/api/current.txt index fbb6554..037b02e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16099,7 +16099,6 @@ package android.media { method public void setOnTimedTextListener(android.media.MediaPlayer.OnTimedTextListener); method public void setOnVideoSizeChangedListener(android.media.MediaPlayer.OnVideoSizeChangedListener); method public void setPlaybackParams(android.media.PlaybackParams); - method public void setPlaybackRate(float, int); method public void setScreenOnWhilePlaying(boolean); method public void setSurface(android.view.Surface); method public void setSyncParams(android.media.SyncParams); @@ -16126,9 +16125,6 @@ package android.media { field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3 field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip"; - field public static final int PLAYBACK_RATE_AUDIO_MODE_DEFAULT = 0; // 0x0 - field public static final int PLAYBACK_RATE_AUDIO_MODE_RESAMPLE = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_STRETCH = 1; // 0x1 field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; // 0x1 field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2 } @@ -16430,14 +16426,10 @@ package android.media { method public void setCallback(android.media.MediaSync.Callback, android.os.Handler); method public void setOnErrorListener(android.media.MediaSync.OnErrorListener, android.os.Handler); method public void setPlaybackParams(android.media.PlaybackParams); - method public void setPlaybackRate(float, int); method public void setSurface(android.view.Surface); method public void setSyncParams(android.media.SyncParams); field public static final int MEDIASYNC_ERROR_AUDIOTRACK_FAIL = 1; // 0x1 field public static final int MEDIASYNC_ERROR_SURFACE_FAIL = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_DEFAULT = 0; // 0x0 - field public static final int PLAYBACK_RATE_AUDIO_MODE_RESAMPLE = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_STRETCH = 1; // 0x1 } public static abstract class MediaSync.Callback { diff --git a/api/system-current.txt b/api/system-current.txt index 07fb2d7..4f408b3 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -17337,7 +17337,6 @@ package android.media { method public void setOnTimedTextListener(android.media.MediaPlayer.OnTimedTextListener); method public void setOnVideoSizeChangedListener(android.media.MediaPlayer.OnVideoSizeChangedListener); method public void setPlaybackParams(android.media.PlaybackParams); - method public void setPlaybackRate(float, int); method public void setScreenOnWhilePlaying(boolean); method public void setSurface(android.view.Surface); method public void setSyncParams(android.media.SyncParams); @@ -17364,9 +17363,6 @@ package android.media { field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3 field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip"; - field public static final int PLAYBACK_RATE_AUDIO_MODE_DEFAULT = 0; // 0x0 - field public static final int PLAYBACK_RATE_AUDIO_MODE_RESAMPLE = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_STRETCH = 1; // 0x1 field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; // 0x1 field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2 } @@ -17670,14 +17666,10 @@ package android.media { method public void setCallback(android.media.MediaSync.Callback, android.os.Handler); method public void setOnErrorListener(android.media.MediaSync.OnErrorListener, android.os.Handler); method public void setPlaybackParams(android.media.PlaybackParams); - method public void setPlaybackRate(float, int); method public void setSurface(android.view.Surface); method public void setSyncParams(android.media.SyncParams); field public static final int MEDIASYNC_ERROR_AUDIOTRACK_FAIL = 1; // 0x1 field public static final int MEDIASYNC_ERROR_SURFACE_FAIL = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_DEFAULT = 0; // 0x0 - field public static final int PLAYBACK_RATE_AUDIO_MODE_RESAMPLE = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_STRETCH = 1; // 0x1 } public static abstract class MediaSync.Callback { -- cgit v1.1