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

Side by Side Diff: webrtc/config.h

Issue 2621573002: Remove FlexfecConfig and replace with specific struct in VideoSendStream. (Closed)
Patch Set: Rebase. Created 3 years, 11 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 | « no previous file | webrtc/config.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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // Payload type used for ULPFEC packets. 49 // Payload type used for ULPFEC packets.
50 int ulpfec_payload_type; 50 int ulpfec_payload_type;
51 51
52 // Payload type used for RED packets. 52 // Payload type used for RED packets.
53 int red_payload_type; 53 int red_payload_type;
54 54
55 // RTX payload type for RED payload. 55 // RTX payload type for RED payload.
56 int red_rtx_payload_type; 56 int red_rtx_payload_type;
57 }; 57 };
58 58
59 // Settings for FlexFEC forward error correction.
60 // Set the payload type to '-1' to disable.
61 struct FlexfecConfig {
62 FlexfecConfig();
63 ~FlexfecConfig();
64 std::string ToString() const;
65 bool IsCompleteAndEnabled() const;
66 bool operator==(const FlexfecConfig& other) const;
67
68 // Payload type of FlexFEC.
69 int flexfec_payload_type;
70
71 // SSRC of FlexFEC stream.
72 uint32_t flexfec_ssrc;
73
74 // Vector containing a single element, corresponding to the SSRC of the media
75 // stream being protected by this FlexFEC stream. The vector MUST have size 1.
76 //
77 // TODO(brandtr): Update comment above when we support multistream protection.
78 std::vector<uint32_t> protected_media_ssrcs;
79 };
80
81 // RTP header extension, see RFC 5285. 59 // RTP header extension, see RFC 5285.
82 struct RtpExtension { 60 struct RtpExtension {
83 RtpExtension() : id(0) {} 61 RtpExtension() : id(0) {}
84 RtpExtension(const std::string& uri, int id) : uri(uri), id(id) {} 62 RtpExtension(const std::string& uri, int id) : uri(uri), id(id) {}
85 std::string ToString() const; 63 std::string ToString() const;
86 bool operator==(const RtpExtension& rhs) const { 64 bool operator==(const RtpExtension& rhs) const {
87 return uri == rhs.uri && id == rhs.id; 65 return uri == rhs.uri && id == rhs.id;
88 } 66 }
89 static bool IsSupportedForAudio(const std::string& uri); 67 static bool IsSupportedForAudio(const std::string& uri);
90 static bool IsSupportedForVideo(const std::string& uri); 68 static bool IsSupportedForVideo(const std::string& uri);
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 224
247 private: 225 private:
248 // Access to the copy constructor is private to force use of the Copy() 226 // Access to the copy constructor is private to force use of the Copy()
249 // method for those exceptional cases where we do use it. 227 // method for those exceptional cases where we do use it.
250 VideoEncoderConfig(const VideoEncoderConfig&); 228 VideoEncoderConfig(const VideoEncoderConfig&);
251 }; 229 };
252 230
253 } // namespace webrtc 231 } // namespace webrtc
254 232
255 #endif // WEBRTC_CONFIG_H_ 233 #endif // WEBRTC_CONFIG_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698