Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
a1f06987
authored
Jan 25, 2021
by
olly
Committed by
Ian Baker
Jan 25, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Replace non-inclusively named constant
Issue: #7565 PiperOrigin-RevId: 353649187
parent
b0258e71
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
63 additions
and
51 deletions
demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java
demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerProvider.java
library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
library/core/src/test/java/com/google/android/exoplayer2/audio/DecoderAudioRendererTest.java
library/core/src/test/java/com/google/android/exoplayer2/audio/MediaCodecAudioRendererTest.java
library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java
library/core/src/test/java/com/google/android/exoplayer2/source/DefaultDrmSessionManagerProviderTest.java
library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaPeriodTest.java
library/core/src/test/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriodTest.java
library/core/src/test/java/com/google/android/exoplayer2/video/DecoderVideoRendererTest.java
library/core/src/test/java/com/google/android/exoplayer2/video/MediaCodecVideoRendererTest.java
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java
View file @
a1f06987
...
...
@@ -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
);
...
...
demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java
View file @
a1f06987
...
...
@@ -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
);
...
...
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerProvider.java
View file @
a1f06987
...
...
@@ -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
...
...
library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
View file @
a1f06987
...
...
@@ -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
...
...
@@ -55,6 +50,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.
*
* <p>{@link #release()} must be called to ensure the acquired resources are released. After
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
View file @
a1f06987
...
...
@@ -337,7 +337,7 @@ public final class ExtractorMediaSource extends CompositeMediaSource<Void> {
.
build
(),
dataSourceFactory
,
extractorsFactory
,
DrmSessionManager
.
getDummyDrmSessionManager
()
,
DrmSessionManager
.
DRM_UNSUPPORTED
,
loadableLoadErrorHandlingPolicy
,
continueLoadingCheckIntervalBytes
);
}
...
...
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
View file @
a1f06987
...
...
@@ -7613,7 +7613,7 @@ public final class ExoPlayerTest {
FakeMediaSource
firstMediaSource
=
new
FakeMediaSource
(
/* timeline= */
null
,
DrmSessionManager
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
drmEventDispatcher
,
/* deferOnPrepared= */
true
)
{
@Override
...
...
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
View file @
a1f06987
...
...
@@ -1005,7 +1005,7 @@ public final class AnalyticsCollectorTest {
FakeMediaSource
fakeMediaSource
=
new
FakeMediaSource
(
adTimeline
,
DrmSessionManager
.
D
UMMY
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
(
unusedFormat
,
mediaPeriodId
)
->
{
if
(
mediaPeriodId
.
isAd
())
{
return
ImmutableList
.
of
(
...
...
@@ -1265,7 +1265,7 @@ public final class AnalyticsCollectorTest {
FakeMediaSource
fakeMediaSource
=
new
FakeMediaSource
(
adTimeline
,
DrmSessionManager
.
D
UMMY
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
(
unusedFormat
,
mediaPeriodId
)
->
{
if
(
mediaPeriodId
.
isAd
())
{
return
ImmutableList
.
of
(
...
...
library/core/src/test/java/com/google/android/exoplayer2/audio/DecoderAudioRendererTest.java
View file @
a1f06987
...
...
@@ -107,7 +107,7 @@ public class DecoderAudioRendererTest {
new
FakeSampleStream
(
new
DefaultAllocator
(
/* trimOnReset= */
true
,
/* individualAllocationSize= */
1024
),
/* mediaSourceEventDispatcher= */
null
,
DrmSessionManager
.
D
UMMY
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
new
DrmSessionEventListener
.
EventDispatcher
(),
FORMAT
,
ImmutableList
.
of
(
END_OF_STREAM_ITEM
));
...
...
library/core/src/test/java/com/google/android/exoplayer2/audio/MediaCodecAudioRendererTest.java
View file @
a1f06987
...
...
@@ -121,7 +121,7 @@ public class MediaCodecAudioRendererTest {
new
FakeSampleStream
(
new
DefaultAllocator
(
/* trimOnReset= */
true
,
/* individualAllocationSize= */
1024
),
/* mediaSourceEventDispatcher= */
null
,
DrmSessionManager
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
new
DrmSessionEventListener
.
EventDispatcher
(),
/* initialFormat= */
AUDIO_AAC
,
ImmutableList
.
of
(
...
...
library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java
View file @
a1f06987
...
...
@@ -151,7 +151,7 @@ public class MetadataRendererTest {
new
FakeSampleStream
(
new
DefaultAllocator
(
/* trimOnReset= */
true
,
/* individualAllocationSize= */
1024
),
/* mediaSourceEventDispatcher= */
null
,
DrmSessionManager
.
D
UMMY
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
new
DrmSessionEventListener
.
EventDispatcher
(),
EMSG_FORMAT
,
ImmutableList
.
of
(
...
...
library/core/src/test/java/com/google/android/exoplayer2/source/DefaultDrmSessionManagerProviderTest.java
View file @
a1f06987
...
...
@@ -35,7 +35,7 @@ public class DefaultDrmSessionManagerProviderTest {
DrmSessionManager
drmSessionManager
=
new
DefaultDrmSessionManagerProvider
().
get
(
MediaItem
.
fromUri
(
Uri
.
EMPTY
));
assertThat
(
drmSessionManager
).
isEqualTo
(
DrmSessionManager
.
D
UMMY
);
assertThat
(
drmSessionManager
).
isEqualTo
(
DrmSessionManager
.
D
RM_UNSUPPORTED
);
}
@Test
...
...
@@ -49,6 +49,6 @@ public class DefaultDrmSessionManagerProviderTest {
DrmSessionManager
drmSessionManager
=
new
DefaultDrmSessionManagerProvider
().
get
(
mediaItem
);
assertThat
(
drmSessionManager
).
isNotEqualTo
(
DrmSessionManager
.
D
UMMY
);
assertThat
(
drmSessionManager
).
isNotEqualTo
(
DrmSessionManager
.
D
RM_UNSUPPORTED
);
}
}
library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaPeriodTest.java
View file @
a1f06987
...
...
@@ -212,7 +212,7 @@ public final class MergingMediaPeriodTest {
new
DefaultAllocator
(
/* trimOnReset= */
false
,
/* individualAllocationSize= */
1024
),
trackDataFactory
,
mediaSourceEventDispatcher
,
DrmSessionManager
.
D
UMMY
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
new
DrmSessionEventListener
.
EventDispatcher
(),
/* deferOnPrepared= */
false
);
selectTracksPositionUs
=
C
.
TIME_UNSET
;
...
...
library/core/src/test/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriodTest.java
View file @
a1f06987
...
...
@@ -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
.
D
UMMY
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
new
DrmSessionEventListener
.
EventDispatcher
()
.
withParameters
(
/* windowIndex= */
0
,
mediaPeriodId
),
new
DefaultLoadErrorHandlingPolicy
(),
...
...
library/core/src/test/java/com/google/android/exoplayer2/video/DecoderVideoRendererTest.java
View file @
a1f06987
...
...
@@ -187,7 +187,7 @@ public final class DecoderVideoRendererTest {
new
FakeSampleStream
(
new
DefaultAllocator
(
/* trimOnReset= */
true
,
/* individualAllocationSize= */
1024
),
/* mediaSourceEventDispatcher= */
null
,
DrmSessionManager
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
new
DrmSessionEventListener
.
EventDispatcher
(),
/* initialFormat= */
H264_FORMAT
,
ImmutableList
.
of
(
oneByteSample
(
/* timeUs= */
0
),
END_OF_STREAM_ITEM
));
...
...
library/core/src/test/java/com/google/android/exoplayer2/video/MediaCodecVideoRendererTest.java
View file @
a1f06987
...
...
@@ -128,7 +128,7 @@ public class MediaCodecVideoRendererTest {
new
FakeSampleStream
(
new
DefaultAllocator
(
/* trimOnReset= */
true
,
/* individualAllocationSize= */
1024
),
/* mediaSourceEventDispatcher= */
null
,
DrmSessionManager
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_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
.
D
UMMY
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
new
DrmSessionEventListener
.
EventDispatcher
(),
/* initialFormat= */
VIDEO_H264
,
ImmutableList
.
of
(
...
...
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
View file @
a1f06987
...
...
@@ -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
),
...
...
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java
View file @
a1f06987
...
...
@@ -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
);
}
}
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
View file @
a1f06987
...
...
@@ -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
());
...
...
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
View file @
a1f06987
...
...
@@ -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
)
{
...
...
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java
View file @
a1f06987
...
...
@@ -175,7 +175,7 @@ public class FakeAdaptiveMediaPeriod
/* callback= */
this
,
allocator
,
positionUs
,
DrmSessionManager
.
D
UMMY
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
new
DrmSessionEventListener
.
EventDispatcher
(),
new
DefaultLoadErrorHandlingPolicy
(
/* minimumLoadableRetryCount= */
3
),
mediaSourceEventDispatcher
);
...
...
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java
View file @
a1f06987
...
...
@@ -42,7 +42,7 @@ public class FakeAdaptiveMediaSource extends FakeMediaSource {
FakeChunkSource
.
Factory
chunkSourceFactory
)
{
super
(
timeline
,
DrmSessionManager
.
D
UMMY
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
/* trackDataFactory= */
(
unusedFormat
,
unusedMediaPeriodId
)
->
{
throw
new
RuntimeException
(
"Unused TrackDataFactory"
);
},
...
...
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java
View file @
a1f06987
...
...
@@ -116,7 +116,7 @@ public class FakeMediaPeriod implements MediaPeriod {
allocator
,
TrackDataFactory
.
singleSampleWithTimeUs
(
singleSampleTimeUs
),
mediaSourceEventDispatcher
,
DrmSessionManager
.
D
UMMY
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
new
DrmSessionEventListener
.
EventDispatcher
(),
/* deferOnPrepared */
false
);
}
...
...
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
View file @
a1f06987
...
...
@@ -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
.
D
UMMY
,
formats
);
this
(
timeline
,
DrmSessionManager
.
D
RM_UNSUPPORTED
,
formats
);
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment