Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc

Issue 2474993002: Pass selected cricket::VideoCodec down to internal H264 encoder (Closed)
Patch Set: Fix. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 bool error_concealment_on_; 146 bool error_concealment_on_;
147 bool denoising_on_; 147 bool denoising_on_;
148 bool frame_dropper_on_; 148 bool frame_dropper_on_;
149 bool spatial_resize_on_; 149 bool spatial_resize_on_;
150 150
151 VideoProcessorIntegrationTest() {} 151 VideoProcessorIntegrationTest() {}
152 virtual ~VideoProcessorIntegrationTest() {} 152 virtual ~VideoProcessorIntegrationTest() {}
153 153
154 void SetUpCodecConfig() { 154 void SetUpCodecConfig() {
155 if (codec_type_ == kVideoCodecH264) { 155 if (codec_type_ == kVideoCodecH264) {
156 encoder_ = H264Encoder::Create(); 156 encoder_ = H264Encoder::Create(cricket::VideoCodec("H264"));
157 decoder_ = H264Decoder::Create(); 157 decoder_ = H264Decoder::Create();
158 VideoCodingModule::Codec(kVideoCodecH264, &codec_settings_); 158 VideoCodingModule::Codec(kVideoCodecH264, &codec_settings_);
159 } else if (codec_type_ == kVideoCodecVP8) { 159 } else if (codec_type_ == kVideoCodecVP8) {
160 encoder_ = VP8Encoder::Create(); 160 encoder_ = VP8Encoder::Create();
161 decoder_ = VP8Decoder::Create(); 161 decoder_ = VP8Decoder::Create();
162 VideoCodingModule::Codec(kVideoCodecVP8, &codec_settings_); 162 VideoCodingModule::Codec(kVideoCodecVP8, &codec_settings_);
163 } else if (codec_type_ == kVideoCodecVP9) { 163 } else if (codec_type_ == kVideoCodecVP9) {
164 encoder_ = VP9Encoder::Create(); 164 encoder_ = VP9Encoder::Create();
165 decoder_ = VP9Decoder::Create(); 165 decoder_ = VP9Decoder::Create();
166 VideoCodingModule::Codec(kVideoCodecVP9, &codec_settings_); 166 VideoCodingModule::Codec(kVideoCodecVP9, &codec_settings_);
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after
999 QualityMetrics quality_metrics; 999 QualityMetrics quality_metrics;
1000 SetQualityMetrics(&quality_metrics, 32.5, 30.0, 0.85, 0.80); 1000 SetQualityMetrics(&quality_metrics, 32.5, 30.0, 0.85, 0.80);
1001 // Metrics for rate control. 1001 // Metrics for rate control.
1002 RateControlMetrics rc_metrics[2]; 1002 RateControlMetrics rc_metrics[2];
1003 SetRateControlMetrics(rc_metrics, 0, 0, 20, 30, 10, 10, 0, 1); 1003 SetRateControlMetrics(rc_metrics, 0, 0, 20, 30, 10, 10, 0, 1);
1004 SetRateControlMetrics(rc_metrics, 1, 0, 0, 30, 15, 10, 0, 0); 1004 SetRateControlMetrics(rc_metrics, 1, 0, 0, 30, 15, 10, 0, 0);
1005 ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, 1005 ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
1006 rc_metrics); 1006 rc_metrics);
1007 } 1007 }
1008 } // namespace webrtc 1008 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698