Skip to content

Commit

Permalink
fix(FEC-10840): incorrect waiting and playing event comes from dash a…
Browse files Browse the repository at this point in the history
…dapter (#128)

Issue: adapter fire waiting and playing before it fired from the video element.
There is an incorrect situation when playing fired twice for DRM content and waiting fired before play.
Solution: use this mechanism only after first playing to make sure that buffering will be handled after first playing when buffering should change the buffering state.
  • Loading branch information
Yuvalke committed Jan 19, 2021
1 parent 7e58f67 commit fb7ecba
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
4 changes: 3 additions & 1 deletion src/dash-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -612,10 +612,12 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
_addBindings(): void {
this._eventManager.listen(this._shaka, ShakaEvent.ADAPTATION, this._adapterEventsBindings.adaptation);
this._eventManager.listen(this._shaka, ShakaEvent.ERROR, this._adapterEventsBindings.error);
this._eventManager.listen(this._shaka, ShakaEvent.BUFFERING, this._adapterEventsBindings.buffering);
this._eventManager.listen(this._shaka, ShakaEvent.DRM_SESSION_UPDATE, this._adapterEventsBindings.drmsessionupdate);
this._eventManager.listen(this._videoElement, EventType.WAITING, this._adapterEventsBindings.waiting);
this._eventManager.listen(this._videoElement, EventType.PLAYING, this._adapterEventsBindings.playing);
this._eventManager.listenOnce(this._videoElement, EventType.PLAYING, () =>
this._eventManager.listen(this._shaka, ShakaEvent.BUFFERING, this._adapterEventsBindings.buffering)
);
// called when a resource is downloaded
this._shaka.getNetworkingEngine().registerResponseFilter((type, response) => {
switch (type) {
Expand Down
9 changes: 7 additions & 2 deletions test/src/dash-adapter.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ describe('DashAdapter: _onBuffering', () => {
dashInstance._onBuffering({buffering: true});
});

it('should dispatch playing event when buffering is false and video is playing', done => {
it('should dispatch playing event when buffering is false and video is playing after waiting event', done => {
dashInstance = DashAdapter.createAdapter(video, vodSource, config);
let hasPlaying = false;
let onPlaying = () => {
Expand All @@ -1213,10 +1213,15 @@ describe('DashAdapter: _onBuffering', () => {
done();
} else {
hasPlaying = true;
dashInstance._onBuffering({buffering: false});
dashInstance._onBuffering({buffering: true});
}
};
const onWaiting = () => {
dashInstance._videoElement.removeEventListener(EventType.WAITING, onWaiting);
dashInstance._onBuffering({buffering: false});
};
dashInstance._videoElement.addEventListener(EventType.PLAYING, onPlaying);
dashInstance._videoElement.addEventListener(EventType.WAITING, onWaiting);
dashInstance
.load()
.then(() => {
Expand Down

0 comments on commit fb7ecba

Please sign in to comment.