Set correct encoder-specific settings for vpx in the new API.

Also, make VideoEncoderConfig::ContentType an enum class.

BUG=4569
R=mflodman@webrtc.org, pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/46069004

Cr-Commit-Position: refs/heads/master@{#9093}

1 files changed, 5 insertions, 4 deletions

diff --git a/webrtc/config.cc b/webrtc/config.cc
index 7b75a68de8..7dfecd1507 100644
--- a/webrtc/config.cc
+++ b/webrtc/config.cc
@@ -63,9 +63,10 @@ std::string VideoStream::ToString() const {
 }
 
 VideoEncoderConfig::VideoEncoderConfig()
-    : content_type(kRealtimeVideo),
+    : content_type(ContentType::kRealtimeVideo),
       encoder_specific_settings(NULL),
-      min_transmit_bitrate_bps(0) {}
+      min_transmit_bitrate_bps(0) {
+}
 
 VideoEncoderConfig::~VideoEncoderConfig() = default;
 
@@ -81,10 +82,10 @@ std::string VideoEncoderConfig::ToString() const {
   ss << ']';
   ss << ", content_type: ";
   switch (content_type) {
-    case kRealtimeVideo:
+    case ContentType::kRealtimeVideo:
       ss << "kRealtimeVideo";
       break;
-    case kScreenshare:
+    case ContentType::kScreen:
       ss << "kScreenshare";
       break;
   }