VideoTrackRecorder: add support for more codecs on construction

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 50 matching lines @@
       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.
   // http://www.webmproject.org/docs/container Sec:"HTML5 Video Type Parameters"
   static const char* const kVideoCodecs[] = { "vp8", "vp9", "opus" };
   static const char* const kAudioCodecs[] = { "opus" };
   const char* const* codecs = video ? &kVideoCodecs[0] : &kAudioCodecs[0];
   int codecs_count =  video ? arraysize(kVideoCodecs) : arraysize(kAudioCodecs);

[emircan, 2016/04/14 22:00:10]

const

[mcasas, 2016/04/14 22:14:56]

Done.

 
   std::vector<std::string> codecs_list;
   media::ParseCodecString(web_codecs.utf8(), &codecs_list, true /* strip */);
   for (const auto& codec : codecs_list) {
     const auto found = std::find_if(
         &codecs[0], &codecs[codecs_count], [&codec](const char* name) {

[emircan, 2016/04/14 22:00:10]

std:end(codecs)?

[mcasas, 2016/04/14 22:14:56]

Compiler complained that can't apply std::end
to a const char*[].

           return base::EqualsCaseInsensitiveASCII(codec, name);
         });
     if (found == &codecs[codecs_count])
       return false;
   }
   return true;
 }
 
 bool MediaRecorderHandler::initialize(
     blink::WebMediaRecorderHandlerClient* client,
@@ skipping 70 matching lines @@
         << "Only recording first video track.";
     const blink::WebMediaStreamTrack& video_track = video_tracks[0];
     if (video_track.isNull())
       return false;
 
     const VideoTrackRecorder::OnEncodedVideoCB on_encoded_video_cb =
         media::BindToCurrentLoop(base::Bind(
             &MediaRecorderHandler::OnEncodedVideo, weak_factory_.GetWeakPtr()));
 
     video_recorders_.push_back(new VideoTrackRecorder(
-        use_vp9_, video_track, on_encoded_video_cb, video_bits_per_second_));
+        use_vp9_ ? VideoTrackRecorder::CodecId::VP9
+                 : VideoTrackRecorder::CodecId::VP8,
+        video_track, on_encoded_video_cb, video_bits_per_second_));
   }
 
   if (use_audio_tracks) {
     // TODO(ajose): The muxer API supports only one audio track. Extend it to
     // several tracks.
     LOG_IF(WARNING, audio_tracks.size() > 1u)
         << "Recording multiple audio"
         << " tracks is not implemented.  Only recording first audio track.";
     const blink::WebMediaStreamTrack& audio_track = audio_tracks[0];
     if (audio_track.isNull())
@@ skipping 95 matching lines @@
     recorder->OnData(audio_bus, timestamp);
 }
 
 void MediaRecorderHandler::SetAudioFormatForTesting(
     const media::AudioParameters& params) {
   for (auto* recorder : audio_recorders_)
     recorder->OnSetFormat(params);
 }
 
 }  // namespace content