Commit 35915623 by aquilescanta Committed by Ian Baker

Remove FormatHolder.includesDrmSession

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

PiperOrigin-RevId: 295584542
parent bd028124
......@@ -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;
}
......
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment