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

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

Issue 1479793002: Remove RegisterExternal{De,En}coder error codes. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 } 120 }
121 121
122 // DEPRECATED. 122 // DEPRECATED.
123 VideoCodecType SendCodec() const override { 123 VideoCodecType SendCodec() const override {
124 return sender_.SendCodecBlocking(); 124 return sender_.SendCodecBlocking();
125 } 125 }
126 126
127 int32_t RegisterExternalEncoder(VideoEncoder* externalEncoder, 127 int32_t RegisterExternalEncoder(VideoEncoder* externalEncoder,
128 uint8_t payloadType, 128 uint8_t payloadType,
129 bool internalSource) override { 129 bool internalSource) override {
130 return sender_.RegisterExternalEncoder(externalEncoder, payloadType, 130 sender_.RegisterExternalEncoder(externalEncoder, payloadType,
131 internalSource); 131 internalSource);
132 return 0;
132 } 133 }
133 134
134 int Bitrate(unsigned int* bitrate) const override { 135 int Bitrate(unsigned int* bitrate) const override {
135 return sender_.Bitrate(bitrate); 136 return sender_.Bitrate(bitrate);
136 } 137 }
137 138
138 int FrameRate(unsigned int* framerate) const override { 139 int FrameRate(unsigned int* framerate) const override {
139 return sender_.FrameRate(framerate); 140 return sender_.FrameRate(framerate);
140 } 141 }
141 142
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 189
189 bool VideoSuspended() const override { return sender_.VideoSuspended(); } 190 bool VideoSuspended() const override { return sender_.VideoSuspended(); }
190 191
191 int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec, 192 int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec,
192 int32_t numberOfCores, 193 int32_t numberOfCores,
193 bool requireKeyFrame) override { 194 bool requireKeyFrame) override {
194 return receiver_.RegisterReceiveCodec(receiveCodec, numberOfCores, 195 return receiver_.RegisterReceiveCodec(receiveCodec, numberOfCores,
195 requireKeyFrame); 196 requireKeyFrame);
196 } 197 }
197 198
198 int32_t RegisterExternalDecoder(VideoDecoder* externalDecoder, 199 void RegisterExternalDecoder(VideoDecoder* externalDecoder,
199 uint8_t payloadType, 200 uint8_t payloadType,
200 bool internalRenderTiming) override { 201 bool internalRenderTiming) override {
201 return receiver_.RegisterExternalDecoder(externalDecoder, payloadType, 202 receiver_.RegisterExternalDecoder(externalDecoder, payloadType,
202 internalRenderTiming); 203 internalRenderTiming);
203 } 204 }
204 205
205 int32_t RegisterReceiveCallback( 206 int32_t RegisterReceiveCallback(
206 VCMReceiveCallback* receiveCallback) override { 207 VCMReceiveCallback* receiveCallback) override {
207 return receiver_.RegisterReceiveCallback(receiveCallback); 208 return receiver_.RegisterReceiveCallback(receiveCallback);
208 } 209 }
209 210
210 int32_t RegisterReceiveStatisticsCallback( 211 int32_t RegisterReceiveStatisticsCallback(
211 VCMReceiveStatisticsCallback* receiveStats) override { 212 VCMReceiveStatisticsCallback* receiveStats) override {
212 return receiver_.RegisterReceiveStatisticsCallback(receiveStats); 213 return receiver_.RegisterReceiveStatisticsCallback(receiveStats);
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 return new VideoCodingModuleImpl(clock, event_factory, false, nullptr, 331 return new VideoCodingModuleImpl(clock, event_factory, false, nullptr,
331 nullptr); 332 nullptr);
332 } 333 }
333 334
334 void VideoCodingModule::Destroy(VideoCodingModule* module) { 335 void VideoCodingModule::Destroy(VideoCodingModule* module) {
335 if (module != NULL) { 336 if (module != NULL) {
336 delete static_cast<VideoCodingModuleImpl*>(module); 337 delete static_cast<VideoCodingModuleImpl*>(module);
337 } 338 }
338 } 339 }
339 } // namespace webrtc 340 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/video_coding_impl.h ('k') | webrtc/modules/video_coding/video_coding_robustness_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698