Merge pull request #6940 from devoldemar/fix/vps_after_sps

Support HEVC VPS coming after SPS
video-dev · Jan 4, 2025 · 6ce0f6c · 6ce0f6c
2 parents dec3ee7 + b1c83db
commit 6ce0f6c
Showing 1 changed file with 34 additions and 25 deletions.
diff --git a/src/demux/video/hevc-video-parser.ts b/src/demux/video/hevc-video-parser.ts
@@ -122,8 +122,10 @@ class HevcVideoParser extends BaseVideoParser {
         case 32:
           push = true;
           if (!track.vps) {
-            const config = this.readVPS(unit.data);
-            track.params = { ...config };
+            if (typeof track.params !== 'object') {
+              track.params = {};
+            }
+            track.params = Object.assign(track.params, this.readVPS(unit.data));
             this.initVPS = unit.data;
           }
           track.vps = [unit.data];
@@ -133,31 +135,35 @@ class HevcVideoParser extends BaseVideoParser {
         case 33:
           push = true;
           spsfound = true;
-          if (typeof track.params === 'object') {
-            if (
-              track.vps !== undefined &&
-              track.vps[0] !== this.initVPS &&
-              track.sps !== undefined &&
-              !this.matchSPS(track.sps[0], unit.data)
-            ) {
-              this.initVPS = track.vps[0];
-              track.sps = track.pps = undefined;
-            }
-            if (!track.sps) {
-              const config = this.readSPS(unit.data);
-              track.width = config.width;
-              track.height = config.height;
-              track.pixelRatio = config.pixelRatio;
-              track.codec = config.codecString;
-              track.sps = [];
-              for (const prop in config.params) {
-                track.params[prop] = config.params[prop];
-              }
+          if (
+            track.vps !== undefined &&
+            track.vps[0] !== this.initVPS &&
+            track.sps !== undefined &&
+            !this.matchSPS(track.sps[0], unit.data)
+          ) {
+            this.initVPS = track.vps[0];
+            track.sps = track.pps = undefined;
+          }
+          if (!track.sps) {
+            const config = this.readSPS(unit.data);
+            track.width = config.width;
+            track.height = config.height;
+            track.pixelRatio = config.pixelRatio;
+            track.codec = config.codecString;
+            track.sps = [];
+            if (typeof track.params !== 'object') {
+              track.params = {};
             }
-            if (track.vps !== undefined && track.vps[0] === this.initVPS) {
-              track.sps.push(unit.data);
+            for (const prop in config.params) {
+              track.params[prop] = config.params[prop];
             }
           }
+          if (
+            (!track.vps && !track.sps.length) ||
+            (track.vps && track.vps[0] === this.initVPS)
+          ) {
+            track.sps.push(unit.data);
+          }
           if (!VideoSample) {
             VideoSample = this.VideoSample = this.createVideoSample(
               true,
@@ -179,7 +185,10 @@ class HevcVideoParser extends BaseVideoParser {
                 track.params[prop] = config[prop];
               }
             }
-            if (track.vps !== undefined && track.vps[0] === this.initVPS) {
+            if (
+              (!track.vps && !track.pps.length) ||
+              (track.vps && track.vps[0] === this.initVPS)
+            ) {
               track.pps.push(unit.data);
             }
           }