Handle DTS wrapping in initial AVC CTS calculation

video-dev · Aug 1, 2020 · 7c80447 · 7c80447
1 parent aa15efa
commit 7c80447
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/src/remux/mp4-remuxer.js b/src/remux/mp4-remuxer.js
@@ -232,7 +232,7 @@ class MP4Remuxer {
 
     if (!contiguous) {
       const pts = timeOffset * timeScale;
-      const cts = inputSamples[0].pts - inputSamples[0].dts;
+      const cts = inputSamples[0].pts - PTSNormalize(inputSamples[0].dts, inputSamples[0].pts);
       // if not contiguous, let's use target timeOffset
       nextAvcDts = pts - cts;
     }

diff --git a/tests/functional/auto/setup.js b/tests/functional/auto/setup.js
@@ -123,18 +123,20 @@ async function testSmoothSwitch (url, config) {
       const callback = arguments[arguments.length - 1];
       window.startStream(url, config, callback);
       const video = window.video;
-      window.hls.once(window.Hls.Events.FRAG_CHANGED, (event, data) => {
+      window.hls.once(window.Hls.Events.FRAG_CHANGED, (eventName, data) => {
+        console.log('[test] > ' + eventName + ' frag.level: ' + data.frag.level);
         window.switchToHighestLevel('next');
       });
-      window.hls.on(window.Hls.Events.LEVEL_SWITCHED, (event, data) => {
-        console.log('[test] > level switched: ' + data.level);
+      window.hls.on(window.Hls.Events.LEVEL_SWITCHED, (eventName, data) => {
+        console.log('[test] > ' + eventName + ' data.level: ' + data.level);
         let currentTime = video.currentTime;
-        if (data.level === window.hls.levels.length - 1) {
-          console.log('[test] > switched on level: ' + data.level);
+        const highestLevel = (window.hls.levels.length - 1);
+        if (data.level === highestLevel) {
           window.setTimeout(function () {
             let newCurrentTime = video.currentTime;
-            console.log('[test] > currentTime delta : ' + (newCurrentTime - currentTime));
+            console.log('[test] > currentTime delta: ' + (newCurrentTime - currentTime));
             callback({
+              highestLevel: highestLevel,
               currentTimeDelta: newCurrentTime - currentTime,
               logs: window.logString
             });

diff --git a/tests/test-streams.js b/tests/test-streams.js
@@ -35,15 +35,10 @@ function createTestStreamWithConfig (target, config) {
 }
 
 module.exports = {
-  bbb: createTestStreamWithConfig({
+  bbb: {
     url: 'https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8',
     description: 'Big Buck Bunny - adaptive qualities'
   },
-  {
-    // try to workaround test failing because of slow seek on Chrome/Win10
-    nudgeMaxRetry: 5
-  }
-  ),
   fdr: {
     url: 'https://cdn.jwplayer.com/manifests/pZxWPRg4.m3u8',
     description: 'FDR - CDN packaged, 4s segments, 180p - 1080p',