loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Assorted deprecation fixes/migrations/suppressions

Browse Source 
These were missed on the first pass

PiperOrigin-RevId: 321553847
This commit is contained in:
ibaker 2020-07-16 14:33:19 +01:00 committed by Oliver Woodman
parent b755df1338
commit 161dea661f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/common/src/main/java/com/google/android/exoplayer2/C.java
View File

@ -579,7 +579,9 @@ public final class C {
public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING =
MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING;
/** @deprecated Use {@code Renderer.VIDEO_SCALING_MODE_DEFAULT}. */
@Deprecated public static final int VIDEO_SCALING_MODE_DEFAULT = VIDEO_SCALING_MODE_SCALE_TO_FIT;
@SuppressWarnings("deprecation")
@Deprecated
public static final int VIDEO_SCALING_MODE_DEFAULT = VIDEO_SCALING_MODE_SCALE_TO_FIT;
/**
* Track selection flags. Possible flag values are {@link #SELECTION_FLAG_DEFAULT}, {@link

5
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
View File

@ -35,7 +35,6 @@ import android.media.AudioManager;
import android.net.Uri;
import android.os.Looper;
import android.view.Surface;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.Nullable;
import androidx.test.core.app.ApplicationProvider;
@ -8326,8 +8325,8 @@ public final class ExoPlayerTest {
}
@Override
public View[] getAdOverlayViews() {
return new View[0];
public ImmutableList<AdsLoader.OverlayInfo> getAdOverlayInfos() {
return ImmutableList.of();
}
}
}

5
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
View File

@ -19,13 +19,13 @@ import static com.google.android.exoplayer2.C.WIDEVINE_UUID;
import android.media.MediaDrm;
import android.media.UnsupportedSchemeException;
import android.net.Uri;
import android.view.Surface;
import android.widget.FrameLayout;
import androidx.annotation.RequiresApi;
import androidx.test.core.app.ApplicationProvider;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.RendererCapabilities;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.decoder.DecoderCounters;
@ -308,11 +308,10 @@ import java.util.List;
this.dataSourceFactory != null
? this.dataSourceFactory
: new DefaultDataSourceFactory(host, userAgent);
Uri manifestUri = Uri.parse(manifestUrl);
return new DashMediaSource.Factory(dataSourceFactory)
.setDrmSessionManager(drmSessionManager)
.setLoadErrorHandlingPolicy(new DefaultLoadErrorHandlingPolicy(MIN_LOADABLE_RETRY_COUNT))
.createMediaSource(manifestUri);
.createMediaSource(MediaItem.fromUri(manifestUrl));
}
@Override