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
8a910fd0
authored
Sep 20, 2021
by
andrewlewis
Committed by
Christos Tsilopoulos
Sep 20, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Make @HlsMediaSource.MetadataType `TYPE_USE`
PiperOrigin-RevId: 397717018
parent
0f3a86b8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
View file @
8a910fd0
...
@@ -57,7 +57,9 @@ import com.google.android.exoplayer2.util.MimeTypes;
...
@@ -57,7 +57,9 @@ import com.google.android.exoplayer2.util.MimeTypes;
import
com.google.android.exoplayer2.util.Util
;
import
com.google.android.exoplayer2.util.Util
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.lang.annotation.Documented
;
import
java.lang.annotation.Documented
;
import
java.lang.annotation.ElementType
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.Target
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
...
@@ -83,6 +85,7 @@ public final class HlsMediaSource extends BaseMediaSource
...
@@ -83,6 +85,7 @@ public final class HlsMediaSource extends BaseMediaSource
*/
*/
@Documented
@Documented
@Retention
(
SOURCE
)
@Retention
(
SOURCE
)
@Target
({
ElementType
.
TYPE_USE
})
@IntDef
({
METADATA_TYPE_ID3
,
METADATA_TYPE_EMSG
})
@IntDef
({
METADATA_TYPE_ID3
,
METADATA_TYPE_EMSG
})
public
@interface
MetadataType
{}
public
@interface
MetadataType
{}
...
@@ -104,7 +107,7 @@ public final class HlsMediaSource extends BaseMediaSource
...
@@ -104,7 +107,7 @@ public final class HlsMediaSource extends BaseMediaSource
private
DrmSessionManagerProvider
drmSessionManagerProvider
;
private
DrmSessionManagerProvider
drmSessionManagerProvider
;
private
LoadErrorHandlingPolicy
loadErrorHandlingPolicy
;
private
LoadErrorHandlingPolicy
loadErrorHandlingPolicy
;
private
boolean
allowChunklessPreparation
;
private
boolean
allowChunklessPreparation
;
@MetadataType
privat
e
int
metadataType
;
private
@MetadataTyp
e
int
metadataType
;
private
boolean
useSessionKeys
;
private
boolean
useSessionKeys
;
private
List
<
StreamKey
>
streamKeys
;
private
List
<
StreamKey
>
streamKeys
;
@Nullable
private
Object
tag
;
@Nullable
private
Object
tag
;
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
View file @
8a910fd0
...
@@ -135,7 +135,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
...
@@ -135,7 +135,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
private
final
LoadErrorHandlingPolicy
loadErrorHandlingPolicy
;
private
final
LoadErrorHandlingPolicy
loadErrorHandlingPolicy
;
private
final
Loader
loader
;
private
final
Loader
loader
;
private
final
MediaSourceEventListener
.
EventDispatcher
mediaSourceEventDispatcher
;
private
final
MediaSourceEventListener
.
EventDispatcher
mediaSourceEventDispatcher
;
@HlsMediaSource
.
MetadataType
private
final
int
metadataType
;
private
final
@HlsMediaSource
.
MetadataType
int
metadataType
;
private
final
HlsChunkSource
.
HlsChunkHolder
nextChunkHolder
;
private
final
HlsChunkSource
.
HlsChunkHolder
nextChunkHolder
;
private
final
ArrayList
<
HlsMediaChunk
>
mediaChunks
;
private
final
ArrayList
<
HlsMediaChunk
>
mediaChunks
;
private
final
List
<
HlsMediaChunk
>
readOnlyMediaChunks
;
private
final
List
<
HlsMediaChunk
>
readOnlyMediaChunks
;
...
...
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