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.

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

fix(HLS): Show WebVTT subtitles with X-TIMESTAMP-MAP in segments mode #5643

Merged
merged 2 commits into from Sep 12, 2023

Conversation

avelad
Copy link
Collaborator

@avelad avelad commented Sep 12, 2023

No description provided.

@avelad avelad added type: bug Something isn't working correctly component: HLS The issue involves Apple's HLS manifest format priority: P2 Smaller impact or easy workaround component: WebVTT The issue involves WebVTT subtitles specifically labels Sep 12, 2023
@avelad avelad added this to the v4.5 milestone Sep 12, 2023
@@ -72,8 +84,8 @@ shaka.text.VttTextParser = class {
// HLS content, which should use X-TIMESTAMP-MAP and periodStart instead.
let offset = time.vttOffset;

// Only use 'X-TIMESTAMP-MAP' in sequence mode, as that is currently
// shorthand for HLS. Note that an offset based on the first video
// Only use 'X-TIMESTAMP-MAP' in sequence mode or HLS.
Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't think this comment is accurate. It makes it sound like we are using X-TIMESTAMP-MAP in all HLS, but in reality we still don't parse the tag in segment mode HLS.
We are merely taking the presence of an X-TIMESTAMP-MAP tag as a signal that the offset is to be calculated differently in segment mode HLS, correct?
It might be better to have a short explanation inside the new clause below, and just remove the mention of HLS from this comment entirely.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Changed!

@avelad avelad requested a review from theodab September 12, 2023 11:08
@shaka-bot
Copy link
Collaborator

Incremental code coverage: 98.21%

@avelad avelad merged commit bd636d4 into shaka-project:main Sep 12, 2023
16 checks passed
@avelad avelad deleted the hls-subtitles branch September 12, 2023 12:29
@shaka-bot shaka-bot added the status: archived Archived and locked; will not be updated label Nov 11, 2023
@shaka-project shaka-project locked as resolved and limited conversation to collaborators Nov 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
component: HLS The issue involves Apple's HLS manifest format component: WebVTT The issue involves WebVTT subtitles specifically priority: P2 Smaller impact or easy workaround status: archived Archived and locked; will not be updated type: bug Something isn't working correctly
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants