Disable progressive playback support by default

media/base/media_switches.cc

@@ -481,6 +481,13 @@ const base::FeatureParam<int> kDecreaseProcessingAudioFifoSizeValue{
 
 #endif
 
+#if BUILDFLAG(USE_STARBOARD_MEDIA)
+// When set, Cobalt rejects progressive video formats.
+BASE_FEATURE(kCobaltProgressivePlayback,
+             "CobaltProgressivePlayback",
+             base::FEATURE_ENABLED_BY_DEFAULT);
+#endif  // BUILDFLAG(USE_STARBOARD_MEDIA)
+
 #if BUILDFLAG(IS_CHROMEOS)
 // To control running audio communication effect on Chrome OS Audio Server.
 BASE_FEATURE(kCrOSSystemAEC,

media/base/media_switches.h

@@ -176,6 +176,9 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kDecreaseProcessingAudioFifoSize);
 MEDIA_EXPORT extern const base::FeatureParam<int>
     kDecreaseProcessingAudioFifoSizeValue;
 #endif
+#if BUILDFLAG(USE_STARBOARD_MEDIA)
+MEDIA_EXPORT BASE_DECLARE_FEATURE(kCobaltProgressivePlayback);
+#endif  // BUILDFLAG(USE_STARBOARD_MEDIA)
 #if BUILDFLAG(IS_CHROMEOS)
 MEDIA_EXPORT BASE_DECLARE_FEATURE(kCrOSSystemAEC);
 MEDIA_EXPORT BASE_DECLARE_FEATURE(kCrOSSystemAECDeactivatedGroups);

media/filters/demuxer_manager.cc

@@ -26,7 +26,10 @@
 #endif  // BUILDFLAG(ENABLE_HLS_DEMUXER)
 
 #if BUILDFLAG(ENABLE_FFMPEG)
-// ProgressiveDemuxer is enabled when use_starboard_media=true and media_use_ffmpeg=false.
+// The ProgressiveDemuxer is enabled when use_starboard_media=true and
+// media_use_ffmpeg=false. This can be overridden by the BASE_FEATURE
+// CobaltProgressivePlayback, which will disable the ProgressiveDemuxer
+// when false.
 #elif BUILDFLAG(USE_STARBOARD_MEDIA)
 #include "media/starboard/progressive/demuxer_extension_wrapper.h"  // nogncheck
 #include "media/starboard/progressive/progressive_demuxer.h"  // nogncheck
@@ -417,7 +420,11 @@ PipelineStatus DemuxerManager::CreateDemuxer(
 #if BUILDFLAG(ENABLE_FFMPEG)
     SetDemuxer(CreateFFmpegDemuxer());
 #elif BUILDFLAG(USE_STARBOARD_MEDIA)
-    SetDemuxer(CreateProgressiveDemuxer());
+    if (base::FeatureList::IsEnabled(media::kCobaltProgressivePlayback)) {
+      SetDemuxer(CreateProgressiveDemuxer());
+    } else {
+      LOG(INFO) << "Cobalt progressive playback is disabled via base features.";
+    }
 #else
     return DEMUXER_ERROR_COULD_NOT_OPEN;
 #endif

third_party/blink/renderer/core/html/media/html_media_element.cc

@@ -405,26 +405,51 @@ std::ostream& operator<<(std::ostream& stream,
   return stream << static_cast<void const*>(&media_element);
 }
 
+#if BUILDFLAG(USE_STARBOARD_MEDIA)
+// Checks for progressive formats served by the YouTube H5 player.
+// These formats have a mime type of "video/mp4", and lists both audio and
+// video formats under the "codecs" parameter.
+bool IsProgressiveFormat(const ContentType& content_type) {
+  String type = content_type.GetType();
+  String codecs = content_type.Parameter("codecs");
+  if (!type.empty() && !codecs.empty()) {
+    Vector<String> split_codecs;
+    String separator(", ");
+    codecs.Split(separator, split_codecs);
+    return type.Utf8() == "video/mp4" && split_codecs.size() == 2;
+  }
+  return false;
+}
+#endif  // BUILDFLAG(USE_STARBOARD_MEDIA)
+
 }  // anonymous namespace
 
 // static
 MIMETypeRegistry::SupportsType HTMLMediaElement::GetSupportsType(
     const ContentType& content_type) {
 #if BUILDFLAG(USE_STARBOARD_MEDIA)
   // Interupt Chromium's IsTypeSupported() from here for better performance.
-  SbMediaSupportType support_type =
-      SbMediaCanPlayMimeAndKeySystem(content_type.Raw().Ascii().c_str(), "");
   MIMETypeRegistry::SupportsType result;
-  switch (support_type) {
-    case kSbMediaSupportTypeNotSupported:
-      result = MIMETypeRegistry::kNotSupported;
-      break;
-    case kSbMediaSupportTypeMaybe:
-      result = MIMETypeRegistry::kMaybeSupported;
-      break;
-    case kSbMediaSupportTypeProbably:
-      result = MIMETypeRegistry::kSupported;
-      break;
+  if (!base::FeatureList::IsEnabled(media::kCobaltProgressivePlayback) &&
+      IsProgressiveFormat(content_type)) {
+    LOG(INFO) << "Content type \'" << content_type.Raw()
+              << "\' is unsupported as Cobalt progressive playback is disabled "
+                 "via base features.";
+    result = MIMETypeRegistry::kNotSupported;
+  } else {
+    SbMediaSupportType support_type =
+        SbMediaCanPlayMimeAndKeySystem(content_type.Raw().Ascii().c_str(), "");
+    switch (support_type) {
+      case kSbMediaSupportTypeNotSupported:
+        result = MIMETypeRegistry::kNotSupported;
+        break;
+      case kSbMediaSupportTypeMaybe:
+        result = MIMETypeRegistry::kMaybeSupported;
+        break;
+      case kSbMediaSupportTypeProbably:
+        result = MIMETypeRegistry::kSupported;
+        break;
+    }
   }
   LOG(INFO) << __func__ << "(" << content_type.Raw() << ") -> " << result;
   return result;