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

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

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/config.cc ('k') | webrtc/media/engine/webrtcvideoengine2.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) 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 192
193 private: 193 private:
194 class WebRtcVideoReceiveStream; 194 class WebRtcVideoReceiveStream;
195 struct VideoCodecSettings { 195 struct VideoCodecSettings {
196 VideoCodecSettings(); 196 VideoCodecSettings();
197 197
198 bool operator==(const VideoCodecSettings& other) const; 198 bool operator==(const VideoCodecSettings& other) const;
199 bool operator!=(const VideoCodecSettings& other) const; 199 bool operator!=(const VideoCodecSettings& other) const;
200 200
201 VideoCodec codec; 201 VideoCodec codec;
202 webrtc::FecConfig fec; 202 webrtc::UlpfecConfig ulpfec;
203 int rtx_payload_type; 203 int rtx_payload_type;
204 }; 204 };
205 205
206 struct ChangedSendParameters { 206 struct ChangedSendParameters {
207 // These optionals are unset if not changed. 207 // These optionals are unset if not changed.
208 rtc::Optional<VideoCodecSettings> codec; 208 rtc::Optional<VideoCodecSettings> codec;
209 rtc::Optional<std::vector<webrtc::RtpExtension>> rtp_header_extensions; 209 rtc::Optional<std::vector<webrtc::RtpExtension>> rtp_header_extensions;
210 rtc::Optional<int> max_bandwidth_bps; 210 rtc::Optional<int> max_bandwidth_bps;
211 rtc::Optional<bool> conference_mode; 211 rtc::Optional<bool> conference_mode;
212 rtc::Optional<webrtc::RtcpMode> rtcp_mode; 212 rtc::Optional<webrtc::RtcpMode> rtcp_mode;
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 void SetSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink); 431 void SetSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink);
432 432
433 VideoReceiverInfo GetVideoReceiverInfo(bool log_stats); 433 VideoReceiverInfo GetVideoReceiverInfo(bool log_stats);
434 434
435 // Used to disable RED/FEC when the remote description doesn't contain those 435 // Used to disable RED/FEC when the remote description doesn't contain those
436 // codecs. This is needed to be able to work around an RTX bug which is only 436 // codecs. This is needed to be able to work around an RTX bug which is only
437 // happening if the remote side doesn't send RED, but the local side is 437 // happening if the remote side doesn't send RED, but the local side is
438 // configured to receive RED. 438 // configured to receive RED.
439 // TODO(holmer): Remove this after a couple of Chrome versions, M53-54 439 // TODO(holmer): Remove this after a couple of Chrome versions, M53-54
440 // time frame. 440 // time frame.
441 void SetFecDisabledRemotely(bool disable); 441 void SetUlpfecDisabledRemotely(bool disable);
442 442
443 private: 443 private:
444 struct AllocatedDecoder { 444 struct AllocatedDecoder {
445 AllocatedDecoder(webrtc::VideoDecoder* decoder, 445 AllocatedDecoder(webrtc::VideoDecoder* decoder,
446 webrtc::VideoCodecType type, 446 webrtc::VideoCodecType type,
447 bool external); 447 bool external);
448 webrtc::VideoDecoder* decoder; 448 webrtc::VideoDecoder* decoder;
449 // Decoder wrapped into a fallback decoder to permit software fallback. 449 // Decoder wrapped into a fallback decoder to permit software fallback.
450 webrtc::VideoDecoder* external_decoder; 450 webrtc::VideoDecoder* external_decoder;
451 webrtc::VideoCodecType type; 451 webrtc::VideoCodecType type;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 VideoSendParameters send_params_; 538 VideoSendParameters send_params_;
539 VideoOptions default_send_options_; 539 VideoOptions default_send_options_;
540 VideoRecvParameters recv_params_; 540 VideoRecvParameters recv_params_;
541 bool red_disabled_by_remote_side_; 541 bool red_disabled_by_remote_side_;
542 int64_t last_stats_log_ms_; 542 int64_t last_stats_log_ms_;
543 }; 543 };
544 544
545 } // namespace cricket 545 } // namespace cricket
546 546
547 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ 547 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « webrtc/config.cc ('k') | webrtc/media/engine/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698