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
6377e277
authored
Jan 29, 2020
by
aquilescanta
Committed by
Oliver Woodman
Jan 30, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Move DrmSession into the core module
PiperOrigin-RevId: 292112214
parent
427db0b5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
library/common/src/main/java/com/google/android/exoplayer2/Format.java
library/common/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java → library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
library/common/src/main/java/com/google/android/exoplayer2/Format.java
View file @
6377e277
...
@@ -19,7 +19,6 @@ import android.os.Parcel;
...
@@ -19,7 +19,6 @@ import android.os.Parcel;
import
android.os.Parcelable
;
import
android.os.Parcelable
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
import
com.google.android.exoplayer2.drm.DrmInitData
;
import
com.google.android.exoplayer2.drm.DrmInitData
;
import
com.google.android.exoplayer2.drm.DrmSession
;
import
com.google.android.exoplayer2.drm.ExoMediaCrypto
;
import
com.google.android.exoplayer2.drm.ExoMediaCrypto
;
import
com.google.android.exoplayer2.metadata.Metadata
;
import
com.google.android.exoplayer2.metadata.Metadata
;
import
com.google.android.exoplayer2.util.MimeTypes
;
import
com.google.android.exoplayer2.util.MimeTypes
;
...
@@ -163,8 +162,8 @@ public final class Format implements Parcelable {
...
@@ -163,8 +162,8 @@ public final class Format implements Parcelable {
/**
/**
* The type of the {@link ExoMediaCrypto} provided by the media source, if the media source can
* The type of the {@link ExoMediaCrypto} provided by the media source, if the media source can
* acquire a
{@link DrmSession} for {@link #drmInitData}. Null if the media source cannot acquire
* acquire a
DRM session for {@link #drmInitData}. Null if the media source cannot acquire a
*
a
session for {@link #drmInitData}, or if not applicable.
* session for {@link #drmInitData}, or if not applicable.
*/
*/
@Nullable
public
final
Class
<?
extends
ExoMediaCrypto
>
exoMediaCryptoType
;
@Nullable
public
final
Class
<?
extends
ExoMediaCrypto
>
exoMediaCryptoType
;
...
...
library/co
mmon
/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
→
library/co
re
/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
View file @
6377e277
File moved
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