Skip to content
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

Jump to bottom

Address optional URI component mentioned in issue 1086 and issue 1730 #1732

Merged
merged 1 commit into from
Jan 18, 2019
Merged

Address optional URI component mentioned in issue 1086 and issue 1730 #1732

merged 1 commit into from
Jan 18, 2019

Conversation

rgc
Copy link
Contributor

@rgc rgc commented Dec 17, 2018

This patch removes the requirement that a URI component must exist on any EXT-X-MEDIA other than SUBTITLES. In additiona, the tests have been updated to capture the SUBTITLE requirement, while allowing AUDIO and VIDEO to be optional.

@rgc rgc mentioned this pull request Dec 17, 2018
Closed
ismena
ismena suggested changes Dec 17, 2018
View reviewed changes
lib/hls/hls_parser.js Outdated Show resolved Hide resolved
test/hls/hls_parser_unit.js Outdated Show resolved Hide resolved
test/hls/hls_parser_unit.js Outdated Show resolved Hide resolved
@rgc
Copy link
Contributor Author

rgc commented Dec 26, 2018

@ismena - I've added two additional tests, updated the existing SUBTITLE test, and added in a SUBTITLE exception to the code. Thanks much for the suggestions.

joeyparrish
joeyparrish approved these changes Jan 2, 2019
View reviewed changes
Copy link
Member

@joeyparrish joeyparrish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Thanks! I'll run it through our build bot to test.

@joeyparrish
Copy link
Member

Assuming it passes all tests and @ismena has no further requests when she's back in the office, we can merge to master. Thanks!

@shaka-bot
Copy link
Collaborator

All tests passed!

@rgc
Copy link
Contributor Author

rgc commented Jan 9, 2019

@joeyparrish - thank you for the review!

@ismena - can you merge when you return to the office?

Happy 2019!

@rgc
Copy link
Contributor Author

rgc commented Jan 18, 2019

Don't mean to be a pill -- but we have a client who uses Shaka and is waiting on this merge -- do you need me to do anything else?

Thanks,

Rob

@ismena
Copy link
Contributor

ismena commented Jan 18, 2019

@rgc Sorry, this completely escaped my attention :( Thanks a lot for the reminder! Let me run the tests.

@shaka-bot
Copy link
Collaborator

All tests passed!

@ismena ismena merged commit adde0bd into shaka-project:master Jan 18, 2019
@ismena
Copy link
Contributor

ismena commented Jan 18, 2019

URI attribute should only be required on subtitles, according to the spec.

Issue #1080
Issue #1730

@rgc
Copy link
Contributor Author

rgc commented Jan 18, 2019

Thank you @ismena for your patience and time!

@ismena
Copy link
Contributor

ismena commented Jan 18, 2019

Thanks again for the PR and sorry it got delayed cause of the holidays!

joeyparrish pushed a commit that referenced this pull request Jan 19, 2019
@rgc @joeyparrish
Fix HLS without URI attribute (#1732)
c0c0324 
If an X-EXT-MEDIA asset does not contain URI, ignore when building stream list.
URI attribute should only be required on subtitles, according to the spec.

Fixes #1086
Fixes #1730

Backported to v2.4.x
@joeyparrish
Copy link
Member

PR cherry-picked for v2.4.6.

@github-actions github-actions bot added the status: archived Archived and locked; will not be updated label Jul 25, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@joeyparrish joeyparrish joeyparrish approved these changes

@ismena ismena ismena approved these changes

Assignees
No one assigned
Labels
status: archived Archived and locked; will not be updated
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rgc @joeyparrish @shaka-bot @ismena