sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move DrmSession into the core module

Browse source 
PiperOrigin-RevId: 292112214
This commit is contained in:
aquilescanta 2020-01-29 11:41:06 +00:00 committed by Oliver Woodman
parent 427db0b532
commit 6377e277c7
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
library/common/src/main/java/com/google/android/exoplayer2/Format.java
View file

@ -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 {
/** /**
* 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;

0
library/common/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java → library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
View file