Feat/doris 2176 support mixed ts cmaf stream (#21)

* Add the initial check about this device support L1 or only L3. * Try to fix the playback issue on the mixed-ts-cmaf stream.
DiceTechnology · Mar 4, 2024 · 28aafd2 · 28aafd2
1 parent 30cad92
commit 28aafd2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java
@@ -118,7 +118,9 @@ private FrameworkMediaDrm(UUID uuid) throws UnsupportedSchemeException {
     this.mediaDrm = new MediaDrm(adjustUuid(uuid));
     // Creators of an instance automatically acquire ownership of the created instance.
     referenceCount = 1;
-    if (C.WIDEVINE_UUID.equals(uuid) && needsForceWidevineL3Workaround()) {
+    // Add the initial check about this device support L1 or only L3.
+    boolean mediaDrmL3 = "L3".equalsIgnoreCase(getPropertyString("securityLevel"));
+    if (C.WIDEVINE_UUID.equals(uuid) && !mediaDrmL3 && needsForceWidevineL3Workaround()) {
       forceWidevineL3(mediaDrm);
     }
   }

diff --git a/...exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java b/...exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java
@@ -853,6 +853,8 @@ private static HlsMediaPlaylist parseMediaPlaylist(
         playlistDiscontinuitySequence = Integer.parseInt(line.substring(line.indexOf(':') + 1));
       } else if (line.equals(TAG_DISCONTINUITY) && !discontinuityAfterSkip) {
         relativeDiscontinuitySequence++;
+        // To fix the playback issue on the mixed-ts-cmaf stream.
+        initializationSegment = null;
       } else if (line.startsWith(TAG_PROGRAM_DATE_TIME)) {
         segmentStartTimeUtcUs = Util.msToUs(Util.parseXsDateTime(line.substring(line.indexOf(':') + 1)));
         // Calc playlist start time with latest value of #EXT-X-PROGRAM-DATE-TIME tag, instead first value.