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

Jump to bottom

fix(SUP-39804): Chromecast Not Working #104

Merged
merged 10 commits into from
Feb 19, 2024
Merged

fix(SUP-39804): Chromecast Not Working #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5ac96b2
fix(SUP-39804):Chromecast Not Working
inbalvasserman Dec 24, 2023
67be90c
fix session error- add source to mediaInfo
inbalvasserman Feb 1, 2024
16849a2
fix get entry id from session to correct path
inbalvasserman Feb 6, 2024
cc9cd60
change localEntryId param to be able to handle cases of playing live …
inbalvasserman Feb 6, 2024
5421d77
add timeout to resumeSession to start new one
inbalvasserman Feb 12, 2024
1ebe256
change if cast is not connected than in all cases return to local player
inbalvasserman Feb 15, 2024
a17fb69
in refresh in case can't get the session data but it playing on tv th…
inbalvasserman Feb 15, 2024
7059fd4
add onLoad for resume without mediaInfo
inbalvasserman Feb 15, 2024
dbb166d
change timeout to counter
inbalvasserman Feb 19, 2024
9eb0865
remove space
inbalvasserman Feb 19, 2024
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
28 changes: 18 additions & 10 deletions src/cast-player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const {
} = remote;

export const INTERVAL_FREQUENCY = 500;
export const RESUME_MAX_RETRIES = 10;
export const SECONDS_TO_MINUTES_DIVIDER = 60;
export const CUSTOM_CHANNEL = 'urn:x-cast:com.kaltura.cast.playkit';

