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

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

Issue 1900193004: Remove VCMPacketizationCallback (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixed bug. Created 4 years, 7 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 bool owns_event_factory, 76 bool owns_event_factory,
77 VideoEncoderRateObserver* encoder_rate_observer, 77 VideoEncoderRateObserver* encoder_rate_observer,
78 VCMQMSettingsCallback* qm_settings_callback, 78 VCMQMSettingsCallback* qm_settings_callback,
79 NackSender* nack_sender, 79 NackSender* nack_sender,
80 KeyFrameRequestSender* keyframe_request_sender, 80 KeyFrameRequestSender* keyframe_request_sender,
81 EncodedImageCallback* pre_decode_image_callback) 81 EncodedImageCallback* pre_decode_image_callback)
82 : VideoCodingModule(), 82 : VideoCodingModule(),
83 sender_(clock, 83 sender_(clock,
84 &post_encode_callback_, 84 &post_encode_callback_,
85 encoder_rate_observer, 85 encoder_rate_observer,
86 qm_settings_callback), 86 qm_settings_callback,
87 nullptr),
87 receiver_(clock, 88 receiver_(clock,
88 event_factory, 89 event_factory,
89 pre_decode_image_callback, 90 pre_decode_image_callback,
90 nack_sender, 91 nack_sender,
91 keyframe_request_sender), 92 keyframe_request_sender),
92 own_event_factory_(owns_event_factory ? event_factory : NULL) {} 93 own_event_factory_(owns_event_factory ? event_factory : NULL) {}
93 94
94 virtual ~VideoCodingModuleImpl() { own_event_factory_.reset(); } 95 virtual ~VideoCodingModuleImpl() { own_event_factory_.reset(); }
95 96
96 int64_t TimeUntilNextProcess() override { 97 int64_t TimeUntilNextProcess() override {
(...skipping 30 matching lines...) Expand all
127 int FrameRate(unsigned int* framerate) const override { 128 int FrameRate(unsigned int* framerate) const override {
128 return sender_.FrameRate(framerate); 129 return sender_.FrameRate(framerate);
129 } 130 }
130 131
131 int32_t SetChannelParameters(uint32_t target_bitrate, // bits/s. 132 int32_t SetChannelParameters(uint32_t target_bitrate, // bits/s.
132 uint8_t lossRate, 133 uint8_t lossRate,
133 int64_t rtt) override { 134 int64_t rtt) override {
134 return sender_.SetChannelParameters(target_bitrate, lossRate, rtt); 135 return sender_.SetChannelParameters(target_bitrate, lossRate, rtt);
135 } 136 }
136 137
137 int32_t RegisterTransportCallback(
138 VCMPacketizationCallback* transport) override {
139 return sender_.RegisterTransportCallback(transport);
140 }
141
142 int32_t RegisterSendStatisticsCallback(
143 VCMSendStatisticsCallback* sendStats) override {
144 return sender_.RegisterSendStatisticsCallback(sendStats);
145 }
146
147 int32_t RegisterProtectionCallback( 138 int32_t RegisterProtectionCallback(
148 VCMProtectionCallback* protection) override { 139 VCMProtectionCallback* protection) override {
149 return sender_.RegisterProtectionCallback(protection); 140 return sender_.RegisterProtectionCallback(protection);
150 } 141 }
151 142
152 int32_t SetVideoProtection(VCMVideoProtection videoProtection, 143 int32_t SetVideoProtection(VCMVideoProtection videoProtection,
153 bool enable) override { 144 bool enable) override {
154 // TODO(pbos): Remove enable from receive-side protection modes as well. 145 // TODO(pbos): Remove enable from receive-side protection modes as well.
155 if (enable) 146 if (enable)
156 sender_.SetVideoProtection(videoProtection); 147 sender_.SetVideoProtection(videoProtection);
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 NackSender* nack_sender, 328 NackSender* nack_sender,
338 KeyFrameRequestSender* keyframe_request_sender) { 329 KeyFrameRequestSender* keyframe_request_sender) {
339 assert(clock); 330 assert(clock);
340 assert(event_factory); 331 assert(event_factory);
341 return new VideoCodingModuleImpl(clock, event_factory, false, nullptr, 332 return new VideoCodingModuleImpl(clock, event_factory, false, nullptr,
342 nullptr, nack_sender, 333 nullptr, nack_sender,
343 keyframe_request_sender, nullptr); 334 keyframe_request_sender, nullptr);
344 } 335 }
345 336
346 } // namespace webrtc 337 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698