Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
2 changes: 1 addition & 1 deletion packages/mux-audio/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class MuxAudioElement extends CustomAudioElement implements Partial<MuxMediaProp

#core?: PlaybackCore;
#loadRequested?: Promise<void> | null;
#defaultPlayerInitTime: number;
#defaultPlayerInitTime: number | undefined;
#metadata: Readonly<Metadata> = {};
#tokens: Tokens = {};
#_hlsConfig?: Partial<HlsConfig>;
Expand Down
14 changes: 11 additions & 3 deletions packages/mux-player/src/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function getProps(el: MuxPlayerElement, state?: any): MuxTemplateProps {
playbackId: el.playbackId,
hasSrc: !!el.playbackId || !!el.src || !!el.currentSrc,
poster: el.poster,
storyboard: el.storyboard,
storyboard: el.hasLoaded && el.storyboard,
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
storyboard: el.hasLoaded && el.storyboard,
storyboard: el.media.src && el.storyboard,

Copy link
Contributor Author

@Pintorado Pintorado Dec 18, 2025

Choose a reason for hiding this comment

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

The fix didn't work with el.media.src but it does work with el.media?.currentSrc

storyboardSrc: el.getAttribute(PlayerAttributes.STORYBOARD_SRC),
fullscreenElement: el.getAttribute(PlayerAttributes.FULLSCREEN_ELEMENT),
placeholder: el.getAttribute('placeholder'),
Expand Down Expand Up @@ -285,10 +285,11 @@ const initialState = {
const DEFAULT_EXTRA_PLAYLIST_PARAMS = { redundant_streams: true };

class MuxPlayerElement extends VideoApiElement implements IMuxPlayerElement {
#defaultPlayerInitTime: number;
#defaultPlayerInitTime: number | undefined;
#isInit = false;
#tokens: Tokens = {};
#userInactive = true;
#hasLoaded = false;
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
#hasLoaded = false;

#hotkeys = new AttributeTokenList(this, 'hotkeys');
#state: Partial<MuxTemplateProps> = {
...initialState,
Expand Down Expand Up @@ -381,7 +382,10 @@ class MuxPlayerElement extends VideoApiElement implements IMuxPlayerElement {
this.media?.addEventListener('streamtypechange', () => this.#render());

// NOTE: Make sure we re-render when <source> tags are appended so hasSrc is updated.
this.media?.addEventListener('loadstart', () => this.#render());
this.media?.addEventListener('loadstart', () => {
this.#hasLoaded = true;
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
this.#hasLoaded = true;

this.#render();
});
}

#setupCSSProperties() {
Expand Down Expand Up @@ -823,6 +827,10 @@ class MuxPlayerElement extends VideoApiElement implements IMuxPlayerElement {
return this.mediaController?.hasAttribute(MediaUIAttributes.MEDIA_HAS_PLAYED) ?? false;
}

get hasLoaded() {
return this.#hasLoaded;
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
get hasLoaded() {
return this.#hasLoaded;
}

get inLiveWindow() {
return this.mediaController?.hasAttribute(MediaUIAttributes.MEDIA_TIME_IS_LIVE);
}
Expand Down
10 changes: 8 additions & 2 deletions packages/mux-player/test/player.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,6 @@ describe('<mux-player>', () => {

const muxVideo = player.media;
const mediaPosterImage = player.mediaTheme.querySelector('media-poster-image');
const storyboardTrack = muxVideo.shadowRoot.querySelector("track[label='thumbnails']");

await waitUntil(() => !!muxVideo.getAttribute('src'), '<mux-video> src never set');
assert.equal(
Expand All @@ -557,7 +556,11 @@ describe('<mux-player>', () => {
'https://image.mux.com/bos2bPV3qbFgpVPaQ900Xd5UcdM6WXTmz02WZSz01nJ00tY/thumbnail.webp?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik96VU90ek1nUWhPbkk2MDJ6SlFQbU52THR4MDBnSjJqTlBxN0tTTzAxQlozelEifQ.eyJleHAiOjE5NjE2MDE3MzYsImF1ZCI6InQiLCJzdWIiOiJib3MyYlBWM3FiRmdwVlBhUTkwMFhkNVVjZE02V1hUbXowMldaU3owMW5KMDB0WSJ9.gDe_efqmRB5E3e4ag6in8MfMK-Vn3c_3B4M-BiWw6lg2aaf2BOTv7ltxhn2cvg4G0iFi-esRjhDlHbMRTxwTGavsx8TRLFtJ8vyBzToaFQbQMrn9OZztq_XrCEwqkD8bUAVtdOT1YB606OZyy6XO-CxdMRrKMUsM-cGrfv0TxvzJjThJBY4SzFv_whtYRxqAypZojROU7IiTbqcsk_cSrRMjB7WyAOAvyPNKnr6RkVEuMJtlCtaf_e4DIJHebZUZb3JmVTG4jIWrD1QkN7uLUwCPPRvGhXwhet9JaJPyC5lmkcb9YmH-15V6GOpwSg7sDMGC3YS4aIb_RtVkan0t-w'
);

await waitUntil(() => !!storyboardTrack.getAttribute('src'), 'storyboard <track> src never set');
let storyboardTrack;
await waitUntil(() => {
storyboardTrack = muxVideo.shadowRoot.querySelector("track[label='thumbnails']");
return storyboardTrack && !!storyboardTrack.getAttribute('src');
}, 'storyboard <track> src never set');
Comment on lines +559 to +563
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@luwes this test was failing because storyboardTrack was null at this point. We now wait until the track is rendered before accessing its src attribute.

assert.equal(
storyboardTrack.getAttribute('src'),
'https://image.mux.com/bos2bPV3qbFgpVPaQ900Xd5UcdM6WXTmz02WZSz01nJ00tY/storyboard.vtt?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik96VU90ek1nUWhPbkk2MDJ6SlFQbU52THR4MDBnSjJqTlBxN0tTTzAxQlozelEifQ.eyJleHAiOjE5NjE2MDE3NzcsImF1ZCI6InMiLCJzdWIiOiJib3MyYlBWM3FiRmdwVlBhUTkwMFhkNVVjZE02V1hUbXowMldaU3owMW5KMDB0WSJ9.aVd0dsOJUVeQko3BWd9YEhL41Eytf_ZfaBeNzHSSUqU_gREa_jJEVTlRfuiE4g71cKJLSiVTKP7f-F7Txh6DlL8E2SkonfIPB2H0f_3DQxYLso2E8qI4zuJkyxKORbQFLAEB_vSE-2lMbrHXfdpQhv6SrVyu6di9ku0LpFpoyz-_7fVJICr8nhlsqOGt66AYcaa99TXoZ582FWzBaePmWw-WWKYsLvtNjLS9UoxbdVaBRwNylohvhh-i1Y9dNilyNooJ7O8Cj4GuMjeh1pCj0BOrGagxrWrswm3HjUVNUqFq5JCWnJCxgjjwiV4RLZg_4z7gkBXyX7H2-i1dKA3Cpw&format=webp'
Expand Down Expand Up @@ -771,6 +774,7 @@ describe('<mux-player>', () => {
stream-type="on-demand"
muted
></mux-player>`);

player.storyboardSrc = 'https://image.mux.com/VcmKA6aqzIzlg3MayLJDnbF55kX00mds028Z65QxvBYaA/storyboard.vtt';
assert.equal(
player.storyboard,
Expand All @@ -792,6 +796,7 @@ describe('<mux-player>', () => {
stream-type="on-demand"
muted
></mux-player>`);

const newStoryboardSrc = 'https://image.mux.com/VcmKA6aqzIzlg3MayLJDnbF55kX00mds028Z65QxvBYaA/storyboard.vtt';
player.storyboardSrc = newStoryboardSrc;
assert.equal(player.storyboardSrc, newStoryboardSrc);
Expand All @@ -806,6 +811,7 @@ describe('<mux-player>', () => {
storyboard-token="eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik96VU90ek1nUWhPbkk2MDJ6SlFQbU52THR4MDBnSjJqTlBxN0tTTzAxQlozelEifQ.eyJleHAiOjE5NjE2MDE3NzcsImF1ZCI6InMiLCJzdWIiOiJib3MyYlBWM3FiRmdwVlBhUTkwMFhkNVVjZE02V1hUbXowMldaU3owMW5KMDB0WSJ9.aVd0dsOJUVeQko3BWd9YEhL41Eytf_ZfaBeNzHSSUqU_gREa_jJEVTlRfuiE4g71cKJLSiVTKP7f-F7Txh6DlL8E2SkonfIPB2H0f_3DQxYLso2E8qI4zuJkyxKORbQFLAEB_vSE-2lMbrHXfdpQhv6SrVyu6di9ku0LpFpoyz-_7fVJICr8nhlsqOGt66AYcaa99TXoZ582FWzBaePmWw-WWKYsLvtNjLS9UoxbdVaBRwNylohvhh-i1Y9dNilyNooJ7O8Cj4GuMjeh1pCj0BOrGagxrWrswm3HjUVNUqFq5JCWnJCxgjjwiV4RLZg_4z7gkBXyX7H2-i1dKA3Cpw"
storyboard-src="https://image.mux.com/VcmKA6aqzIzlg3MayLJDnbF55kX00mds028Z65QxvBYaA/storyboard.vtt"
></mux-player>`);

assert.equal(
player.storyboard,
'https://image.mux.com/bos2bPV3qbFgpVPaQ900Xd5UcdM6WXTmz02WZSz01nJ00tY/storyboard.vtt?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik96VU90ek1nUWhPbkk2MDJ6SlFQbU52THR4MDBnSjJqTlBxN0tTTzAxQlozelEifQ.eyJleHAiOjE5NjE2MDE3NzcsImF1ZCI6InMiLCJzdWIiOiJib3MyYlBWM3FiRmdwVlBhUTkwMFhkNVVjZE02V1hUbXowMldaU3owMW5KMDB0WSJ9.aVd0dsOJUVeQko3BWd9YEhL41Eytf_ZfaBeNzHSSUqU_gREa_jJEVTlRfuiE4g71cKJLSiVTKP7f-F7Txh6DlL8E2SkonfIPB2H0f_3DQxYLso2E8qI4zuJkyxKORbQFLAEB_vSE-2lMbrHXfdpQhv6SrVyu6di9ku0LpFpoyz-_7fVJICr8nhlsqOGt66AYcaa99TXoZ582FWzBaePmWw-WWKYsLvtNjLS9UoxbdVaBRwNylohvhh-i1Y9dNilyNooJ7O8Cj4GuMjeh1pCj0BOrGagxrWrswm3HjUVNUqFq5JCWnJCxgjjwiV4RLZg_4z7gkBXyX7H2-i1dKA3Cpw&format=webp'
Expand Down
2 changes: 1 addition & 1 deletion packages/mux-video/src/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export class MuxVideoBaseElement extends CustomVideoElement implements IMuxVideo

#core?: PlaybackCore;
#loadRequested?: Promise<void> | null;
#defaultPlayerInitTime: number;
#defaultPlayerInitTime: number | undefined;
#metadata: Metadata = {};
#tokens: Tokens = {};
#_hlsConfig?: Partial<HlsConfig>;
Expand Down
Loading