RtcVideoEncoder: determine video codec profile at InitEncode time.

content/renderer/media/rtc_video_encoder_factory.cc

 // Copyright 2013 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/rtc_video_encoder_factory.h"
 
 #include "base/command_line.h"
 #include "content/common/gpu/client/gpu_video_encode_accelerator_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/media/rtc_video_encoder.h"
@@ skipping 26 matching lines @@
     if (cmd_line->HasSwitch(switches::kEnableWebRtcHWH264Encoding)) {
       codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec(
           webrtc::kVideoCodecH264, "H264", width, height, fps));
     }
     // TODO(hshi): remove the generic codec type after CASTv1 deprecation.
     codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec(
         webrtc::kVideoCodecGeneric, "CAST1", width, height, fps));
   }
 }
 
-// Translate from cricket::WebRtcVideoEncoderFactory::VideoCodec to
-// media::VideoCodecProfile.  Pick a default profile for each codec type.
-media::VideoCodecProfile WebRTCCodecToVideoCodecProfile(
-    webrtc::VideoCodecType type) {
-  switch (type) {
-    case webrtc::kVideoCodecVP8:
-      return media::VP8PROFILE_ANY;
-    case webrtc::kVideoCodecH264:
-    case webrtc::kVideoCodecGeneric:
-      return media::H264PROFILE_MAIN;
-    default:
-      return media::VIDEO_CODEC_PROFILE_UNKNOWN;
-  }
-}
-
 }  // anonymous namespace
 
 RTCVideoEncoderFactory::RTCVideoEncoderFactory(
     const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories)
     : gpu_factories_(gpu_factories) {
   std::vector<media::VideoEncodeAccelerator::SupportedProfile> profiles =
       gpu_factories_->GetVideoEncodeAcceleratorSupportedProfiles();
   for (size_t i = 0; i < profiles.size(); ++i)
     VEAToWebRTCCodecs(&codecs_, profiles[i]);
 }
 
 RTCVideoEncoderFactory::~RTCVideoEncoderFactory() {}
 
+// Translate from webrtc::VideoCodecType and webrtc::VideoCodec to
+// media::VideoCodecProfile.
+// static
+media::VideoCodecProfile RTCVideoEncoderFactory::GetCodecProfile(
+    webrtc::VideoCodecType type, const webrtc::VideoCodec* codec_settings) {
+  DCHECK_EQ(type, codec_settings->codecType);
+  switch (type) {
+    case webrtc::kVideoCodecVP8:
+      return media::VP8PROFILE_ANY;
+    case webrtc::kVideoCodecH264: {
+      switch (codec_settings->codecSpecific.H264.profile) {
+        case webrtc::kProfileBase:
+          return media::H264PROFILE_BASELINE;
+        case webrtc::kProfileMain:
+          return media::H264PROFILE_MAIN;
+        default:

[Pawel Osciak, 2014/10/25 01:23:04]

There are only two cases and we are handling both. Perhaps removing the default
case would be better, letting the compiler warn/error out if there is ever a new
enum value added in the future, so that whoever adds it will have to update this
too?

[hshi1, 2014/10/25 01:36:51]

Done.

+          NOTREACHED() << "Unrecognized H264 video codec profile";
+          return media::VIDEO_CODEC_PROFILE_UNKNOWN;
+      }
+    }
+    case webrtc::kVideoCodecGeneric:
+      return media::H264PROFILE_MAIN;
+    default:
+      NOTREACHED() << "Unrecognized video codec type";
+      return media::VIDEO_CODEC_PROFILE_UNKNOWN;
+  }
+}
+
 webrtc::VideoEncoder* RTCVideoEncoderFactory::CreateVideoEncoder(
     webrtc::VideoCodecType type) {
   bool found = false;
   for (size_t i = 0; i < codecs_.size(); ++i) {
     if (codecs_[i].type == type) {
       found = true;
       break;
     }
   }
   if (!found)
     return NULL;
-  return new RTCVideoEncoder(
-      type, WebRTCCodecToVideoCodecProfile(type), gpu_factories_);
+  return new RTCVideoEncoder(type, gpu_factories_);
 }
 
 const std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec>&
 RTCVideoEncoderFactory::codecs() const {
   return codecs_;
 }
 
 void RTCVideoEncoderFactory::DestroyVideoEncoder(
     webrtc::VideoEncoder* encoder) {
   delete encoder;
 }
 
 }  // namespace content