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

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

Issue 3000273002: Reverse |rtx_payload_types| map, and rename. (Closed)
Patch Set: Created 3 years, 4 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 2202 matching lines...) Expand 10 before | Expand all | Expand 10 after
2213 allocated_decoders_.push_back(allocated_decoder); 2213 allocated_decoders_.push_back(allocated_decoder);
2214 2214
2215 webrtc::VideoReceiveStream::Decoder decoder; 2215 webrtc::VideoReceiveStream::Decoder decoder;
2216 decoder.decoder = allocated_decoder.decoder; 2216 decoder.decoder = allocated_decoder.decoder;
2217 decoder.payload_type = recv_codecs[i].codec.id; 2217 decoder.payload_type = recv_codecs[i].codec.id;
2218 decoder.payload_name = recv_codecs[i].codec.name; 2218 decoder.payload_name = recv_codecs[i].codec.name;
2219 decoder.codec_params = recv_codecs[i].codec.params; 2219 decoder.codec_params = recv_codecs[i].codec.params;
2220 config_.decoders.push_back(decoder); 2220 config_.decoders.push_back(decoder);
2221 } 2221 }
2222 2222
2223 config_.rtp.rtx_payload_types.clear(); 2223 config_.rtp.media_pt_by_rtx_pt.clear();
2224 for (const VideoCodecSettings& recv_codec : recv_codecs) { 2224 for (const VideoCodecSettings& recv_codec : recv_codecs) {
2225 config_.rtp.rtx_payload_types[recv_codec.codec.id] = 2225 config_.rtp.media_pt_by_rtx_pt[recv_codec.rtx_payload_type] =
2226 recv_codec.rtx_payload_type; 2226 recv_codec.codec.id;
2227 } 2227 }
2228 2228
2229 config_.rtp.ulpfec = recv_codecs.front().ulpfec; 2229 config_.rtp.ulpfec = recv_codecs.front().ulpfec;
2230 2230
2231 config_.rtp.nack.rtp_history_ms = 2231 config_.rtp.nack.rtp_history_ms =
2232 HasNack(recv_codecs.begin()->codec) ? kNackHistoryMs : 0; 2232 HasNack(recv_codecs.begin()->codec) ? kNackHistoryMs : 0;
2233 } 2233 }
2234 2234
2235 void WebRtcVideoChannel::WebRtcVideoReceiveStream::ConfigureFlexfecCodec( 2235 void WebRtcVideoChannel::WebRtcVideoReceiveStream::ConfigureFlexfecCodec(
2236 int flexfec_payload_type) { 2236 int flexfec_payload_type) {
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
2650 stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() - 2650 stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() -
2651 1); 2651 1);
2652 } 2652 }
2653 2653
2654 std::vector<webrtc::VideoStream> streams; 2654 std::vector<webrtc::VideoStream> streams;
2655 streams.push_back(stream); 2655 streams.push_back(stream);
2656 return streams; 2656 return streams;
2657 } 2657 }
2658 2658
2659 } // namespace cricket 2659 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698