OLD | NEW |
---|---|
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 1413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1424 // Add extension to enable audio send side BWE, and allow audio bit rate | 1424 // Add extension to enable audio send side BWE, and allow audio bit rate |
1425 // adaptation. | 1425 // adaptation. |
1426 audio_send_config_.rtp.extensions.clear(); | 1426 audio_send_config_.rtp.extensions.clear(); |
1427 if (params_.call.send_side_bwe) { | 1427 if (params_.call.send_side_bwe) { |
1428 audio_send_config_.rtp.extensions.push_back( | 1428 audio_send_config_.rtp.extensions.push_back( |
1429 webrtc::RtpExtension(webrtc::RtpExtension::kTransportSequenceNumberUri, | 1429 webrtc::RtpExtension(webrtc::RtpExtension::kTransportSequenceNumberUri, |
1430 test::kTransportSequenceNumberExtensionId)); | 1430 test::kTransportSequenceNumberExtensionId)); |
1431 audio_send_config_.min_bitrate_bps = kOpusMinBitrateBps; | 1431 audio_send_config_.min_bitrate_bps = kOpusMinBitrateBps; |
1432 audio_send_config_.max_bitrate_bps = kOpusBitrateFbBps; | 1432 audio_send_config_.max_bitrate_bps = kOpusBitrateFbBps; |
1433 } | 1433 } |
1434 audio_send_config_.send_codec_spec.codec_inst = | 1434 audio_send_config_.send_codec_spec.payload_type = 120; |
1435 CodecInst{120, "OPUS", 48000, 960, 2, 64000}; | 1435 // TODO(ossu): "Add stereo here?" |
kwiberg-webrtc
2017/02/21 23:35:03
Presumably yes---the "2" in the CodecInst in the o
| |
1436 audio_send_config_.send_codec_spec.format.format = {"OPUS", 48000, 2}; | |
1436 | 1437 |
1437 audio_send_stream_ = call->CreateAudioSendStream(audio_send_config_); | 1438 audio_send_stream_ = call->CreateAudioSendStream(audio_send_config_); |
1438 | 1439 |
1439 AudioReceiveStream::Config audio_config; | 1440 AudioReceiveStream::Config audio_config; |
1440 audio_config.rtp.local_ssrc = kReceiverLocalAudioSsrc; | 1441 audio_config.rtp.local_ssrc = kReceiverLocalAudioSsrc; |
1441 audio_config.rtcp_send_transport = transport; | 1442 audio_config.rtcp_send_transport = transport; |
1442 audio_config.voe_channel_id = receive_channel_id; | 1443 audio_config.voe_channel_id = receive_channel_id; |
1443 audio_config.rtp.remote_ssrc = audio_send_config_.rtp.ssrc; | 1444 audio_config.rtp.remote_ssrc = audio_send_config_.rtp.ssrc; |
1444 audio_config.rtp.transport_cc = params_.call.send_side_bwe; | 1445 audio_config.rtp.transport_cc = params_.call.send_side_bwe; |
1445 audio_config.rtp.extensions = audio_send_config_.rtp.extensions; | 1446 audio_config.rtp.extensions = audio_send_config_.rtp.extensions; |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1604 std::ostringstream str; | 1605 std::ostringstream str; |
1605 str << receive_logs_++; | 1606 str << receive_logs_++; |
1606 std::string path = | 1607 std::string path = |
1607 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; | 1608 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; |
1608 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), | 1609 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), |
1609 10000000); | 1610 10000000); |
1610 } | 1611 } |
1611 } | 1612 } |
1612 | 1613 |
1613 } // namespace webrtc | 1614 } // namespace webrtc |
OLD | NEW |