Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / test / encoder_settings.cc

diff --git a/src/third_party/webrtc/test/encoder_settings.cc b/src/third_party/webrtc/test/encoder_settings.cc
index 9842d1e..0eeb0b9 100644 (file)
--- a/src/third_party/webrtc/test/encoder_settings.cc
+++ b/src/third_party/webrtc/test/encoder_settings.cc
@@ -12,6 +12,7 @@
 #include <assert.h>
 #include <string.h>
 
+#include "webrtc/video_encoder.h"
 #include "webrtc/video_engine/vie_defines.h"
 
 namespace webrtc {
@@ -68,19 +69,9 @@ VideoCodec CreateDecoderVideoCodec(
   }
 
   if (codec.codecType == kVideoCodecVP8) {
-    codec.codecSpecific.VP8.resilience = kResilientStream;
-    codec.codecSpecific.VP8.numberOfTemporalLayers = 1;
-    codec.codecSpecific.VP8.denoisingOn = true;
-    codec.codecSpecific.VP8.errorConcealmentOn = false;
-    codec.codecSpecific.VP8.automaticResizeOn = false;
-    codec.codecSpecific.VP8.frameDroppingOn = true;
-    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.codecSpecific.VP8 = VideoEncoder::GetDefaultVp8Settings();
+  } else if (codec.codecType == kVideoCodecH264) {
+    codec.codecSpecific.H264 = VideoEncoder::GetDefaultH264Settings();
   }
 
   codec.width = 320;