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: Do not assume 1080p Cast devices, some are 720p #6562

Merged
merged 2 commits into from
May 9, 2024
Merged

fix: Do not assume 1080p Cast devices, some are 720p #6562

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ba4e64
fix: Do not assume 1080p Cast devices, some are 720p
joeyparrish May 8, 2024
46f99c0
Remove double-spaces
joeyparrish May 8, 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
13 changes: 9 additions & 4 deletions lib/util/platform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,21 +617,26 @@ shaka.util.Platform = class {
const hasCanDisplayType = window.cast && cast.__platform__ &&
cast.__platform__.canDisplayType;

// Most Chromecasts can do 1080p.
maxResolution.width = 1920;
maxResolution.height = 1080;
// Some hub devices can only do 720p. Default to that.
joeyparrish marked this conversation as resolved.
Show resolved Hide resolved
maxResolution.width = 1280;
Copy link

Choose a reason for hiding this comment

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

Just a heads up. The physical resolution of Google Nest Hub is 1024 x 600. But I guess it can play 720p.

Copy link
Member Author

Choose a reason for hiding this comment

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

It can decode 720p, and with the typical encoding ladder people use, you'd hate to have them play 480p instead.

maxResolution.height = 720;

try {
if (hasCanDisplayType && await cast.__platform__.canDisplayType(
Copy link

Choose a reason for hiding this comment

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

nit; Up to your preference, just in case you missed it - you might check the presence of hasCanDisplayType just once.

Copy link
Member Author

Choose a reason for hiding this comment

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

I tried it, but I think the extra layer of if outside the try/catch makes the method overall harder to read and follow. The runtime difference is negligible, so I'm leaving.

'video/mp4; codecs="avc1.640028"; width=3840; height=2160')) {
// The device and display can both do 4k. Assume a 4k limit.
maxResolution.width = 3840;
maxResolution.height = 2160;
} else if (hasCanDisplayType && await cast.__platform__.canDisplayType(
'video/mp4; codecs="avc1.640028"; width=1920; height=1080')) {
// Most Chromecasts can do 1080p.
maxResolution.width = 1920;
maxResolution.height = 1080;
}
} catch (error) {
// This shouldn't generally happen. Log the error.
shaka.log.alwaysError('Failed to check canDisplayType:', error);
// Now ignore the error and let the 1080p default stand.
// Now ignore the error and let the 720p default stand.
}
} else if (Platform.isTizen()) {
maxResolution.width = 1920;
Expand Down
Loading