| Index: webrtc/modules/video_coding/video_receiver.cc
|
| diff --git a/webrtc/modules/video_coding/video_receiver.cc b/webrtc/modules/video_coding/video_receiver.cc
|
| index 02d51a7b900f93dba9a11088a125d052a2f91ded..e7844d0add3aaf2c2f441043278f0264c27c6f76 100644
|
| --- a/webrtc/modules/video_coding/video_receiver.cc
|
| +++ b/webrtc/modules/video_coding/video_receiver.cc
|
| @@ -63,9 +63,7 @@ VideoReceiver::~VideoReceiver() {
|
| #endif
|
| }
|
|
|
| -int32_t VideoReceiver::Process() {
|
| - int32_t returnValue = VCM_OK;
|
| -
|
| +void VideoReceiver::Process() {
|
| // Receive-side statistics
|
| if (_receiveStatsTimer.TimeUntilProcess() == 0) {
|
| _receiveStatsTimer.Processed();
|
| @@ -108,12 +106,8 @@ int32_t VideoReceiver::Process() {
|
| CriticalSectionScoped cs(process_crit_sect_.get());
|
| request_key_frame = _scheduleKeyRequest && _frameTypeCallback != NULL;
|
| }
|
| - if (request_key_frame) {
|
| - const int32_t ret = RequestKeyFrame();
|
| - if (ret != VCM_OK && returnValue == VCM_OK) {
|
| - returnValue = ret;
|
| - }
|
| - }
|
| + if (request_key_frame)
|
| + RequestKeyFrame();
|
| }
|
|
|
| // Packet retransmission requests
|
| @@ -135,9 +129,6 @@ int32_t 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());
|
| @@ -147,8 +138,6 @@ int32_t VideoReceiver::Process() {
|
| }
|
| }
|
| }
|
| -
|
| - return returnValue;
|
| }
|
|
|
| int64_t VideoReceiver::TimeUntilNextProcess() {
|
|
|