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

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

Issue 2553863003: Parse FlexFEC RTP headers in Call and add integration with BWE. (Closed)
Patch Set: Add basic CongestionController unit test, based on nisse's suggestion. Created 3 years, 12 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 2331 matching lines...) Expand 10 before | Expand all | Expand 10 after
2342 stream_->Start(); 2342 stream_->Start();
2343 if (IsFlexfecFieldTrialEnabled() && flexfec_config_.IsCompleteAndEnabled()) { 2343 if (IsFlexfecFieldTrialEnabled() && flexfec_config_.IsCompleteAndEnabled()) {
2344 webrtc::FlexfecReceiveStream::Config config; 2344 webrtc::FlexfecReceiveStream::Config config;
2345 // Payload types and SSRCs come from the FlexFEC specific part of the SDP. 2345 // Payload types and SSRCs come from the FlexFEC specific part of the SDP.
2346 config.payload_type = flexfec_config_.flexfec_payload_type; 2346 config.payload_type = flexfec_config_.flexfec_payload_type;
2347 config.remote_ssrc = flexfec_config_.flexfec_ssrc; 2347 config.remote_ssrc = flexfec_config_.flexfec_ssrc;
2348 config.protected_media_ssrcs = flexfec_config_.protected_media_ssrcs; 2348 config.protected_media_ssrcs = flexfec_config_.protected_media_ssrcs;
2349 // RTCP messages and RTP header extensions apply to the entire track 2349 // RTCP messages and RTP header extensions apply to the entire track
2350 // in the SDP. 2350 // in the SDP.
2351 config.transport_cc = config_.rtp.transport_cc; 2351 config.transport_cc = config_.rtp.transport_cc;
2352 config.extensions = config_.rtp.extensions; 2352 config.rtp_header_extensions = config_.rtp.extensions;
2353 flexfec_stream_ = call_->CreateFlexfecReceiveStream(config); 2353 flexfec_stream_ = call_->CreateFlexfecReceiveStream(config);
2354 flexfec_stream_->Start(); 2354 flexfec_stream_->Start();
2355 } 2355 }
2356 } 2356 }
2357 2357
2358 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::ClearDecoders( 2358 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::ClearDecoders(
2359 std::vector<AllocatedDecoder>* allocated_decoders) { 2359 std::vector<AllocatedDecoder>* allocated_decoders) {
2360 for (size_t i = 0; i < allocated_decoders->size(); ++i) { 2360 for (size_t i = 0; i < allocated_decoders->size(); ++i) {
2361 if ((*allocated_decoders)[i].external) { 2361 if ((*allocated_decoders)[i].external) {
2362 external_decoder_factory_->DestroyVideoDecoder( 2362 external_decoder_factory_->DestroyVideoDecoder(
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
2575 rtx_mapping[video_codecs[i].codec.id] != 2575 rtx_mapping[video_codecs[i].codec.id] !=
2576 ulpfec_config.red_payload_type) { 2576 ulpfec_config.red_payload_type) {
2577 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2577 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2578 } 2578 }
2579 } 2579 }
2580 2580
2581 return video_codecs; 2581 return video_codecs;
2582 } 2582 }
2583 2583
2584 } // namespace cricket 2584 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/call/flexfec_receive_stream_unittest.cc ('k') | webrtc/modules/congestion_controller/congestion_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698