Skip to content

Commit 0f922f4

Browse files
authored
Readd inline events after a seek (#4884)
1 parent 51cb1f1 commit 0f922f4

File tree

1 file changed

+30
-22
lines changed

1 file changed

+30
-22
lines changed

src/streaming/Stream.js

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,23 @@
2828
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
* POSSIBILITY OF SUCH DAMAGE.
3030
*/
31+
import BlacklistController from './controllers/BlacklistController.js';
32+
import BoxParser from './utils/BoxParser.js';
3133
import Constants from './constants/Constants.js';
3234
import DashConstants from '../dash/constants/DashConstants.js';
33-
import StreamProcessor from './StreamProcessor.js';
34-
import FragmentController from './controllers/FragmentController.js';
35-
import ThumbnailController from './thumbnail/ThumbnailController.js';
36-
import EventBus from '../core/EventBus.js';
37-
import Events from '../core/events/Events.js';
35+
import DashJSError from './vo/DashJSError.js';
3836
import Debug from '../core/Debug.js';
3937
import Errors from '../core/errors/Errors.js';
40-
import FactoryMaker from '../core/FactoryMaker.js';
41-
import DashJSError from './vo/DashJSError.js';
42-
import BoxParser from './utils/BoxParser.js';
43-
import URLUtils from './utils/URLUtils.js';
44-
import BlacklistController from './controllers/BlacklistController.js';
38+
import EventBus from '../core/EventBus.js';
39+
import Events from '../core/events/Events.js';
4540
import ExternalMediaSource from './ExternalMediaSource.js';
41+
import FactoryMaker from '../core/FactoryMaker.js';
42+
import FragmentController from './controllers/FragmentController.js';
4643
import MediaInfoSelectionInput from './vo/MediaInfoSelectionInput.js';
44+
import MediaPlayerEvents from './MediaPlayerEvents.js';
45+
import StreamProcessor from './StreamProcessor.js';
46+
import ThumbnailController from './thumbnail/ThumbnailController.js';
47+
import URLUtils from './utils/URLUtils.js';
4748

4849

4950
const MEDIA_TYPES = [Constants.VIDEO, Constants.AUDIO, Constants.TEXT, Constants.MUXED, Constants.IMAGE];
@@ -76,23 +77,24 @@ function Stream(config) {
7677
const settings = config.settings;
7778

7879

79-
let instance,
80-
logger,
81-
streamProcessors,
82-
isInitialized,
83-
isActive,
80+
let boxParser,
81+
debug,
82+
fragmentController,
83+
hasAudioTrack,
8484
hasFinishedBuffering,
8585
hasVideoTrack,
86-
hasAudioTrack,
87-
fragmentController,
88-
thumbnailController,
89-
segmentBlacklistController,
90-
preloaded,
91-
boxParser,
92-
debug,
86+
instance,
87+
isActive,
9388
isEndedEventSignaled,
89+
isInitialized,
90+
logger,
91+
preloaded,
92+
segmentBlacklistController,
93+
streamProcessors,
94+
thumbnailController,
9495
trackChangedEvents;
9596

97+
9698
/**
9799
* Setup the stream
98100
*/
@@ -142,6 +144,7 @@ function Stream(config) {
142144
eventBus.on(Events.BUFFERING_COMPLETED, _onBufferingCompleted, instance);
143145
eventBus.on(Events.INBAND_EVENTS, _onInbandEvents, instance);
144146
eventBus.on(Events.DATA_UPDATE_COMPLETED, _onDataUpdateCompleted, instance);
147+
eventBus.on(MediaPlayerEvents.PLAYBACK_SEEKED, _onPlaybackSeeked, instance);
145148
}
146149

147150
/**
@@ -151,6 +154,7 @@ function Stream(config) {
151154
eventBus.off(Events.BUFFERING_COMPLETED, _onBufferingCompleted, instance);
152155
eventBus.off(Events.INBAND_EVENTS, _onInbandEvents, instance);
153156
eventBus.off(Events.DATA_UPDATE_COMPLETED, _onDataUpdateCompleted, instance);
157+
eventBus.off(MediaPlayerEvents.PLAYBACK_SEEKED, _onPlaybackSeeked, instance);
154158
}
155159

156160
/**
@@ -915,6 +919,10 @@ function Stream(config) {
915919
_initializationCompleted();
916920
}
917921

922+
function _onPlaybackSeeked() {
923+
_addInlineEvents();
924+
}
925+
918926
function getProcessorForMediaInfo(mediaInfo) {
919927
if (!mediaInfo || !mediaInfo.type) {
920928
return null;

0 commit comments

Comments
 (0)