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

Side by Side Diff: webrtc/video_engine/vie_channel.h

Issue 1394243006: Move ownership of send ViEChannels and ViEEncoder to VideoSendStream. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed header leftovers. Created 5 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/video/video_send_stream.cc ('k') | webrtc/video_engine/vie_channel.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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 123
124 // Sets SSRC for outgoing stream. 124 // Sets SSRC for outgoing stream.
125 int32_t SetSSRC(const uint32_t SSRC, 125 int32_t SetSSRC(const uint32_t SSRC,
126 const StreamType usage, 126 const StreamType usage,
127 const unsigned char simulcast_idx); 127 const unsigned char simulcast_idx);
128 128
129 // Gets SSRC for outgoing stream number |idx|. 129 // Gets SSRC for outgoing stream number |idx|.
130 int32_t GetLocalSSRC(uint8_t idx, unsigned int* ssrc); 130 int32_t GetLocalSSRC(uint8_t idx, unsigned int* ssrc);
131 131
132 // Gets SSRC for the incoming stream. 132 // Gets SSRC for the incoming stream.
133 int32_t GetRemoteSSRC(uint32_t* ssrc); 133 uint32_t GetRemoteSSRC();
134 134
135 int SetRtxSendPayloadType(int payload_type, int associated_payload_type); 135 int SetRtxSendPayloadType(int payload_type, int associated_payload_type);
136 void SetRtxReceivePayloadType(int payload_type, int associated_payload_type); 136 void SetRtxReceivePayloadType(int payload_type, int associated_payload_type);
137 137
138 void SetRtpStateForSsrc(uint32_t ssrc, const RtpState& rtp_state); 138 void SetRtpStateForSsrc(uint32_t ssrc, const RtpState& rtp_state);
139 RtpState GetRtpStateForSsrc(uint32_t ssrc); 139 RtpState GetRtpStateForSsrc(uint32_t ssrc);
140 140
141 // Sets the CName for the outgoing stream on the channel. 141 // Sets the CName for the outgoing stream on the channel.
142 int32_t SetRTCPCName(const char* rtcp_cname); 142 int32_t SetRTCPCName(const char* rtcp_cname);
143 143
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 size_t num_rtts_ GUARDED_BY(crit_); 445 size_t num_rtts_ GUARDED_BY(crit_);
446 446
447 // RtpRtcp modules, declared last as they use other members on construction. 447 // RtpRtcp modules, declared last as they use other members on construction.
448 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 448 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
449 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_); 449 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_);
450 }; 450 };
451 451
452 } // namespace webrtc 452 } // namespace webrtc
453 453
454 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_ 454 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video_engine/vie_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698