Expand Down Expand Up @@ -82,6 +83,7 @@ class CastPlayer extends BaseRemotePlayer {
_mediaInfoIntervalId: IntervalID;
_adsController: CastAdsController;
_adsManager: CastAdsManager;
_sourceUrl: string;

/**
* Cast Sender Player.
Expand Down Expand Up @@ -656,6 +658,7 @@ class CastPlayer extends BaseRemotePlayer {
this._adsManager = new CastAdsManager(this);
const snapshot = this._remoteControl.getPlayerSnapshot();
this._playerConfig = snapshot.config;
this._sourceUrl = this._remoteControl.getPlayerSelectedSource();
this._remoteSession = new RemoteSession(
this._castSession.getSessionId(),
this._castSession.getCastDevice().friendlyName,
Expand All @@ -665,7 +668,7 @@ class CastPlayer extends BaseRemotePlayer {
this._remoteControl.onRemoteDeviceConnected(payload);
if (this._remoteSession.resuming && !(Env.browser.major >= 73 && Env.os.name === 'Android')) {
// Android Chrome 73 and up gets SESSION_RESUMED also in the initial session
this._resumeSession();
this._resumeSession(snapshot);
} else if (snapshot) {
const loadOptions = this._getLoadOptions(snapshot);
this._loadOrSetMedia(snapshot, loadOptions);
Expand All @@ -688,7 +691,7 @@ class CastPlayer extends BaseRemotePlayer {
if (this._playbackStarted) {
this.dispatchEvent(new FakeEvent(EventType.CHANGE_SOURCE_STARTED));
}
const media = new chrome.cast.media.MediaInfo();
const media = new chrome.cast.media.MediaInfo(this._sourceUrl);
const request = new chrome.cast.media.LoadRequest(media);

if (options) {
Expand Down Expand Up @@ -789,15 +792,25 @@ class CastPlayer extends BaseRemotePlayer {
this._playbackStarted = true;
}

_resumeSession(): void {
_resumeSession(snapshot): void {
this._createReadyPromise();
let counter = 0;
this._mediaInfoIntervalId = setInterval(() => {
counter++;
const mediaSession = this._castSession.getMediaSession();
if (mediaSession && mediaSession.customData) {
clearInterval(this._mediaInfoIntervalId);
this._mediaInfo = mediaSession.customData.mediaInfo;
CastPlayer._logger.debug('Resuming session with media info', this._mediaInfo);
this._onLoadMediaSuccess();
} else if (mediaSession && mediaSession.playerState.toLowerCase() === EventType.PLAYING) {
//there is no customData but it play on screen
clearInterval(this._mediaInfoIntervalId);
this._onLoadMediaSuccess();
} else if (counter >= RESUME_MAX_RETRIES) {
clearInterval(this._mediaInfoIntervalId);
const loadOptions = this._getLoadOptions(snapshot);
this._loadOrSetMedia(snapshot, loadOptions);
}
}, INTERVAL_FREQUENCY);
}
Expand Down Expand Up @@ -951,20 +964,15 @@ class CastPlayer extends BaseRemotePlayer {
_isConnectedHandler = () => {
const snapshot = this._remoteControl.getPlayerSnapshot();
const localEntryId = snapshot.config.sources.id;

if (CastPlayer._castRemotePlayer.isConnected) {
// savedEntryId === localEntryId if this player has started casting and the page was refreshed
const savedEntryId = this._getSessionEntryId(cast.framework.CastContext.getInstance().getCurrentSession());
if (this._hasInitiatedCast() || (savedEntryId && savedEntryId === localEntryId)) {
this._setupRemotePlayer();
}
} else {
// savedEntryId === localEntryId if this player's cast session was stopped by the user
this._isCastInitiator = false;
const savedEntryId = this._getSessionEntryId(this._castSession);
if (savedEntryId && savedEntryId === localEntryId) {
this._setupLocalPlayer();
}
this._setupLocalPlayer();
}
};

Expand All @@ -985,7 +993,7 @@ class CastPlayer extends BaseRemotePlayer {

_getSessionEntryId(castSession: Object) {
if (!castSession) return null;
return Utils.Object.getPropertyPath(castSession.getMediaSession(), 'customData.mediaInfo.entryId');
return Utils.Object.getPropertyPath(castSession.getMediaSession(), 'media.customData.mediaInfo.entryId');
}

_hasInitiatedCast() {
Expand Down
28 changes: 3 additions & 25 deletions src/ui-presets/ads.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,10 @@ function AdsUI(props: any): ?React$Element<any> {
<Components.AdSkip />
</Fragment>
<Fragment>
<Components.TopBar
leftControls={
<Fragment>
<Components.AdNotice />
</Fragment>
}
rightControls={
<Fragment>
<Components.AdLearnMore />
</Fragment>
}
/>
<Components.TopBar leftControls={[Components.AdNotice]} rightControls={[Components.AdLearnMore]} />
<Components.BottomBar
leftControls={
<Fragment>
<Components.PlaybackControls />
<Components.TimeDisplayAdsContainer />
</Fragment>
}
rightControls={
<Fragment>
<Components.VolumeControl />
<Components.CastControl />
<Components.FullscreenControl />
</Fragment>
}
leftControls={[Components.PlaybackControls, Components.TimeDisplayAdsContainer]}
rightControls={[Components.VolumeControl, Components.CastControl, Components.FullscreenControl]}
/>
</Fragment>
</Components.GuiArea>
Expand Down
17 changes: 3 additions & 14 deletions src/ui-presets/live.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,9 @@ class LiveUI extends Component {
</Fragment>
<Fragment>
<Components.BottomBar
leftControls={
<Fragment>
<Components.PlaybackControls />
<Components.LiveTag />
</Fragment>
}
rightControls={
<Fragment>
<Components.VolumeControl />
<Components.LanguageControl />
<Components.CastControl />
<Components.FullscreenControl />
</Fragment>
}>
leftControls={[Components.PlaybackControls, Components.LiveTag]}
//todo:missing component.LanguageControl
rightControls={[Components.VolumeControl, Components.SettingsControl, Components.CastControl, Components.FullscreenControl]}>
<Components.SeekBarLivePlaybackContainer showFramePreview showTimeBubble playerContainer={this.props.playerContainer} />
</Components.BottomBar>
</Fragment>
Expand Down
24 changes: 8 additions & 16 deletions src/ui-presets/playback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,14 @@ class PlaybackUI extends Component {
</Fragment>
<Fragment>
<Components.BottomBar
leftControls={
<Fragment>
<Components.PlaybackControls />
<Components.RewindControl step={10} />
<Components.ForwardControl step={10} />
<Components.TimeDisplayPlaybackContainer format="current / total" />
</Fragment>
}
rightControls={
<Fragment>
<Components.VolumeControl />
<Components.LanguageControl />
<Components.CastControl />
<Components.FullscreenControl />
</Fragment>
}>
leftControls={[
Components.PlaybackControls,
Components.RewindControl,
Components.ForwardControl,
Components.TimeDisplayPlaybackContainer
]}
//todo:missing component.LanguageControl
rightControls={[Components.VolumeControl, Components.SettingsControl, Components.CastControl, Components.FullscreenControl]}>
<Components.SeekBarPlaybackContainer showFramePreview showTimeBubble playerContainer={this.props.playerContainer} />
</Components.BottomBar>
</Fragment>
Expand Down
Loading