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

Side by Side Diff: webrtc/video/video_quality_test.cc

Issue 2391963002: Rename FecConfig to UlpfecConfig in config.h. (Closed)
Patch Set: Rebase. Created 4 years, 2 months 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
« no previous file with comments | « webrtc/video/send_statistics_proxy_unittest.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 #include "webrtc/video/video_quality_test.h" 10 #include "webrtc/video/video_quality_test.h"
(...skipping 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after
1286 1286
1287 video_send_config_.pre_encode_callback = local_preview.get(); 1287 video_send_config_.pre_encode_callback = local_preview.get();
1288 video_receive_configs_[stream_id].renderer = loopback_video.get(); 1288 video_receive_configs_[stream_id].renderer = loopback_video.get();
1289 if (params_.audio && params_.audio_video_sync) 1289 if (params_.audio && params_.audio_video_sync)
1290 video_receive_configs_[stream_id].sync_group = kSyncGroup; 1290 video_receive_configs_[stream_id].sync_group = kSyncGroup;
1291 1291
1292 video_send_config_.suspend_below_min_bitrate = 1292 video_send_config_.suspend_below_min_bitrate =
1293 params_.common.suspend_below_min_bitrate; 1293 params_.common.suspend_below_min_bitrate;
1294 1294
1295 if (params.common.fec) { 1295 if (params.common.fec) {
1296 video_send_config_.rtp.fec.red_payload_type = kRedPayloadType; 1296 video_send_config_.rtp.ulpfec.red_payload_type = kRedPayloadType;
1297 video_send_config_.rtp.fec.ulpfec_payload_type = kUlpfecPayloadType; 1297 video_send_config_.rtp.ulpfec.ulpfec_payload_type = kUlpfecPayloadType;
1298 video_receive_configs_[stream_id].rtp.fec.red_payload_type = 1298 video_receive_configs_[stream_id].rtp.ulpfec.red_payload_type =
1299 kRedPayloadType; 1299 kRedPayloadType;
1300 video_receive_configs_[stream_id].rtp.fec.ulpfec_payload_type = 1300 video_receive_configs_[stream_id].rtp.ulpfec.ulpfec_payload_type =
1301 kUlpfecPayloadType; 1301 kUlpfecPayloadType;
1302 } 1302 }
1303 1303
1304 if (params_.screenshare.enabled) 1304 if (params_.screenshare.enabled)
1305 SetupScreenshare(); 1305 SetupScreenshare();
1306 1306
1307 video_send_stream_ = call->CreateVideoSendStream( 1307 video_send_stream_ = call->CreateVideoSendStream(
1308 video_send_config_.Copy(), video_encoder_config_.Copy()); 1308 video_send_config_.Copy(), video_encoder_config_.Copy());
1309 VideoReceiveStream* video_receive_stream = 1309 VideoReceiveStream* video_receive_stream =
1310 call->CreateVideoReceiveStream(video_receive_configs_[stream_id].Copy()); 1310 call->CreateVideoReceiveStream(video_receive_configs_[stream_id].Copy());
1311 CreateCapturer(); 1311 CreateCapturer();
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 std::ostringstream str; 1416 std::ostringstream str;
1417 str << receive_logs_++; 1417 str << receive_logs_++;
1418 std::string path = 1418 std::string path =
1419 params_.common.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; 1419 params_.common.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
1420 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), 1420 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
1421 10000000); 1421 10000000);
1422 } 1422 }
1423 } 1423 }
1424 1424
1425 } // namespace webrtc 1425 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/send_statistics_proxy_unittest.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698