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

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

Issue 2589833002: Clean up storage of FlexFEC payload type in webrtc::VideoCodecSettings. (Closed)
Patch Set: Created 4 years 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 | « no previous file | 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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 private: 185 private:
186 class WebRtcVideoReceiveStream; 186 class WebRtcVideoReceiveStream;
187 struct VideoCodecSettings { 187 struct VideoCodecSettings {
188 VideoCodecSettings(); 188 VideoCodecSettings();
189 189
190 bool operator==(const VideoCodecSettings& other) const; 190 bool operator==(const VideoCodecSettings& other) const;
191 bool operator!=(const VideoCodecSettings& other) const; 191 bool operator!=(const VideoCodecSettings& other) const;
192 192
193 VideoCodec codec; 193 VideoCodec codec;
194 webrtc::UlpfecConfig ulpfec; 194 webrtc::UlpfecConfig ulpfec;
195 webrtc::FlexfecConfig flexfec; 195 int flexfec_payload_type;
196 int rtx_payload_type; 196 int rtx_payload_type;
197 }; 197 };
198 198
199 struct ChangedSendParameters { 199 struct ChangedSendParameters {
200 // These optionals are unset if not changed. 200 // These optionals are unset if not changed.
201 rtc::Optional<VideoCodecSettings> codec; 201 rtc::Optional<VideoCodecSettings> codec;
202 rtc::Optional<std::vector<webrtc::RtpExtension>> rtp_header_extensions; 202 rtc::Optional<std::vector<webrtc::RtpExtension>> rtp_header_extensions;
203 rtc::Optional<int> max_bandwidth_bps; 203 rtc::Optional<int> max_bandwidth_bps;
204 rtc::Optional<bool> conference_mode; 204 rtc::Optional<bool> conference_mode;
205 rtc::Optional<webrtc::RtcpMode> rtcp_mode; 205 rtc::Optional<webrtc::RtcpMode> rtcp_mode;
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 // send_params/recv_params, rtp_extensions, options, etc. 511 // send_params/recv_params, rtp_extensions, options, etc.
512 VideoSendParameters send_params_; 512 VideoSendParameters send_params_;
513 VideoOptions default_send_options_; 513 VideoOptions default_send_options_;
514 VideoRecvParameters recv_params_; 514 VideoRecvParameters recv_params_;
515 int64_t last_stats_log_ms_; 515 int64_t last_stats_log_ms_;
516 }; 516 };
517 517
518 } // namespace cricket 518 } // namespace cricket
519 519
520 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ 520 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698