MediaRecorder (cleanup): support mime type video/x-matroska and codec=avc1 to the list

content/renderer/media/media_recorder_handler.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/media_recorder_handler.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 56 matching lines @@
 bool MediaRecorderHandler::canSupportMimeType(
     const blink::WebString& web_type,
     const blink::WebString& web_codecs) {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   // An empty |web_type| means MediaRecorderHandler can choose its preferred
   // codecs.
   if (web_type.isEmpty())
     return true;
 
   const std::string type(web_type.utf8());
-  const bool video = base::EqualsCaseInsensitiveASCII(type, "video/webm");
+  const bool video = base::EqualsCaseInsensitiveASCII(type, "video/webm") ||
+                     base::EqualsCaseInsensitiveASCII(type, "video/x-matroska");
   const bool audio =
       video ? false : base::EqualsCaseInsensitiveASCII(type, "audio/webm");
   if (!video && !audio)
     return false;
 
   // Both |video| and |audio| support empty |codecs|; |type| == "video" supports
-  // vp8, vp9 or opus; |type| = "audio", supports only opus.
+  // vp8, vp9, h264 and avc1 or opus; |type| = "audio", supports only opus.
   // http://www.webmproject.org/docs/container Sec:"HTML5 Video Type Parameters"
-  static const char* const kVideoCodecs[] = { "vp8", "vp9", "h264", "opus" };
+  static const char* const kVideoCodecs[] = {"vp8", "vp9", "h264", "avc1",
+                                             "opus"};
   static const char* const kAudioCodecs[] = { "opus" };
   const char* const* codecs = video ? &kVideoCodecs[0] : &kAudioCodecs[0];
   const int codecs_count =
       video ? arraysize(kVideoCodecs) : arraysize(kAudioCodecs);
 
   std::vector<std::string> codecs_list;
   media::ParseCodecString(web_codecs.utf8(), &codecs_list, true /* strip */);
   for (const auto& codec : codecs_list) {
     auto* const* found = std::find_if(
         &codecs[0], &codecs[codecs_count], [&codec](const char* name) {
@@ skipping 25 matching lines @@
 
   // Once established that we support the codec(s), hunt then individually.
   const std::string& codecs_str = ToLowerASCII(codecs.utf8());
   if (codecs_str.find("vp8") != std::string::npos)
     codec_id_ = VideoTrackRecorder::CodecId::VP8;
   else if (codecs_str.find("vp9") != std::string::npos)
     codec_id_ = VideoTrackRecorder::CodecId::VP9;
 #if BUILDFLAG(RTC_USE_H264)
   else if (codecs_str.find("h264") != std::string::npos)
     codec_id_ = VideoTrackRecorder::CodecId::H264;
+  else if (codecs_str.find("avc1") != std::string::npos)
+    codec_id_ = VideoTrackRecorder::CodecId::H264;
 #endif
 
   media_stream_ = media_stream;
   DCHECK(client);
   client_ = client;
 
   audio_bits_per_second_ = audio_bits_per_second;
   video_bits_per_second_ = video_bits_per_second;
   return true;
 }
@@ skipping 161 matching lines @@
     recorder->OnData(audio_bus, timestamp);
 }
 
 void MediaRecorderHandler::SetAudioFormatForTesting(
     const media::AudioParameters& params) {
   for (const auto& recorder : audio_recorders_)
     recorder->OnSetFormat(params);
 }
 
 }  // namespace content