diff --git a/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java b/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java index dc0a8b990a..191602dfb8 100644 --- a/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java +++ b/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java @@ -152,7 +152,7 @@ public final class MainActivity extends Activity { .setUuidAndExoMediaDrmProvider(drmSchemeUuid, FrameworkMediaDrm.DEFAULT_PROVIDER) .build(drmCallback); } else { - drmSessionManager = DrmSessionManager.getDummyDrmSessionManager(); + drmSessionManager = DrmSessionManager.DRM_UNSUPPORTED; } DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(this); diff --git a/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java b/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java index eb669ecf94..a31cd7efe0 100644 --- a/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java +++ b/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java @@ -197,7 +197,7 @@ public final class MainActivity extends Activity { .setUuidAndExoMediaDrmProvider(drmSchemeUuid, FrameworkMediaDrm.DEFAULT_PROVIDER) .build(drmCallback); } else { - drmSessionManager = DrmSessionManager.getDummyDrmSessionManager(); + drmSessionManager = DrmSessionManager.DRM_UNSUPPORTED; } DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(this); diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerProvider.java index 0e0d2b7b69..10bd2953d5 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerProvider.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerProvider.java @@ -64,7 +64,7 @@ public final class DefaultDrmSessionManagerProvider implements DrmSessionManager @Nullable MediaItem.DrmConfiguration drmConfiguration = mediaItem.playbackProperties.drmConfiguration; if (drmConfiguration == null || Util.SDK_INT < 18) { - return DrmSessionManager.getDummyDrmSessionManager(); + return DrmSessionManager.DRM_UNSUPPORTED; } HttpDataSource.Factory dataSourceFactory = drmHttpDataSourceFactory != null diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java index 1168884d76..70dc4fa7f5 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java @@ -22,13 +22,8 @@ import com.google.android.exoplayer2.Format; /** Manages a DRM session. */ public interface DrmSessionManager { - /** Returns {@link #DUMMY}. */ - static DrmSessionManager getDummyDrmSessionManager() { - return DUMMY; - } - - /** {@link DrmSessionManager} that supports no DRM schemes. */ - DrmSessionManager DUMMY = + /** An instance that supports no DRM schemes. */ + DrmSessionManager DRM_UNSUPPORTED = new DrmSessionManager() { @Override @@ -54,6 +49,23 @@ public interface DrmSessionManager { } }; + /** + * An instance that supports no DRM schemes. + * + * @deprecated Use {@link #DRM_UNSUPPORTED}. + */ + @Deprecated DrmSessionManager DUMMY = DRM_UNSUPPORTED; + + /** + * Returns {@link #DRM_UNSUPPORTED}. + * + * @deprecated Use {@link #DRM_UNSUPPORTED}. + */ + @Deprecated + static DrmSessionManager getDummyDrmSessionManager() { + return DRM_UNSUPPORTED; + } + /** * Acquires any required resources. * diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java index 77a1c1d8ac..c2fa35275c 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java @@ -337,7 +337,7 @@ public final class ExtractorMediaSource extends CompositeMediaSource { .build(), dataSourceFactory, extractorsFactory, - DrmSessionManager.getDummyDrmSessionManager(), + DrmSessionManager.DRM_UNSUPPORTED, loadableLoadErrorHandlingPolicy, continueLoadingCheckIntervalBytes); } diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java index 3201823cd4..008d8c6b53 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java @@ -7613,7 +7613,7 @@ public final class ExoPlayerTest { FakeMediaSource firstMediaSource = new FakeMediaSource( /* timeline= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, (unusedFormat, unusedMediaPeriodId) -> ImmutableList.of( oneByteSample(firstSampleTimeUs, C.BUFFER_FLAG_KEY_FRAME), END_OF_STREAM_ITEM), @@ -7621,7 +7621,7 @@ public final class ExoPlayerTest { FakeMediaSource secondMediaSource = new FakeMediaSource( timelineWithOffsets, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, (unusedFormat, unusedMediaPeriodId) -> ImmutableList.of( oneByteSample(firstSampleTimeUs, C.BUFFER_FLAG_KEY_FRAME), END_OF_STREAM_ITEM), @@ -8155,7 +8155,7 @@ public final class ExoPlayerTest { allocator, /* singleSampleTimeUs= */ 0, mediaSourceEventDispatcher, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, drmEventDispatcher, /* deferOnPrepared= */ true) { @Override diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java index ffdc65160e..ad807c4079 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java @@ -1005,7 +1005,7 @@ public final class AnalyticsCollectorTest { FakeMediaSource fakeMediaSource = new FakeMediaSource( adTimeline, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, (unusedFormat, mediaPeriodId) -> { if (mediaPeriodId.isAd()) { return ImmutableList.of( @@ -1265,7 +1265,7 @@ public final class AnalyticsCollectorTest { FakeMediaSource fakeMediaSource = new FakeMediaSource( adTimeline, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, (unusedFormat, mediaPeriodId) -> { if (mediaPeriodId.isAd()) { return ImmutableList.of( diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/DecoderAudioRendererTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/DecoderAudioRendererTest.java index db91637ca9..f24e09346f 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/audio/DecoderAudioRendererTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/DecoderAudioRendererTest.java @@ -107,7 +107,7 @@ public class DecoderAudioRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), FORMAT, ImmutableList.of(END_OF_STREAM_ITEM)); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/MediaCodecAudioRendererTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/MediaCodecAudioRendererTest.java index e39769f2c3..c69deeaeef 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/audio/MediaCodecAudioRendererTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/MediaCodecAudioRendererTest.java @@ -121,7 +121,7 @@ public class MediaCodecAudioRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ AUDIO_AAC, ImmutableList.of( @@ -178,7 +178,7 @@ public class MediaCodecAudioRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ AUDIO_AAC, ImmutableList.of( @@ -256,7 +256,7 @@ public class MediaCodecAudioRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ AUDIO_AAC, ImmutableList.of( diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java index 346aa95852..42dcaa572d 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java @@ -151,7 +151,7 @@ public class MetadataRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), EMSG_FORMAT, ImmutableList.of( diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/DefaultDrmSessionManagerProviderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/DefaultDrmSessionManagerProviderTest.java index f7760c5ce8..4e597b6371 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/source/DefaultDrmSessionManagerProviderTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/source/DefaultDrmSessionManagerProviderTest.java @@ -35,7 +35,7 @@ public class DefaultDrmSessionManagerProviderTest { DrmSessionManager drmSessionManager = new DefaultDrmSessionManagerProvider().get(MediaItem.fromUri(Uri.EMPTY)); - assertThat(drmSessionManager).isEqualTo(DrmSessionManager.DUMMY); + assertThat(drmSessionManager).isEqualTo(DrmSessionManager.DRM_UNSUPPORTED); } @Test @@ -49,6 +49,6 @@ public class DefaultDrmSessionManagerProviderTest { DrmSessionManager drmSessionManager = new DefaultDrmSessionManagerProvider().get(mediaItem); - assertThat(drmSessionManager).isNotEqualTo(DrmSessionManager.DUMMY); + assertThat(drmSessionManager).isNotEqualTo(DrmSessionManager.DRM_UNSUPPORTED); } } diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaPeriodTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaPeriodTest.java index 705fa0e7cb..4a756ccf9f 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaPeriodTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaPeriodTest.java @@ -212,7 +212,7 @@ public final class MergingMediaPeriodTest { new DefaultAllocator(/* trimOnReset= */ false, /* individualAllocationSize= */ 1024), trackDataFactory, mediaSourceEventDispatcher, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* deferOnPrepared= */ false); selectTracksPositionUs = C.TIME_UNSET; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriodTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriodTest.java index 90b29b30d5..aaf00388f6 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriodTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriodTest.java @@ -49,7 +49,7 @@ public final class ProgressiveMediaPeriodTest { Uri.parse("asset://android_asset/media/mp4/sample.mp4"), new AssetDataSource(ApplicationProvider.getApplicationContext()), () -> new Extractor[] {new Mp4Extractor()}, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher() .withParameters(/* windowIndex= */ 0, mediaPeriodId), new DefaultLoadErrorHandlingPolicy(), diff --git a/library/core/src/test/java/com/google/android/exoplayer2/video/DecoderVideoRendererTest.java b/library/core/src/test/java/com/google/android/exoplayer2/video/DecoderVideoRendererTest.java index d09c2e0b3d..848b0ce410 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/video/DecoderVideoRendererTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/video/DecoderVideoRendererTest.java @@ -187,7 +187,7 @@ public final class DecoderVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ H264_FORMAT, ImmutableList.of(oneByteSample(/* timeUs= */ 0, C.BUFFER_FLAG_KEY_FRAME))); @@ -218,7 +218,7 @@ public final class DecoderVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ H264_FORMAT, ImmutableList.of(oneByteSample(/* timeUs= */ 0, C.BUFFER_FLAG_KEY_FRAME))); @@ -248,7 +248,7 @@ public final class DecoderVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ H264_FORMAT, ImmutableList.of(oneByteSample(/* timeUs= */ 0, C.BUFFER_FLAG_KEY_FRAME))); @@ -281,7 +281,7 @@ public final class DecoderVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ H264_FORMAT, ImmutableList.of( @@ -291,7 +291,7 @@ public final class DecoderVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ H264_FORMAT, ImmutableList.of(oneByteSample(/* timeUs= */ 0), END_OF_STREAM_ITEM)); @@ -333,7 +333,7 @@ public final class DecoderVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ H264_FORMAT, ImmutableList.of( @@ -343,7 +343,7 @@ public final class DecoderVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ H264_FORMAT, ImmutableList.of(oneByteSample(/* timeUs= */ 0), END_OF_STREAM_ITEM)); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/video/MediaCodecVideoRendererTest.java b/library/core/src/test/java/com/google/android/exoplayer2/video/MediaCodecVideoRendererTest.java index c0ec86d959..ccc4e89d58 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/video/MediaCodecVideoRendererTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/video/MediaCodecVideoRendererTest.java @@ -128,7 +128,7 @@ public class MediaCodecVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ VIDEO_H264, ImmutableList.of( @@ -167,7 +167,7 @@ public class MediaCodecVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ VIDEO_H264, ImmutableList.of( @@ -212,7 +212,7 @@ public class MediaCodecVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ pAsp1, ImmutableList.of(oneByteSample(/* timeUs= */ 0, C.BUFFER_FLAG_KEY_FRAME))); @@ -264,7 +264,7 @@ public class MediaCodecVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ VIDEO_H264, ImmutableList.of(oneByteSample(/* timeUs= */ 0, C.BUFFER_FLAG_KEY_FRAME))); @@ -303,7 +303,7 @@ public class MediaCodecVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ VIDEO_H264, ImmutableList.of(oneByteSample(/* timeUs= */ 0, C.BUFFER_FLAG_KEY_FRAME))); @@ -333,7 +333,7 @@ public class MediaCodecVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ VIDEO_H264, ImmutableList.of(oneByteSample(/* timeUs= */ 0, C.BUFFER_FLAG_KEY_FRAME))); @@ -362,7 +362,7 @@ public class MediaCodecVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ VIDEO_H264, ImmutableList.of(oneByteSample(/* timeUs= */ 0, C.BUFFER_FLAG_KEY_FRAME))); @@ -393,7 +393,7 @@ public class MediaCodecVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ VIDEO_H264, ImmutableList.of( @@ -403,7 +403,7 @@ public class MediaCodecVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ VIDEO_H264, ImmutableList.of( @@ -447,7 +447,7 @@ public class MediaCodecVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ VIDEO_H264, ImmutableList.of( @@ -457,7 +457,7 @@ public class MediaCodecVideoRendererTest { new FakeSampleStream( new DefaultAllocator(/* trimOnReset= */ true, /* individualAllocationSize= */ 1024), /* mediaSourceEventDispatcher= */ null, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* initialFormat= */ VIDEO_H264, ImmutableList.of( diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java index a21e73b0ab..99fd169437 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java @@ -201,7 +201,7 @@ public final class DashMediaPeriodTest { periodIndex, mock(DashChunkSource.Factory.class), mock(TransferListener.class), - DrmSessionManager.getDummyDrmSessionManager(), + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher() .withParameters(/* windowIndex= */ 0, mediaPeriodId), mock(LoadErrorHandlingPolicy.class), diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java index b2fae93bca..bfc11cb47a 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java @@ -42,6 +42,6 @@ public final class DownloadHelperTest { DownloadHelper.DEFAULT_TRACK_SELECTOR_PARAMETERS_WITHOUT_CONTEXT, (handler, videoListener, audioListener, text, metadata) -> new Renderer[0], new FakeDataSource.Factory(), - /* drmSessionManager= */ DrmSessionManager.getDummyDrmSessionManager()); + /* drmSessionManager= */ DrmSessionManager.DRM_UNSUPPORTED); } } diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java index 060435b7ff..da072cf193 100644 --- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java +++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java @@ -260,7 +260,7 @@ import java.util.List; @Override protected DrmSessionManager buildDrmSessionManager() { if (widevineLicenseUrl == null) { - return DrmSessionManager.getDummyDrmSessionManager(); + return DrmSessionManager.DRM_UNSUPPORTED; } MediaDrmCallback drmCallback = new HttpMediaDrmCallback(widevineLicenseUrl, new DefaultHttpDataSourceFactory()); diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java index 1bd35e0353..1d1ee3b765 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java @@ -227,7 +227,7 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest { protected DrmSessionManager buildDrmSessionManager() { // Do nothing. Interested subclasses may override. - return DrmSessionManager.getDummyDrmSessionManager(); + return DrmSessionManager.DRM_UNSUPPORTED; } protected DefaultTrackSelector buildTrackSelector(HostActivity host) { diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java index 6f2b3ba9d8..9b39056bdb 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java @@ -175,7 +175,7 @@ public class FakeAdaptiveMediaPeriod /* callback= */ this, allocator, positionUs, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), new DefaultLoadErrorHandlingPolicy(/* minimumLoadableRetryCount= */ 3), mediaSourceEventDispatcher); diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java index 17759eece1..978bc0a047 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java @@ -42,7 +42,7 @@ public class FakeAdaptiveMediaSource extends FakeMediaSource { FakeChunkSource.Factory chunkSourceFactory) { super( timeline, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, /* trackDataFactory= */ (unusedFormat, unusedMediaPeriodId) -> { throw new RuntimeException("Unused TrackDataFactory"); }, diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java index a1042cd9ad..cfd19cf280 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java @@ -116,7 +116,7 @@ public class FakeMediaPeriod implements MediaPeriod { allocator, TrackDataFactory.singleSampleWithTimeUs(singleSampleTimeUs), mediaSourceEventDispatcher, - DrmSessionManager.DUMMY, + DrmSessionManager.DRM_UNSUPPORTED, new DrmSessionEventListener.EventDispatcher(), /* deferOnPrepared */ false); } diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java index 77d543a36e..2e7d15073b 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java @@ -104,7 +104,7 @@ public class FakeMediaSource extends BaseMediaSource { * can be manually set later using {@link #setNewSourceInfo(Timeline)}. */ public FakeMediaSource(@Nullable Timeline timeline, Format... formats) { - this(timeline, DrmSessionManager.DUMMY, formats); + this(timeline, DrmSessionManager.DRM_UNSUPPORTED, formats); } /**