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

Cherry pick PR #2892: [android] Fix PlayerComponentsTest and SbPlayerTest failures #2931

Merged
merged 1 commit into from
Apr 13, 2024
Merged

Cherry pick PR #2892: [android] Fix PlayerComponentsTest and SbPlayerTest failures #2931

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
6 changes: 4 additions & 2 deletions starboard/android/shared/player_components_factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ class PlayerComponentsFactory : public starboard::shared::starboard::player::
}

bool enable_flush_during_seek = false;
if (!creation_parameters.video_mime().empty()) {
if (creation_parameters.video_codec() != kSbMediaVideoCodecNone &&
!creation_parameters.video_mime().empty()) {
MimeType video_mime_type(creation_parameters.video_mime());
if (video_mime_type.ValidateBoolParameter("enableflushduringseek")) {
enable_flush_during_seek =
Expand Down Expand Up @@ -511,7 +512,8 @@ class PlayerComponentsFactory : public starboard::shared::starboard::player::
std::string* error_message) {
bool force_big_endian_hdr_metadata = false;
bool enable_flush_during_seek = false;
if (!creation_parameters.video_mime().empty()) {
if (creation_parameters.video_codec() != kSbMediaVideoCodecNone &&
!creation_parameters.video_mime().empty()) {
// Use mime param to determine endianness of HDR metadata. If param is
// missing or invalid it defaults to Little Endian.
MimeType video_mime_type(creation_parameters.video_mime());
Expand Down
Loading