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

Fix captions disappear on unbuffered seeks when user activates, deactivates, and reactivates captions #2674

Merged
merged 12 commits into from
Jun 24, 2020
Merged

Fix captions disappear on unbuffered seeks when user activates, deactivates, and reactivates captions #2674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ffaed64
Created MP4 box parsers to parse data for common box types (#2648)
muhammadharis Jun 11, 2020
e17d2f1
merged in master
muhammadharis Jun 21, 2020
2fb10c1
fix: captions disappear during unbuffered seeks when activating, deac…
muhammadharis Jun 22, 2020
e9d299b
Merge branch 'master' of https://github.com/google/shaka-player into …
muhammadharis Jun 22, 2020
c22d766
removed extra file from unrebased local master
muhammadharis Jun 22, 2020
9c0db06
fixed captions disappearing or showing double when turned off then on
muhammadharis Jun 23, 2020
57ef3bb
removed extraneous null test
muhammadharis Jun 23, 2020
b677f11
minor semantic fix in test description
muhammadharis Jun 23, 2020
037011a
added descriptive comment and tightened tests as per review
muhammadharis Jun 24, 2020
1629ee7
modified test message
muhammadharis Jun 24, 2020
a1f117a
added unit test in streaming_engine_unit.js
muhammadharis Jun 24, 2020
a8808cd
removed extra setup from test
muhammadharis Jun 24, 2020
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
1 change: 1 addition & 0 deletions lib/media/streaming_engine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ shaka.media.StreamingEngine = class {
this.abortOperations_(state).catch(() => {});
this.mediaStates_.delete(ContentType.TEXT);
}
this.currentTextStream_ = null;
Copy link
Member

Choose a reason for hiding this comment

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

Oh, wow, that certainly should have been there. :-)

This member is new in v3.0 if I recall correctly.

}

/**
Expand Down
14 changes: 14 additions & 0 deletions test/media/streaming_engine_unit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,20 @@ describe('StreamingEngine', () => {
}
});
});

it('sets the current text stream to null', async () => {
createStreamingEngine();

streamingEngine.switchVariant(variant);
streamingEngine.switchTextStream(textStream);
expect(streamingEngine.getCurrentTextStream()).not.toBe(null);

await streamingEngine.start();
playing = true;

streamingEngine.unloadTextStream();
expect(streamingEngine.getCurrentTextStream()).toBe(null);
});
});

it('initializes and plays live', async () => {
Expand Down
9 changes: 6 additions & 3 deletions ui/text_selection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,13 @@ shaka.ui.TextSelection = class extends shaka.ui.SettingsMenu {
* @private
*/
async onTextTrackSelected_(track) {
// setTextTrackVisibility should be called after selectTextLanguage.
// selectTextLanguage sets a text stream, and setTextTrackVisiblity(true)
// will set a text stream if it isn't already set. Consequently, reversing
// the order of these calls makes two languages display simultaneously
// if captions are turned off -> on in a different language.
this.player.selectTextLanguage(track.language, track.roles[0]);
await this.player.setTextTrackVisibility(true);
if (this.player) { // May have become null while awaiting
this.player.selectTextLanguage(track.language, track.roles[0]);
}
}


Expand Down