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

Side by Side Diff: webrtc/modules/video_coding/video_coding_impl.cc

Issue 1972083002: Move logic for calculating needed bitrate overhead used by NACK and FEC to VideoSender. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed Åsas comments. Created 4 years, 6 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) 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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } 129 }
130 130
131 int32_t RegisterProtectionCallback( 131 int32_t RegisterProtectionCallback(
132 VCMProtectionCallback* protection) override { 132 VCMProtectionCallback* protection) override {
133 return sender_.RegisterProtectionCallback(protection); 133 return sender_.RegisterProtectionCallback(protection);
134 } 134 }
135 135
136 int32_t SetVideoProtection(VCMVideoProtection videoProtection, 136 int32_t SetVideoProtection(VCMVideoProtection videoProtection,
137 bool enable) override { 137 bool enable) override {
138 // TODO(pbos): Remove enable from receive-side protection modes as well. 138 // TODO(pbos): Remove enable from receive-side protection modes as well.
139 if (enable)
140 sender_.SetVideoProtection(videoProtection);
141 return receiver_.SetVideoProtection(videoProtection, enable); 139 return receiver_.SetVideoProtection(videoProtection, enable);
142 } 140 }
143 141
144 int32_t AddVideoFrame(const VideoFrame& videoFrame, 142 int32_t AddVideoFrame(const VideoFrame& videoFrame,
145 const CodecSpecificInfo* codecSpecificInfo) override { 143 const CodecSpecificInfo* codecSpecificInfo) override {
146 return sender_.AddVideoFrame(videoFrame, codecSpecificInfo); 144 return sender_.AddVideoFrame(videoFrame, codecSpecificInfo);
147 } 145 }
148 146
149 int32_t IntraFrameRequest(size_t stream_index) override { 147 int32_t IntraFrameRequest(size_t stream_index) override {
150 return sender_.IntraFrameRequest(stream_index); 148 return sender_.IntraFrameRequest(stream_index);
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 EventFactory* event_factory, 310 EventFactory* event_factory,
313 NackSender* nack_sender, 311 NackSender* nack_sender,
314 KeyFrameRequestSender* keyframe_request_sender) { 312 KeyFrameRequestSender* keyframe_request_sender) {
315 assert(clock); 313 assert(clock);
316 assert(event_factory); 314 assert(event_factory);
317 return new VideoCodingModuleImpl(clock, event_factory, nullptr, nack_sender, 315 return new VideoCodingModuleImpl(clock, event_factory, nullptr, nack_sender,
318 keyframe_request_sender, nullptr); 316 keyframe_request_sender, nullptr);
319 } 317 }
320 318
321 } // namespace webrtc 319 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/video_coding_impl.h ('k') | webrtc/modules/video_coding/video_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698