Skip to content

fix(HLS): Fix use of EXT-X-MEDIA when not using Content Steering #7166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avelad merged 1 commit into from
Aug 21, 2024
Merged

fix(HLS): Fix use of EXT-X-MEDIA when not using Content Steering #7166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/hls/hls_classes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,13 @@ shaka.hls.Tag = class {
/**
* Create the string key of the tag.
*
* @param {boolean} keepAllAtributtes
* @return {string}
*/
getTagKey() {
getTagKey(keepAllAtributtes) {
if (keepAllAtributtes) {
return this.toString();
}
const attributesToSkip = new Set()
.add('AUDIO')
.add('VIDEO')
Expand Down
4 changes: 2 additions & 2 deletions lib/hls/hls_parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,7 @@ shaka.hls.HlsParser = class {

const groupedTags = {};
for (const tag of mediaTags) {
const key = tag.getTagKey();
const key = tag.getTagKey(!this.contentSteeringManager_);
if (!groupedTags[key]) {
groupedTags[key] = [tag];
} else {
Expand Down Expand Up @@ -1557,7 +1557,7 @@ shaka.hls.HlsParser = class {

const groupedTags = {};
for (const tag of tags) {
const key = tag.getTagKey();
const key = tag.getTagKey(!this.contentSteeringManager_);
if (!groupedTags[key]) {
groupedTags[key] = [tag];
} else {
Expand Down