fix(MSS): Don't allow prefetch segments with self-generated data (#7485)

avelad · joeyparrish · commit 00f4763392e9 · 2024-11-12T14:42:30.000-08:00
diff --git a/lib/media/segment_prefetch.js b/lib/media/segment_prefetch.js
@@ -111,6 +111,9 @@ shaka.media.SegmentPrefetch = class {
           shaka.media.SegmentReference.Status.MISSING) {
         prefetchAllowed = false;
       }
+      if (reference.getSegmentData()) {
+        prefetchAllowed = false;
+      }
       if (prefetchAllowed && reference.initSegmentReference) {
         this.prefetchInitSegment(reference.initSegmentReference);
       }
@@ -143,6 +146,10 @@ shaka.media.SegmentPrefetch = class {
       return;
     }
 
+    if (initSegmentReference.getSegmentData()) {
+      return;
+    }
+
     // init segments are ignored from the prefetch limit
     const initSegments = Array.from(this.initSegmentPrefetchMap_.keys());
     const someReference = initSegments.some((reference) => {

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,9 @@ shaka.media.SegmentPrefetch = class {`
`111`	`111`	`shaka.media.SegmentReference.Status.MISSING) {`
`112`	`112`	`prefetchAllowed = false;`
`113`	`113`	`}`
	`114`	`+ if (reference.getSegmentData()) {`
	`115`	`+ prefetchAllowed = false;`
	`116`	`+ }`
`114`	`117`	`if (prefetchAllowed && reference.initSegmentReference) {`
`115`	`118`	`this.prefetchInitSegment(reference.initSegmentReference);`
`116`	`119`	`}`
`@@ -143,6 +146,10 @@ shaka.media.SegmentPrefetch = class {`
`143`	`146`	`return;`
`144`	`147`	`}`
`145`	`148`
	`149`	`+ if (initSegmentReference.getSegmentData()) {`
	`150`	`+ return;`
	`151`	`+ }`
	`152`	`+`
`146`	`153`	`// init segments are ignored from the prefetch limit`
`147`	`154`	`const initSegments = Array.from(this.initSegmentPrefetchMap_.keys());`
`148`	`155`	`const someReference = initSegments.some((reference) => {`