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

Remove ignored return code from modules.

Browse Source 
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

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

Cr-Commit-Position: refs/heads/master@{#11747}
This commit is contained in:
Peter Boström
2016-02-24 16:51:18 +01:00
parent 985177c757
commit f14c47a58c
66 changed files with 140 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/video_coding/test/vcm_payload_sink_factory.cc
View File

@ -74,9 +74,7 @@ class VcmPayloadSinkFactory::VcmPayloadSink : public PayloadSinkInterface,
bool Process() {
if (vcm_->TimeUntilNextProcess() <= 0) {
if (vcm_->Process() < 0) {
return false;
}
vcm_->Process();
}
return true;
}

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

@ -94,12 +94,9 @@ class VideoCodingModuleImpl : public VideoCodingModule {
return VCM_MIN(sender_time, receiver_time);
}
int32_t Process() override {
int32_t sender_return = sender_.Process();
int32_t receiver_return = receiver_.Process();
if (sender_return != VCM_OK)
return sender_return;
return receiver_return;
void Process() override {
sender_.Process();
receiver_.Process();
}
int32_t RegisterSendCodec(const VideoCodec* sendCodec,

4
webrtc/modules/video_coding/video_coding_impl.h
View File

@ -93,7 +93,7 @@ class VideoSender {
bool VideoSuspended() const;
int64_t TimeUntilNextProcess();
int32_t Process();
void Process();
private:
void SetEncoderParameters(EncoderParameters params)
@ -172,7 +172,7 @@ class VideoReceiver {
int32_t SetVideoProtection(VCMVideoProtection videoProtection, bool enable);
int64_t TimeUntilNextProcess();
int32_t Process();
void Process();
void RegisterPreDecodeImageCallback(EncodedImageCallback* observer);
void TriggerDecoderShutdown();

18
webrtc/modules/video_coding/video_coding_robustness_unittest.cc
View File

@ -113,20 +113,20 @@ TEST_F(VCMRobustnessTest, TestHardNack) {
clock_->AdvanceTimeMilliseconds(10);
ASSERT_EQ(VCM_OK, vcm_->Process());
vcm_->Process();
ASSERT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0));
InsertPacket(6000, 8, false, true, kVideoFrameDelta);
clock_->AdvanceTimeMilliseconds(10);
ASSERT_EQ(VCM_OK, vcm_->Process());
vcm_->Process();
ASSERT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0));
InsertPacket(6000, 6, true, false, kVideoFrameDelta);
InsertPacket(6000, 7, false, false, kVideoFrameDelta);
clock_->AdvanceTimeMilliseconds(10);
ASSERT_EQ(VCM_OK, vcm_->Process());
vcm_->Process();
ASSERT_EQ(VCM_OK, vcm_->Decode(0));
}
@ -143,12 +143,12 @@ TEST_F(VCMRobustnessTest, TestHardNackNoneDecoded) {
InsertPacket(3000, 5, false, true, kVideoFrameDelta);
EXPECT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0));
ASSERT_EQ(VCM_OK, vcm_->Process());
vcm_->Process();
clock_->AdvanceTimeMilliseconds(10);
EXPECT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0));
ASSERT_EQ(VCM_OK, vcm_->Process());
vcm_->Process();
}
TEST_F(VCMRobustnessTest, TestModeNoneWithErrors) {
@ -195,25 +195,25 @@ TEST_F(VCMRobustnessTest, TestModeNoneWithErrors) {
InsertPacket(0, 1, false, false, kVideoFrameKey);
InsertPacket(0, 2, false, true, kVideoFrameKey);
EXPECT_EQ(VCM_OK, vcm_->Decode(33)); // Decode timestamp 0.
EXPECT_EQ(VCM_OK, vcm_->Process()); // Expect no NACK list.
vcm_->Process();
clock_->AdvanceTimeMilliseconds(33);
InsertPacket(3000, 3, true, false, kVideoFrameDelta);
// Packet 4 missing
InsertPacket(3000, 5, false, true, kVideoFrameDelta);
EXPECT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0));
EXPECT_EQ(VCM_OK, vcm_->Process()); // Expect no NACK list.
vcm_->Process();
clock_->AdvanceTimeMilliseconds(33);
InsertPacket(6000, 6, true, false, kVideoFrameDelta);
InsertPacket(6000, 7, false, false, kVideoFrameDelta);
InsertPacket(6000, 8, false, true, kVideoFrameDelta);
EXPECT_EQ(VCM_OK, vcm_->Decode(0)); // Decode timestamp 3000 incomplete.
EXPECT_EQ(VCM_OK, vcm_->Process()); // Expect no NACK list.
vcm_->Process();
clock_->AdvanceTimeMilliseconds(10);
EXPECT_EQ(VCM_OK, vcm_->Decode(23)); // Decode timestamp 6000 complete.
EXPECT_EQ(VCM_OK, vcm_->Process()); // Expect no NACK list.
vcm_->Process();
clock_->AdvanceTimeMilliseconds(23);
InsertPacket(3000, 4, false, false, kVideoFrameDelta);

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

@ -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() {

4
webrtc/modules/video_coding/video_receiver_unittest.cc
View File

@ -52,7 +52,7 @@ class TestVideoReceiver : public ::testing::Test {
EXPECT_EQ(0, receiver_->IncomingPacket(payload, 0, *header));
++header->header.sequenceNumber;
}
EXPECT_EQ(0, receiver_->Process());
receiver_->Process();
EXPECT_CALL(decoder_, Decode(_, _, _, _, _)).Times(0);
EXPECT_EQ(VCM_FRAME_NOT_READY, receiver_->Decode(100));
}
@ -64,7 +64,7 @@ class TestVideoReceiver : public ::testing::Test {
EXPECT_EQ(0, receiver_->IncomingPacket(payload, length, *header));
++header->header.sequenceNumber;
EXPECT_CALL(packet_request_callback_, ResendPackets(_, _)).Times(0);
EXPECT_EQ(0, receiver_->Process());
receiver_->Process();;
EXPECT_CALL(decoder_, Decode(_, _, _, _, _)).Times(1);
EXPECT_EQ(0, receiver_->Decode(100));
}

6
webrtc/modules/video_coding/video_sender.cc
View File

@ -53,9 +53,7 @@ VideoSender::VideoSender(Clock* clock,
VideoSender::~VideoSender() {}
int32_t VideoSender::Process() {
int32_t returnValue = VCM_OK;
void VideoSender::Process() {
if (_sendStatsTimer.TimeUntilProcess() == 0) {
_sendStatsTimer.Processed();
CriticalSectionScoped cs(process_crit_sect_.get());
@ -72,8 +70,6 @@ int32_t VideoSender::Process() {
// updated even if bandwidth hasn't changed.
encoder_params_.input_frame_rate = _mediaOpt.InputFrameRate();
}
return returnValue;
}
int64_t VideoSender::TimeUntilNextProcess() {