Skip to content

Commit 2fa99f5

Browse files
authored
Validate param values before reading them (youtube#5550)
There were no-op calls to ValidateBool/StringParamers. This PR make those method calls actually used. b/413418478
1 parent 80ab94f commit 2fa99f5

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

starboard/android/shared/player_components_factory.h

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -543,20 +543,21 @@ class PlayerComponentsFactory : public starboard::shared::starboard::player::
543543
// Use mime param to determine endianness of HDR metadata. If param is
544544
// missing or invalid it defaults to Little Endian.
545545
MimeType video_mime_type(creation_parameters.video_mime());
546-
video_mime_type.ValidateStringParameter("hdrinfoendianness",
547-
"big|little");
548-
const std::string& hdr_info_endianness =
549-
video_mime_type.GetParamStringValue("hdrinfoendianness",
550-
/*default=*/"little");
551-
force_big_endian_hdr_metadata = hdr_info_endianness == "big";
552-
553-
video_mime_type.ValidateBoolParameter("enableflushduringseek");
554-
enable_flush_during_seek =
555-
video_mime_type.GetParamBoolValue("enableflushduringseek", false);
556-
557-
video_mime_type.ValidateBoolParameter("forceresetsurface");
558-
force_reset_surface =
559-
video_mime_type.GetParamBoolValue("forceresetsurface", true);
546+
if (video_mime_type.ValidateStringParameter("hdrinfoendianness",
547+
"big|little")) {
548+
const std::string& hdr_info_endianness =
549+
video_mime_type.GetParamStringValue("hdrinfoendianness",
550+
/*default=*/"little");
551+
force_big_endian_hdr_metadata = hdr_info_endianness == "big";
552+
}
553+
if (video_mime_type.ValidateBoolParameter("enableflushduringseek")) {
554+
enable_flush_during_seek =
555+
video_mime_type.GetParamBoolValue("enableflushduringseek", false);
556+
}
557+
if (video_mime_type.ValidateBoolParameter("forceresetsurface")) {
558+
force_reset_surface =
559+
video_mime_type.GetParamBoolValue("forceresetsurface", true);
560+
}
560561
}
561562
if (kForceFlushDecoderDuringReset && !enable_flush_during_seek) {
562563
SB_LOG(INFO)

0 commit comments

Comments
 (0)