zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove RegisterExternal{De,En}coder error codes.

Browse Source 
Also adds a RTC_CHECK in VideoReceiveStream that verifies that decoders
aren't null, since this will attempt to deregister a codec which would
previously fail with an obscure stack trace not indicating what actually
was wrong.

BUG=webrtc:5249
R=stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1479793002 .

Cr-Commit-Position: refs/heads/master@{#10821}
This commit is contained in:
Peter Boström
2015-11-27 14:09:07 +01:00
parent 34873b5bb0
commit 795dbe4e0f
12 changed files with 37 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
webrtc/modules/video_coding/video_coding_impl.cc
View File

@ -127,8 +127,9 @@ class VideoCodingModuleImpl : public VideoCodingModule {
int32_t RegisterExternalEncoder(VideoEncoder* externalEncoder,
uint8_t payloadType,
bool internalSource) override {
return sender_.RegisterExternalEncoder(externalEncoder, payloadType,
internalSource);
sender_.RegisterExternalEncoder(externalEncoder, payloadType,
internalSource);
return 0;
}
int Bitrate(unsigned int* bitrate) const override {
@ -195,11 +196,11 @@ class VideoCodingModuleImpl : public VideoCodingModule {
requireKeyFrame);
}
int32_t RegisterExternalDecoder(VideoDecoder* externalDecoder,
uint8_t payloadType,
bool internalRenderTiming) override {
return receiver_.RegisterExternalDecoder(externalDecoder, payloadType,
internalRenderTiming);
void RegisterExternalDecoder(VideoDecoder* externalDecoder,
uint8_t payloadType,
bool internalRenderTiming) override {
receiver_.RegisterExternalDecoder(externalDecoder, payloadType,
internalRenderTiming);
}
int32_t RegisterReceiveCallback(