Skip to content

SDK / exoplayer

Go to a project
Commit ff269403 by gyumin Committed by marcbaechinger
Options

Lower minSdkVersion to 16 for media2 extension 

From media2 1.1.0, it supports API level 16 and above.

PiperOrigin-RevId: 358797986
parent 8d942dc2
Inline Side-by-side
Showing with 0 additions and 52 deletions
extensions/media2/build.gradle
......@@ -13,8 +13,6 @@
// limitations under the License.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android.defaultConfig.minSdkVersion 19
dependencies {
implementation project(modulePrefix + 'library-common')
implementation 'androidx.collection:collection:' + androidxCollectionVersion
......
extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java
......@@ -28,8 +28,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
import android.content.Context;
import android.media.AudioManager;
import android.os.Build;
import android.os.Build.VERSION_CODES;
import android.os.Looper;
import androidx.annotation.Nullable;
import androidx.core.util.ObjectsCompat;
......@@ -43,7 +41,6 @@ import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.LargeTest;
import androidx.test.filters.MediumTest;
import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import androidx.test.platform.app.InstrumentationRegistry;
import com.google.android.exoplayer2.ControlDispatcher;
......@@ -93,7 +90,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void play_onceWithAudioResource_changesPlayerStateToPlaying() throws Exception {
TestUtils.loadResource(R.raw.audio, sessionPlayerConnector);
......@@ -120,7 +116,6 @@ public class SessionPlayerConnectorTest {
@Test
@MediumTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void play_onceWithAudioResourceOnMainThread_notifiesOnPlayerStateChanged()
throws Exception {
CountDownLatch onPlayerStatePlayingLatch = new CountDownLatch(1);
......@@ -158,7 +153,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void play_withCustomControlDispatcher_isSkipped() throws Exception {
if (Looper.myLooper() == null) {
Looper.prepare();
......@@ -194,7 +188,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setMediaItem_withAudioResource_notifiesOnPlaybackCompleted() throws Exception {
TestUtils.loadResource(R.raw.audio, sessionPlayerConnector);
......@@ -219,7 +212,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setMediaItem_withVideoResource_notifiesOnPlaybackCompleted() throws Exception {
TestUtils.loadResource(R.raw.video_desks, sessionPlayerConnector);
CountDownLatch onPlaybackCompletedLatch = new CountDownLatch(1);
......@@ -243,7 +235,6 @@ public class SessionPlayerConnectorTest {
@Test
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void getDuration_whenIdleState_returnsUnknownTime() {
assertThat(sessionPlayerConnector.getPlayerState()).isEqualTo(SessionPlayer.PLAYER_STATE_IDLE);
assertThat(sessionPlayerConnector.getDuration()).isEqualTo(SessionPlayer.UNKNOWN_TIME);
......@@ -251,7 +242,6 @@ public class SessionPlayerConnectorTest {
@Test
@MediumTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void getDuration_afterPrepared_returnsDuration() throws Exception {
TestUtils.loadResource(R.raw.video_desks, sessionPlayerConnector);
......@@ -263,7 +253,6 @@ public class SessionPlayerConnectorTest {
@Test
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void getCurrentPosition_whenIdleState_returnsDefaultPosition() {
assertThat(sessionPlayerConnector.getPlayerState()).isEqualTo(SessionPlayer.PLAYER_STATE_IDLE);
assertThat(sessionPlayerConnector.getCurrentPosition()).isEqualTo(0);
......@@ -271,7 +260,6 @@ public class SessionPlayerConnectorTest {
@Test
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void getBufferedPosition_whenIdleState_returnsDefaultPosition() {
assertThat(sessionPlayerConnector.getPlayerState()).isEqualTo(SessionPlayer.PLAYER_STATE_IDLE);
assertThat(sessionPlayerConnector.getBufferedPosition()).isEqualTo(0);
......@@ -279,7 +267,6 @@ public class SessionPlayerConnectorTest {
@Test
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void getPlaybackSpeed_whenIdleState_throwsNoException() {
assertThat(sessionPlayerConnector.getPlayerState()).isEqualTo(SessionPlayer.PLAYER_STATE_IDLE);
try {
......@@ -291,7 +278,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void play_withDataSourceCallback_changesPlayerState() throws Exception {
sessionPlayerConnector.setMediaItem(TestUtils.createMediaItem(R.raw.video_big_buck_bunny));
sessionPlayerConnector.prepare();
......@@ -308,7 +294,6 @@ public class SessionPlayerConnectorTest {
@Test
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setMediaItem_withNullMediaItem_throwsException() {
try {
sessionPlayerConnector.setMediaItem(null);
......@@ -320,7 +305,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setPlaybackSpeed_afterPlayback_remainsSame() throws Exception {
int resId1 = R.raw.video_big_buck_bunny;
MediaItem mediaItem1 =
......@@ -363,7 +347,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void seekTo_withSeriesOfSeek_succeeds() throws Exception {
TestUtils.loadResource(R.raw.video_big_buck_bunny, sessionPlayerConnector);
......@@ -378,7 +361,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void seekTo_skipsUnnecessarySeek() throws Exception {
CountDownLatch readAllowedLatch = new CountDownLatch(1);
playerTestRule.setDataSourceInstrumentation(
......@@ -435,7 +417,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void seekTo_whenUnderlyingPlayerAlsoSeeks_throwsNoException() throws Exception {
TestUtils.loadResource(R.raw.video_big_buck_bunny, sessionPlayerConnector);
assertPlayerResultSuccess(sessionPlayerConnector.prepare());
......@@ -456,7 +437,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void seekTo_byUnderlyingPlayer_notifiesOnSeekCompleted() throws Exception {
TestUtils.loadResource(R.raw.video_big_buck_bunny, sessionPlayerConnector);
assertPlayerResultSuccess(sessionPlayerConnector.prepare());
......@@ -484,7 +464,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void getPlayerState_withCallingPrepareAndPlayAndPause_reflectsPlayerState()
throws Throwable {
TestUtils.loadResource(R.raw.video_desks, sessionPlayerConnector);
......@@ -521,7 +500,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = VERSION_CODES.KITKAT)
public void prepare_twice_finishes() throws Exception {
TestUtils.loadResource(R.raw.audio, sessionPlayerConnector);
assertPlayerResultSuccess(sessionPlayerConnector.prepare());
......@@ -530,7 +508,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void prepare_notifiesOnPlayerStateChanged() throws Throwable {
TestUtils.loadResource(R.raw.video_big_buck_bunny, sessionPlayerConnector);
......@@ -552,7 +529,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void prepare_notifiesBufferingCompletedOnce() throws Throwable {
TestUtils.loadResource(R.raw.video_big_buck_bunny, sessionPlayerConnector);
......@@ -587,7 +563,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void seekTo_whenPrepared_notifiesOnSeekCompleted() throws Throwable {
long mp4DurationMs = 8_484L;
TestUtils.loadResource(R.raw.video_big_buck_bunny, sessionPlayerConnector);
......@@ -611,7 +586,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setPlaybackSpeed_whenPrepared_notifiesOnPlaybackSpeedChanged() throws Throwable {
TestUtils.loadResource(R.raw.video_big_buck_bunny, sessionPlayerConnector);
......@@ -636,7 +610,6 @@ public class SessionPlayerConnectorTest {
@Test
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setPlaybackSpeed_withZeroSpeed_throwsException() {
try {
sessionPlayerConnector.setPlaybackSpeed(0.0f);
......@@ -648,7 +621,6 @@ public class SessionPlayerConnectorTest {
@Test
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setPlaybackSpeed_withNegativeSpeed_throwsException() {
try {
sessionPlayerConnector.setPlaybackSpeed(-1.0f);
......@@ -660,7 +632,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void close_throwsNoExceptionAndDoesNotCrash() throws Exception {
TestUtils.loadResource(R.raw.audio, sessionPlayerConnector);
AudioAttributesCompat attributes =
......@@ -679,7 +650,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void cancelReturnedFuture_withSeekTo_cancelsPendingCommand() throws Exception {
CountDownLatch readRequestedLatch = new CountDownLatch(1);
CountDownLatch readAllowedLatch = new CountDownLatch(1);
......@@ -719,7 +689,6 @@ public class SessionPlayerConnectorTest {
@Test
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setPlaylist_withNullPlaylist_throwsException() throws Exception {
try {
sessionPlayerConnector.setPlaylist(null, null);
......@@ -731,7 +700,6 @@ public class SessionPlayerConnectorTest {
@Test
@SmallTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setPlaylist_withPlaylistContainingNullItem_throwsException() {
try {
List<MediaItem> list = new ArrayList<>();
......@@ -745,7 +713,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setPlaylist_setsPlaylistAndCurrentMediaItem() throws Exception {
List<MediaItem> playlist = TestUtils.createPlaylist(10);
PlayerCallbackForPlaylist callback = new PlayerCallbackForPlaylist(playlist, 1);
......@@ -760,7 +727,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setPlaylistAndRemoveAllPlaylistItem_playerStateBecomesIdle() throws Exception {
List<MediaItem> playlist = new ArrayList<>();
playlist.add(TestUtils.createMediaItem(R.raw.video_1));
......@@ -786,7 +752,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setPlaylist_calledOnlyOnce_notifiesPlaylistChangeOnlyOnce() throws Exception {
List<MediaItem> playlist = TestUtils.createPlaylist(10);
CountDownLatch onPlaylistChangedLatch = new CountDownLatch(2);
......@@ -811,7 +776,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setPlaylist_byUnderlyingPlayerBeforePrepare_notifiesOnPlaylistChanged()
throws Exception {
List<MediaItem> playlistToExoPlayer = TestUtils.createPlaylist(4);
......@@ -842,7 +806,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setPlaylist_byUnderlyingPlayerAfterPrepare_notifiesOnPlaylistChanged()
throws Exception {
List<MediaItem> playlistToSessionPlayer = TestUtils.createPlaylist(2);
......@@ -876,7 +839,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void addPlaylistItem_calledOnlyOnce_notifiesPlaylistChangeOnlyOnce() throws Exception {
List<MediaItem> playlist = TestUtils.createPlaylist(10);
assertPlayerResultSuccess(sessionPlayerConnector.setPlaylist(playlist, /* metadata= */ null));
......@@ -905,7 +867,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void removePlaylistItem_calledOnlyOnce_notifiesPlaylistChangeOnlyOnce() throws Exception {
List<MediaItem> playlist = TestUtils.createPlaylist(10);
assertPlayerResultSuccess(sessionPlayerConnector.setPlaylist(playlist, /* metadata= */ null));
......@@ -933,7 +894,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void movePlaylistItem_calledOnlyOnce_notifiesPlaylistChangeOnlyOnce() throws Exception {
List<MediaItem> playlist = new ArrayList<>();
playlist.add(TestUtils.createMediaItem(R.raw.video_1));
......@@ -967,7 +927,6 @@ public class SessionPlayerConnectorTest {
@Ignore
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void replacePlaylistItem_calledOnlyOnce_notifiesPlaylistChangeOnlyOnce() throws Exception {
List<MediaItem> playlist = TestUtils.createPlaylist(10);
assertPlayerResultSuccess(sessionPlayerConnector.setPlaylist(playlist, /* metadata= */ null));
......@@ -996,7 +955,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setPlaylist_withPlaylist_notifiesOnCurrentMediaItemChanged() throws Exception {
int listSize = 2;
List<MediaItem> playlist = TestUtils.createPlaylist(listSize);
......@@ -1011,7 +969,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void play_twice_finishes() throws Exception {
TestUtils.loadResource(R.raw.audio, sessionPlayerConnector);
assertPlayerResultSuccess(sessionPlayerConnector.prepare());
......@@ -1021,7 +978,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void play_withPlaylist_notifiesOnCurrentMediaItemChangedAndOnPlaybackCompleted()
throws Exception {
List<MediaItem> playlist = new ArrayList<>();
......@@ -1060,7 +1016,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void play_byUnderlyingPlayer_notifiesOnPlayerStateChanges() throws Exception {
TestUtils.loadResource(R.raw.audio, sessionPlayerConnector);
SimpleExoPlayer simpleExoPlayer = playerTestRule.getSimpleExoPlayer();
......@@ -1086,7 +1041,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void pause_twice_finishes() throws Exception {
TestUtils.loadResource(R.raw.audio, sessionPlayerConnector);
assertPlayerResultSuccess(sessionPlayerConnector.prepare());
......@@ -1097,7 +1051,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void pause_byUnderlyingPlayer_notifiesOnPlayerStateChanges() throws Exception {
TestUtils.loadResource(R.raw.audio, sessionPlayerConnector);
SimpleExoPlayer simpleExoPlayer = playerTestRule.getSimpleExoPlayer();
......@@ -1124,7 +1077,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void pause_byUnderlyingPlayerInListener_changesToPlayerStatePaused() throws Exception {
TestUtils.loadResource(R.raw.audio, sessionPlayerConnector);
SimpleExoPlayer simpleExoPlayer = playerTestRule.getSimpleExoPlayer();
......@@ -1169,7 +1121,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void skipToNextAndPrevious_calledInARow_notifiesOnCurrentMediaItemChanged()
throws Exception {
List<MediaItem> playlist = new ArrayList<>();
......@@ -1221,7 +1172,6 @@ public class SessionPlayerConnectorTest {
@Test
@LargeTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
public void setRepeatMode_withRepeatAll_continuesToPlayPlaylistWithoutBeingCompleted()
throws Exception {
List<MediaItem> playlist = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment