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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine.cc

Issue 3008773002: Use RtxReceiveStream. (Closed)
Patch Set: Created 3 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 2134 matching lines...) Expand 10 before | Expand all | Expand 10 after
2145 config_.rtp.rtx_associated_payload_types.clear(); 2145 config_.rtp.rtx_associated_payload_types.clear();
2146 for (const VideoCodecSettings& recv_codec : recv_codecs) { 2146 for (const VideoCodecSettings& recv_codec : recv_codecs) {
2147 config_.rtp.rtx_associated_payload_types[recv_codec.rtx_payload_type] = 2147 config_.rtp.rtx_associated_payload_types[recv_codec.rtx_payload_type] =
2148 recv_codec.codec.id; 2148 recv_codec.codec.id;
2149 } 2149 }
2150 2150
2151 config_.rtp.ulpfec = recv_codecs.front().ulpfec; 2151 config_.rtp.ulpfec = recv_codecs.front().ulpfec;
2152 2152
2153 config_.rtp.nack.rtp_history_ms = 2153 config_.rtp.nack.rtp_history_ms =
2154 HasNack(recv_codecs.begin()->codec) ? kNackHistoryMs : 0; 2154 HasNack(recv_codecs.begin()->codec) ? kNackHistoryMs : 0;
2155 if (config_.rtp.ulpfec.red_rtx_payload_type != -1) {
2156 config_.rtp
2157 .rtx_associated_payload_types[config_.rtp.ulpfec.red_rtx_payload_type] =
2158 config_.rtp.ulpfec.red_payload_type;
2159 }
2155 } 2160 }
2156 2161
2157 void WebRtcVideoChannel::WebRtcVideoReceiveStream::ConfigureFlexfecCodec( 2162 void WebRtcVideoChannel::WebRtcVideoReceiveStream::ConfigureFlexfecCodec(
2158 int flexfec_payload_type) { 2163 int flexfec_payload_type) {
2159 flexfec_config_.payload_type = flexfec_payload_type; 2164 flexfec_config_.payload_type = flexfec_payload_type;
2160 } 2165 }
2161 2166
2162 void WebRtcVideoChannel::WebRtcVideoReceiveStream::SetLocalSsrc( 2167 void WebRtcVideoChannel::WebRtcVideoReceiveStream::SetLocalSsrc(
2163 uint32_t local_ssrc) { 2168 uint32_t local_ssrc) {
2164 // TODO(pbos): Consider turning this sanity check into a RTC_DCHECK. You 2169 // TODO(pbos): Consider turning this sanity check into a RTC_DCHECK. You
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
2572 stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() - 2577 stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() -
2573 1); 2578 1);
2574 } 2579 }
2575 2580
2576 std::vector<webrtc::VideoStream> streams; 2581 std::vector<webrtc::VideoStream> streams;
2577 streams.push_back(stream); 2582 streams.push_back(stream);
2578 return streams; 2583 return streams;
2579 } 2584 }
2580 2585
2581 } // namespace cricket 2586 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698