Skip to content

Commit 9829836

Browse files
committed
fix(HLS): Fix use of EXT-X-MEDIA when not using Content Steering (#7166)
Fixes #7122
1 parent ad050ca commit 9829836

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

lib/hls/hls_classes.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,13 @@ shaka.hls.Tag = class {
120120
/**
121121
* Create the string key of the tag.
122122
*
123+
* @param {boolean} keepAllAtributtes
123124
* @return {string}
124125
*/
125-
getTagKey() {
126+
getTagKey(keepAllAtributtes) {
127+
if (keepAllAtributtes) {
128+
return this.toString();
129+
}
126130
const attributesToSkip = new Set()
127131
.add('AUDIO')
128132
.add('VIDEO')

lib/hls/hls_parser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,7 @@ shaka.hls.HlsParser = class {
13751375

13761376
const groupedTags = {};
13771377
for (const tag of mediaTags) {
1378-
const key = tag.getTagKey();
1378+
const key = tag.getTagKey(!this.contentSteeringManager_);
13791379
if (!groupedTags[key]) {
13801380
groupedTags[key] = [tag];
13811381
} else {
@@ -1456,7 +1456,7 @@ shaka.hls.HlsParser = class {
14561456

14571457
const groupedTags = {};
14581458
for (const tag of tags) {
1459-
const key = tag.getTagKey();
1459+
const key = tag.getTagKey(!this.contentSteeringManager_);
14601460
if (!groupedTags[key]) {
14611461
groupedTags[key] = [tag];
14621462
} else {

0 commit comments

Comments
 (0)