commit b9f5453e2997253addb87706a43b4484e1139972
author stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Jul 04 12:42:07 2014
committer stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Jul 04 12:42:07 2014
tree 2abdbaaac6314f6344eb3d9b1a407e5f9fe0501e
parent d8440f7c4540a91e4030cd160d391ca4d4bc5f55

Add boilerplate code for H.264.

R=mflodman@webrtc.org, niklas.enbom@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6603 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/test/encoder_settings.cc

diff --git a/webrtc/test/encoder_settings.cc b/webrtc/test/encoder_settings.cc
index 5193be6..9842d1e 100644
--- a/webrtc/test/encoder_settings.cc
+++ b/webrtc/test/encoder_settings.cc
@@ -59,9 +59,13 @@
 
   codec.plType = encoder_settings.payload_type;
   strcpy(codec.plName, encoder_settings.payload_name.c_str());
-  codec.codecType =
-      (encoder_settings.payload_name == "VP8" ? kVideoCodecVP8
-                                              : kVideoCodecGeneric);
+  if (encoder_settings.payload_name == "VP8") {
+    codec.codecType = kVideoCodecVP8;
+  } else if (encoder_settings.payload_name == "H264") {
+    codec.codecType = kVideoCodecH264;
+  } else {
+    codec.codecType = kVideoCodecGeneric;
+  }
 
   if (codec.codecType == kVideoCodecVP8) {
     codec.codecSpecific.VP8.resilience = kResilientStream;
@@ -73,6 +77,12 @@
     codec.codecSpecific.VP8.keyFrameInterval = 3000;
   }
 
+  if (codec.codecType == kVideoCodecH264) {
+    codec.codecSpecific.H264.profile = kProfileBase;
+    codec.codecSpecific.H264.frameDroppingOn = true;
+    codec.codecSpecific.H264.keyFrameInterval = 3000;
+  }
+
   codec.width = 320;
   codec.height = 180;
   codec.startBitrate = codec.minBitrate = codec.maxBitrate = 300;