loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove FormatHolder.includesDrmSession

Browse Source 
With the Renderer migration, this is officially unnecessary, and
should always be true for supported encrypted content.

PiperOrigin-RevId: 295584542
This commit is contained in:
aquilescanta 2020-02-17 15:32:21 +00:00 committed by Ian Baker
parent bd02812430
commit 3591562364
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java
View File

@ -23,11 +23,6 @@ import com.google.android.exoplayer2.drm.DrmSession;
*/
public final class FormatHolder {
/** Whether the {@link #format} setter also sets the {@link #drmSession} field. */
// TODO: Remove once all Renderers and MediaSources have migrated to the new DRM model [Internal
// ref: b/129764794].
public boolean includesDrmSession;
/** An accompanying context for decrypting samples in the format. */
@Nullable public DrmSession<?> drmSession;
@ -36,7 +31,6 @@ public final class FormatHolder {
/** Clears the holder. */
public void clear() {
includesDrmSession = false;
drmSession = null;
format = null;
}

1
library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
View File

@ -783,7 +783,6 @@ public class SampleQueue implements TrackOutput {
return;
}
@Nullable DrmInitData newDrmInitData = newFormat.drmInitData;
outputFormatHolder.includesDrmSession = true;
outputFormatHolder.drmSession = currentDrmSession;
if (!isFirstFormat && Util.areEqual(oldDrmInitData, newDrmInitData)) {
// Nothing to do.