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

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: Rebased and fixed SendStatisics const uint. 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 EventFactory* event_factory, 75 EventFactory* event_factory,
76 VideoEncoderRateObserver* encoder_rate_observer, 76 VideoEncoderRateObserver* encoder_rate_observer,
77 VCMQMSettingsCallback* qm_settings_callback, 77 VCMQMSettingsCallback* qm_settings_callback,
78 NackSender* nack_sender, 78 NackSender* nack_sender,
79 KeyFrameRequestSender* keyframe_request_sender, 79 KeyFrameRequestSender* keyframe_request_sender,
80 EncodedImageCallback* pre_decode_image_callback) 80 EncodedImageCallback* pre_decode_image_callback)
81 : VideoCodingModule(), 81 : VideoCodingModule(),
82 sender_(clock, 82 sender_(clock,
83 &post_encode_callback_, 83 &post_encode_callback_,
84 encoder_rate_observer, 84 encoder_rate_observer,
85 qm_settings_callback), 85 qm_settings_callback,
86 nullptr),
86 receiver_(clock, 87 receiver_(clock,
87 event_factory, 88 event_factory,
88 pre_decode_image_callback, 89 pre_decode_image_callback,
89 nack_sender, 90 nack_sender,
90 keyframe_request_sender) {} 91 keyframe_request_sender) {}
91 92
92 virtual ~VideoCodingModuleImpl() {} 93 virtual ~VideoCodingModuleImpl() {}
93 94
94 int64_t TimeUntilNextProcess() override { 95 int64_t TimeUntilNextProcess() override {
95 int64_t sender_time = sender_.TimeUntilNextProcess(); 96 int64_t sender_time = sender_.TimeUntilNextProcess();
(...skipping 29 matching lines...) Expand all
125 int FrameRate(unsigned int* framerate) const override { 126 int FrameRate(unsigned int* framerate) const override {
126 return sender_.FrameRate(framerate); 127 return sender_.FrameRate(framerate);
127 } 128 }
128 129
129 int32_t SetChannelParameters(uint32_t target_bitrate, // bits/s. 130 int32_t SetChannelParameters(uint32_t target_bitrate, // bits/s.
130 uint8_t lossRate, 131 uint8_t lossRate,
131 int64_t rtt) override { 132 int64_t rtt) override {
132 return sender_.SetChannelParameters(target_bitrate, lossRate, rtt); 133 return sender_.SetChannelParameters(target_bitrate, lossRate, rtt);
133 } 134 }
134 135
135 int32_t RegisterTransportCallback(
136 VCMPacketizationCallback* transport) override {
137 return sender_.RegisterTransportCallback(transport);
138 }
139
140 int32_t RegisterSendStatisticsCallback(
141 VCMSendStatisticsCallback* sendStats) override {
142 return sender_.RegisterSendStatisticsCallback(sendStats);
143 }
144
145 int32_t RegisterProtectionCallback( 136 int32_t RegisterProtectionCallback(
146 VCMProtectionCallback* protection) override { 137 VCMProtectionCallback* protection) override {
147 return sender_.RegisterProtectionCallback(protection); 138 return sender_.RegisterProtectionCallback(protection);
148 } 139 }
149 140
150 int32_t SetVideoProtection(VCMVideoProtection videoProtection, 141 int32_t SetVideoProtection(VCMVideoProtection videoProtection,
151 bool enable) override { 142 bool enable) override {
152 // TODO(pbos): Remove enable from receive-side protection modes as well. 143 // TODO(pbos): Remove enable from receive-side protection modes as well.
153 if (enable) 144 if (enable)
154 sender_.SetVideoProtection(videoProtection); 145 sender_.SetVideoProtection(videoProtection);
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 NackSender* nack_sender, 324 NackSender* nack_sender,
334 KeyFrameRequestSender* keyframe_request_sender) { 325 KeyFrameRequestSender* keyframe_request_sender) {
335 assert(clock); 326 assert(clock);
336 assert(event_factory); 327 assert(event_factory);
337 return new VideoCodingModuleImpl(clock, event_factory, nullptr, nullptr, 328 return new VideoCodingModuleImpl(clock, event_factory, nullptr, nullptr,
338 nack_sender, keyframe_request_sender, 329 nack_sender, keyframe_request_sender,
339 nullptr); 330 nullptr);
340 } 331 }
341 332
342 } // namespace webrtc 333 } // 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