viaprog/shaka-player
1
0
Fork 0
mirror of https://github.com/shaka-project/shaka-player.git synced 2026-06-25 17:45:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Update region observer with new rules for small regions (#8275)

Browse Source 
This is necessary because some EMSG and ID3 events might not fire
because the endTime is equal to or very close to the startTime.

Related to https://github.com/shaka-project/shaka-player/pull/8012
This commit is contained in:
Álvaro Velad Galván
2025-03-14 14:01:28 +01:00
committed by GitHub
parent c49102ca3d
commit 2f18b47d95
2 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/media/region_observer.js
+10 -1
View File
@@ -96,7 +96,16 @@ shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
{
weWere: BEFORE_THE_REGION,
weAre: AFTER_THE_REGION,
invoke: (region, seeking) => this.onEvent_('skip', region, seeking),
invoke: (region, seeking) => {
if (seeking) {
this.onEvent_('skip', region, seeking);
} else {
// This is the case of regions whose duration is smaller than the
// resolution of our polling.
this.onEvent_('enter', region, seeking);
this.onEvent_('exit', region, seeking);
}
},
},
{
weWere: AFTER_THE_REGION,
test/media/region_observer_unit.js
+26 -19
View File
@@ -113,25 +113,29 @@ describe('RegionObserver', () => {
expect(onExitRegion).toHaveBeenCalledOnceMoreWith([region, false]);
});
it('fires skip event when we enter and leave region in one move', () => {
const region = createRegion('my-region', 5, 10);
timeline.addRegion(region);
it('fires start and end events when we enter and leave region in one move',
() => {
const region = createRegion('my-region', 5, 10);
timeline.addRegion(region);
// Make sure we are before the region starts.
poll(observer,
/* timeInSeconds= */ 4,
/* seeking= */ false);
expect(onSkipRegion).not.toHaveBeenCalled();
// Make sure we are before the region starts.
poll(observer,
/* timeInSeconds= */ 4,
/* seeking= */ false);
expect(onEnterRegion).not.toHaveBeenCalled();
expect(onExitRegion).not.toHaveBeenCalled();
expect(onSkipRegion).not.toHaveBeenCalled();
// Make sure we call |onSkip| when we move so far that we skip over the
// region.
poll(observer,
/* timeInSeconds= */ 15,
/* seeking= */ false);
expect(onSkipRegion).toHaveBeenCalledOnceMoreWith([region, false]);
});
// Make sure we call |onEnter| and |onExit|
poll(observer,
/* timeInSeconds= */ 15,
/* seeking= */ false);
expect(onEnterRegion).toHaveBeenCalledOnceMoreWith([region, false]);
expect(onExitRegion).toHaveBeenCalledOnceMoreWith([region, false]);
expect(onSkipRegion).not.toHaveBeenCalled();
});
it('fires skip events for zero-duration regions', () => {
it('fires start and end events for zero-duration regions', () => {
// Make a region with no duration.
const region = createRegion('my-region', 5, 5);
timeline.addRegion(region);
@@ -140,14 +144,17 @@ describe('RegionObserver', () => {
poll(observer,
/* timeInSeconds= */ 4,
/* seeking= */ false);
expect(onEnterRegion).not.toHaveBeenCalled();
expect(onExitRegion).not.toHaveBeenCalled();
expect(onSkipRegion).not.toHaveBeenCalled();
// Make sure we call |onSkip| when we move so far that we skip over the
// region.
// Make sure we call |onEnter| and |onExit|
poll(observer,
/* timeInSeconds= */ 10,
/* seeking= */ false);
expect(onSkipRegion).toHaveBeenCalledOnceMoreWith([region, false]);
expect(onEnterRegion).toHaveBeenCalledOnceMoreWith([region, false]);
expect(onExitRegion).toHaveBeenCalledOnceMoreWith([region, false]);
expect(onSkipRegion).not.toHaveBeenCalled();
});
// We want to simulate a "normal" case of overlapping regions. For this we