Skip to content

Cast: Start a session when a Cast route is selected #3567

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

Open
peterhel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Cast: Start a session when a Cast route is selected #3567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 additions & 0 deletions ...rk/core/src/main/java/com/google/android/gms/cast/framework/internal/CastContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import androidx.mediarouter.media.MediaControlIntent;
import androidx.mediarouter.media.MediaRouteSelector;
import androidx.mediarouter.media.MediaRouter;

import com.google.android.gms.cast.CastMediaControlIntent;
import com.google.android.gms.cast.framework.CastOptions;
Expand Down Expand Up @@ -64,13 +65,38 @@ public CastContextImpl(IObjectWrapper context, CastOptions options, IMediaRouter
String defaultCategory = CastMediaControlIntent.categoryForCast(receiverApplicationId);

this.defaultSessionProvider = this.sessionProviders.get(defaultCategory);
if (this.defaultSessionProvider == null) {
// The provider map can be keyed by the full control category, which carries extra
// namespace/flag suffixes (e.g. ".../CC1AD845///ALLOW_IPV6"), rather than the bare
// categoryForCast(appId). Fall back to matching by category prefix.
for (Map.Entry<String, ISessionProvider> entry : this.sessionProviders.entrySet()) {
if (entry.getKey() != null && entry.getKey().startsWith(defaultCategory)) {
this.defaultSessionProvider = entry.getValue();
break;
}
}
}

// TODO: This should incorporate passed options
this.mergedSelector = new MediaRouteSelector.Builder()
.addControlCategory(MediaControlIntent.CATEGORY_LIVE_VIDEO)
.addControlCategory(MediaControlIntent.CATEGORY_REMOTE_PLAYBACK)
.addControlCategory(defaultCategory)
.build();

// Observe route selection so that choosing a Cast route actually starts a session.
// This goes through the app's MediaRouterProxy (IMediaRouter), which runs androidx
// MediaRouter in the app process; touching MediaRouter directly from the dynamite would
// fail with a Resources$NotFoundException. On selection the app invokes
// MediaRouterCallbackImpl.onRouteSelected(), which starts the session.
try {
this.router.registerMediaRouterCallbackImpl(this.mergedSelector.asBundle(),
new MediaRouterCallbackImpl(this));
this.router.addCallback(this.mergedSelector.asBundle(),
MediaRouter.CALLBACK_FLAG_REQUEST_DISCOVERY);
} catch (RemoteException e) {
Log.w(TAG, "Failed to register media router callback: " + e.getMessage());
}
}

@Override
Expand Down
16 changes: 11 additions & 5 deletions ...src/main/java/com/google/android/gms/cast/framework/internal/MediaRouterCallbackImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,18 @@ public void onRouteRemoved(String routeId, Bundle extras) {
@Override
public void onRouteSelected(String routeId, Bundle extras) throws RemoteException {
CastDevice castDevice = CastDevice.getFromBundle(extras);

SessionImpl session = (SessionImpl) ObjectWrapper.unwrap(this.castContext.defaultSessionProvider.getSession(null));
Bundle routeInfoExtras = this.castContext.getRouter().getRouteInfoExtrasById(routeId);
if (routeInfoExtras != null) {
session.start(this.castContext, castDevice, routeId, routeInfoExtras);
if (this.castContext.defaultSessionProvider == null) {
Log.w(TAG, "No session provider for selected route " + routeId + "; cannot start session");
return;
}
Object session = ObjectWrapper.unwrap(this.castContext.defaultSessionProvider.getSession(null));
if (!(session instanceof SessionImpl)) {
Log.w(TAG, "Session provider did not yield a SessionImpl for route " + routeId);
return;
}
Bundle routeInfoExtras = this.castContext.getRouter().getRouteInfoExtrasById(routeId);
((SessionImpl) session).start(this.castContext, castDevice, routeId,
routeInfoExtras != null ? routeInfoExtras : extras);
}
@Override
public void unknown(String routeId, Bundle extras) {
Expand Down