Skip to content

Commit

Permalink
Cleanup mime attribute of decoder_cache_ttl_ms (#1537)
Browse files Browse the repository at this point in the history
Remove this attribute as it is not used.

b/216483296

(cherry picked from commit b9e3d41)
  • Loading branch information
borongc authored and anonymous1-me committed Mar 18, 2024
1 parent f251587 commit 1d613b9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions starboard/android/shared/media_is_video_supported.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,11 @@ bool SbMediaIsVideoSupported(SbMediaVideoCodec video_codec,
// can play decode-to-texture video just as well as normal video.

bool must_support_tunnel_mode = false;
<<<<<<< HEAD
bool force_improved_support_check = true;
int decoder_cache_ttl_ms = -1;
=======
>>>>>>> b9e3d41f0b1 (Cleanup mime attribute of decoder_cache_ttl_ms (#1537))
if (mime_type) {
if (!mime_type->is_valid()) {
return false;
Expand Down Expand Up @@ -80,9 +83,6 @@ bool SbMediaIsVideoSupported(SbMediaVideoCodec video_codec,
force_improved_support_check =
mime_type->GetParamBoolValue("forceimprovedsupportcheck", true);

decoder_cache_ttl_ms =
mime_type->GetParamIntValue("decoder_cache_ttl_ms", -1);

// Disable MediaCapabilitiesCache if "disablecache" option presented.
if (!mime_type->ValidateBoolParameter("disablecache")) {
return false;
Expand Down

0 comments on commit 1d613b9

Please sign in to comment.