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

Revert of Remove ignored return code from modules. (patchset #3 id:40001 of https://codereview.webrtc.org/1703833002/ )

Browse Source 
Reason for revert:
Breaks Chromium.

Original issue's description:
> Remove ignored return code from modules.
>
> ModuleProcessImpl doesn't act on return codes and having them around is
> confusing (it's unclear what an error return code here would do even).
>
> BUG=
> R=tommi@webrtc.org
>
> Committed: f14c47a58c

TBR=tommi@webrtc.org,pbos@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

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

Cr-Commit-Position: refs/heads/master@{#11761}
This commit is contained in:
torbjorng
2016-02-25 04:34:03 -08:00
committed by Commit bot
parent 91c5b5650c
commit da33a8a2a2
66 changed files with 192 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
webrtc/modules/video_coding/video_receiver.cc
View File

@ -63,7 +63,9 @@ VideoReceiver::~VideoReceiver() {
#endif
}
void VideoReceiver::Process() {
int32_t VideoReceiver::Process() {
int32_t returnValue = VCM_OK;
// Receive-side statistics
if (_receiveStatsTimer.TimeUntilProcess() == 0) {
_receiveStatsTimer.Processed();
@ -106,8 +108,12 @@ void VideoReceiver::Process() {
CriticalSectionScoped cs(process_crit_sect_.get());
request_key_frame = _scheduleKeyRequest && _frameTypeCallback != NULL;
}
if (request_key_frame)
RequestKeyFrame();
if (request_key_frame) {
const int32_t ret = RequestKeyFrame();
if (ret != VCM_OK && returnValue == VCM_OK) {
returnValue = ret;
}
}
}
// Packet retransmission requests
@ -129,6 +135,9 @@ void VideoReceiver::Process() {
int32_t ret = VCM_OK;
if (request_key_frame) {
ret = RequestKeyFrame();
if (ret != VCM_OK && returnValue == VCM_OK) {
returnValue = ret;
}
}
if (ret == VCM_OK && !nackList.empty()) {
CriticalSectionScoped cs(process_crit_sect_.get());
@ -138,6 +147,8 @@ void VideoReceiver::Process() {
}
}
}
return returnValue;
}
int64_t VideoReceiver::TimeUntilNextProcess() {