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
Review URL: https://codereview.webrtc.org/1703833002 .
Cr-Commit-Position: refs/heads/master@{#11747}
diff --git a/webrtc/api/test/fakeaudiocapturemodule.cc b/webrtc/api/test/fakeaudiocapturemodule.cc
index b85f30b..0b6478e 100644
--- a/webrtc/api/test/fakeaudiocapturemodule.cc
+++ b/webrtc/api/test/fakeaudiocapturemodule.cc
@@ -85,9 +85,8 @@
return kAdmMaxIdleTimeProcess - elapsed_time;
}
-int32_t FakeAudioCaptureModule::Process() {
+void FakeAudioCaptureModule::Process() {
last_process_time_ms_ = rtc::Time();
- return 0;
}
int32_t FakeAudioCaptureModule::ActiveAudioLayer(
diff --git a/webrtc/api/test/fakeaudiocapturemodule.h b/webrtc/api/test/fakeaudiocapturemodule.h
index c27d02d..9200bdf 100644
--- a/webrtc/api/test/fakeaudiocapturemodule.h
+++ b/webrtc/api/test/fakeaudiocapturemodule.h
@@ -56,7 +56,7 @@
// nothing and return success. If a function is not expected to be called by
// PeerConnection an assertion is triggered if it is in fact called.
int64_t TimeUntilNextProcess() override;
- int32_t Process() override;
+ void Process() override;
int32_t ActiveAudioLayer(AudioLayer* audio_layer) const override;
diff --git a/webrtc/api/test/fakeaudiocapturemodule_unittest.cc b/webrtc/api/test/fakeaudiocapturemodule_unittest.cc
index 1611b81..2c5730a 100644
--- a/webrtc/api/test/fakeaudiocapturemodule_unittest.cc
+++ b/webrtc/api/test/fakeaudiocapturemodule_unittest.cc
@@ -123,8 +123,8 @@
// Next process call must be some time in the future (or now).
EXPECT_LE(0, fake_audio_capture_module_->TimeUntilNextProcess());
// Process call updates TimeUntilNextProcess() but there are no guarantees on
- // timing so just check that Process can ba called successfully.
- EXPECT_LE(0, fake_audio_capture_module_->Process());
+ // timing so just check that Process can be called successfully.
+ fake_audio_capture_module_->Process();
}
TEST_F(FakeAdmTest, PlayoutTest) {
diff --git a/webrtc/media/engine/fakewebrtcvideocapturemodule.h b/webrtc/media/engine/fakewebrtcvideocapturemodule.h
index 8c63d2b..43f72b9 100644
--- a/webrtc/media/engine/fakewebrtcvideocapturemodule.h
+++ b/webrtc/media/engine/fakewebrtcvideocapturemodule.h
@@ -30,7 +30,7 @@
delay_(0) {
}
int64_t TimeUntilNextProcess() override { return 0; }
- int32_t Process() override { return 0; }
+ void Process() override {}
void RegisterCaptureDataCallback(
webrtc::VideoCaptureDataCallback& callback) override {
callback_ = &callback;
diff --git a/webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h b/webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h
index 7370442..7b14f2f 100644
--- a/webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h
+++ b/webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h
@@ -40,7 +40,7 @@
// Module functions
int64_t TimeUntilNextProcess() override = 0;
- int32_t Process() override = 0;
+ void Process() override = 0;
// Register/unregister a callback class for receiving the mixed audio.
virtual int32_t RegisterMixedStreamCallback(
diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
index 9411a9a..1d76025 100644
--- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
+++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
@@ -189,7 +189,7 @@
return timeUntilNextProcess;
}
-int32_t AudioConferenceMixerImpl::Process() {
+void AudioConferenceMixerImpl::Process() {
size_t remainingParticipantsAllowedToMix =
kMaximumAmountOfMixedParticipants;
{
@@ -222,7 +222,7 @@
if(lowFreq <= 0) {
CriticalSectionScoped cs(_crit.get());
_processCalls--;
- return 0;
+ return;
} else {
switch(lowFreq) {
case 8000:
@@ -250,7 +250,7 @@
CriticalSectionScoped cs(_crit.get());
_processCalls--;
- return -1;
+ return;
}
}
@@ -267,10 +267,9 @@
WEBRTC_TRACE(kTraceMemory, kTraceAudioMixerServer, _id,
"failed PopMemory() call");
assert(false);
- return -1;
+ return;
}
- int retval = 0;
{
CriticalSectionScoped cs(_crit.get());
@@ -304,8 +303,7 @@
mixedAudio->Mute();
} else {
// Only call the limiter if we have something to mix.
- if(!LimitMixedAudio(mixedAudio))
- retval = -1;
+ LimitMixedAudio(mixedAudio);
}
}
@@ -330,7 +328,7 @@
CriticalSectionScoped cs(_crit.get());
_processCalls--;
}
- return retval;
+ return;
}
int32_t AudioConferenceMixerImpl::RegisterMixedStreamCallback(
diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
index 0fab84b..13d30c3 100644
--- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
+++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
@@ -64,7 +64,7 @@
// Module functions
int64_t TimeUntilNextProcess() override;
- int32_t Process() override;
+ void Process() override;
// AudioConferenceMixer functions
int32_t RegisterMixedStreamCallback(
diff --git a/webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc b/webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
index 293bfa0..f393e0f 100644
--- a/webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
+++ b/webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
@@ -145,7 +145,7 @@
EXPECT_CALL(output_receiver, NewMixedAudio(_, _, _, _))
.Times(AtLeast(1));
- EXPECT_EQ(0, mixer->Process());
+ mixer->Process();
for (int i = 0; i < kParticipants; ++i) {
bool is_mixed = participants[i].IsMixed();
diff --git a/webrtc/modules/audio_device/audio_device_impl.cc b/webrtc/modules/audio_device/audio_device_impl.cc
index a11c496..6496f5e 100644
--- a/webrtc/modules/audio_device/audio_device_impl.cc
+++ b/webrtc/modules/audio_device/audio_device_impl.cc
@@ -427,7 +427,7 @@
// new reports exists.
// ----------------------------------------------------------------------------
-int32_t AudioDeviceModuleImpl::Process()
+void AudioDeviceModuleImpl::Process()
{
_lastProcessTime = TickTime::MillisecondTimestamp();
@@ -479,8 +479,6 @@
}
_ptrAudioDevice->ClearRecordingError();
}
-
- return 0;
}
// ============================================================================
diff --git a/webrtc/modules/audio_device/audio_device_impl.h b/webrtc/modules/audio_device/audio_device_impl.h
index c7312bf..d7c48ab 100644
--- a/webrtc/modules/audio_device/audio_device_impl.h
+++ b/webrtc/modules/audio_device/audio_device_impl.h
@@ -45,7 +45,7 @@
virtual ~AudioDeviceModuleImpl();
int64_t TimeUntilNextProcess() override;
- int32_t Process() override;
+ void Process() override;
// Factory methods (resource allocation/deallocation)
static AudioDeviceModule* Create(
diff --git a/webrtc/modules/audio_device/include/fake_audio_device.h b/webrtc/modules/audio_device/include/fake_audio_device.h
index 8b15479..45bf45c 100644
--- a/webrtc/modules/audio_device/include/fake_audio_device.h
+++ b/webrtc/modules/audio_device/include/fake_audio_device.h
@@ -37,7 +37,7 @@
virtual int32_t SetAGC(bool enable) { return 0; }
virtual int32_t StopRecording() { return 0; }
virtual int64_t TimeUntilNextProcess() { return 0; }
- virtual int32_t Process() { return 0; }
+ virtual void Process() {}
virtual int32_t Terminate() { return 0; }
virtual int32_t ActiveAudioLayer(AudioLayer* audioLayer) const { return 0; }
diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
index 72a5ff5..bf60878 100644
--- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
+++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
@@ -162,16 +162,15 @@
kBitrateControllerUpdateIntervalMs - time_since_update_ms, 0);
}
-int32_t BitrateControllerImpl::Process() {
+void BitrateControllerImpl::Process() {
if (TimeUntilNextProcess() > 0)
- return 0;
+ return;
{
rtc::CritScope cs(&critsect_);
bandwidth_estimation_.UpdateEstimate(clock_->TimeInMilliseconds());
}
MaybeTriggerOnNetworkChanged();
last_bitrate_update_ms_ = clock_->TimeInMilliseconds();
- return 0;
}
void BitrateControllerImpl::OnReceivedRtcpReceiverReport(
diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
index 74f3c14..da42b4c 100644
--- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
+++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
@@ -45,7 +45,7 @@
void SetEventLog(RtcEventLog* event_log) override;
int64_t TimeUntilNextProcess() override;
- int32_t Process() override;
+ void Process() override;
private:
class RtcpBandwidthObserverImpl;
diff --git a/webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h b/webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
index 8748696..45b596a 100644
--- a/webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
+++ b/webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
@@ -36,7 +36,7 @@
MOCK_CONST_METHOD1(AvailableBandwidth, bool(uint32_t* bandwidth));
MOCK_METHOD1(SetReservedBitrate, void(uint32_t reserved_bitrate_bps));
- MOCK_METHOD0(Process, int());
+ MOCK_METHOD0(Process, void());
MOCK_METHOD0(TimeUntilNextProcess, int64_t());
};
} // namespace test
diff --git a/webrtc/modules/congestion_controller/congestion_controller.cc b/webrtc/modules/congestion_controller/congestion_controller.cc
index 50074d5..f9e7e01 100644
--- a/webrtc/modules/congestion_controller/congestion_controller.cc
+++ b/webrtc/modules/congestion_controller/congestion_controller.cc
@@ -53,9 +53,9 @@
rbe_->IncomingPacket(arrival_time_ms, payload_size, header, was_paced);
}
- int32_t Process() override {
+ void Process() override {
CriticalSectionScoped cs(crit_sect_.get());
- return rbe_->Process();
+ rbe_->Process();
}
int64_t TimeUntilNextProcess() override {
@@ -241,10 +241,9 @@
remote_bitrate_estimator_->TimeUntilNextProcess());
}
-int32_t CongestionController::Process() {
+void CongestionController::Process() {
bitrate_controller_->Process();
remote_bitrate_estimator_->Process();
- return 0;
}
} // namespace webrtc
diff --git a/webrtc/modules/congestion_controller/include/congestion_controller.h b/webrtc/modules/congestion_controller/include/congestion_controller.h
index f4381e2..2c0b2e3 100644
--- a/webrtc/modules/congestion_controller/include/congestion_controller.h
+++ b/webrtc/modules/congestion_controller/include/congestion_controller.h
@@ -65,7 +65,7 @@
// Implements Module.
int64_t TimeUntilNextProcess() override;
- int32_t Process() override;
+ void Process() override;
private:
Clock* const clock_;
diff --git a/webrtc/modules/include/module.h b/webrtc/modules/include/module.h
index d02aa95..432ed40 100644
--- a/webrtc/modules/include/module.h
+++ b/webrtc/modules/include/module.h
@@ -32,7 +32,7 @@
// Process any pending tasks such as timeouts.
// Called on a worker thread.
- virtual int32_t Process() = 0;
+ virtual void Process() = 0;
// This method is called when the module is attached to a *running* process
// thread or detached from one. In the case of detaching, |process_thread|
diff --git a/webrtc/modules/media_file/media_file_impl.cc b/webrtc/modules/media_file/media_file_impl.cc
index abc7b9d..76bcca7 100644
--- a/webrtc/modules/media_file/media_file_impl.cc
+++ b/webrtc/modules/media_file/media_file_impl.cc
@@ -95,11 +95,10 @@
return -1;
}
-int32_t MediaFileImpl::Process()
+void MediaFileImpl::Process()
{
WEBRTC_TRACE(kTraceWarning, kTraceFile, _id,
"Process: This method is not used by MediaFile class.");
- return -1;
}
int32_t MediaFileImpl::PlayoutAudioData(int8_t* buffer,
diff --git a/webrtc/modules/media_file/media_file_impl.h b/webrtc/modules/media_file/media_file_impl.h
index c23f514..677098e 100644
--- a/webrtc/modules/media_file/media_file_impl.h
+++ b/webrtc/modules/media_file/media_file_impl.h
@@ -26,7 +26,7 @@
MediaFileImpl(const int32_t id);
~MediaFileImpl();
- int32_t Process() override;
+ void Process() override;
int64_t TimeUntilNextProcess() override;
// MediaFile functions
diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc
index c32d365..6998650 100644
--- a/webrtc/modules/pacing/paced_sender.cc
+++ b/webrtc/modules/pacing/paced_sender.cc
@@ -373,7 +373,7 @@
return std::max<int64_t>(kMinPacketLimitMs - elapsed_time_ms, 0);
}
-int32_t PacedSender::Process() {
+void PacedSender::Process() {
int64_t now_us = clock_->TimeInMicroseconds();
CriticalSectionScoped cs(critsect_.get());
int64_t elapsed_time_ms = (now_us - time_last_update_us_ + 500) / 1000;
@@ -402,7 +402,7 @@
}
while (!packets_->Empty()) {
if (media_budget_->bytes_remaining() == 0 && !prober_->IsProbing())
- return 0;
+ return;
// Since we need to release the lock in order to send, we first pop the
// element from the priority queue but keep it in storage, so that we can
@@ -413,17 +413,17 @@
// Send succeeded, remove it from the queue.
packets_->FinalizePop(packet);
if (prober_->IsProbing())
- return 0;
+ return;
} else {
// Send failed, put it back into the queue.
packets_->CancelPop(packet);
- return 0;
+ return;
}
}
// TODO(holmer): Remove the paused_ check when issue 5307 has been fixed.
if (paused_ || !packets_->Empty())
- return 0;
+ return;
size_t padding_needed;
if (prober_->IsProbing()) {
@@ -434,7 +434,6 @@
if (padding_needed > 0)
SendPadding(static_cast<size_t>(padding_needed));
- return 0;
}
bool PacedSender::SendPacket(const paced_sender::Packet& packet) {
diff --git a/webrtc/modules/pacing/paced_sender.h b/webrtc/modules/pacing/paced_sender.h
index 62e794f..e2c757d 100644
--- a/webrtc/modules/pacing/paced_sender.h
+++ b/webrtc/modules/pacing/paced_sender.h
@@ -122,7 +122,7 @@
int64_t TimeUntilNextProcess() override;
// Process any pending packets in the queue(s).
- int32_t Process() override;
+ void Process() override;
private:
// Updates the number of bytes that can be sent for the next time interval.
diff --git a/webrtc/modules/pacing/paced_sender_unittest.cc b/webrtc/modules/pacing/paced_sender_unittest.cc
index 70ffc75..2c13833 100644
--- a/webrtc/modules/pacing/paced_sender_unittest.cc
+++ b/webrtc/modules/pacing/paced_sender_unittest.cc
@@ -222,12 +222,12 @@
.Times(3)
.WillRepeatedly(Return(true));
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
- EXPECT_EQ(0, send_bucket_->Process());
+ send_bucket_->Process();
}
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
- EXPECT_EQ(0, send_bucket_->Process());
+ send_bucket_->Process();
SendAndExpectPacket(PacedSender::kNormalPriority,
ssrc,
sequence_number++,
@@ -290,12 +290,12 @@
.WillRepeatedly(Return(true));
}
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
- EXPECT_EQ(0, send_bucket_->Process());
+ send_bucket_->Process();
}
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
- EXPECT_EQ(0, send_bucket_->Process());
+ send_bucket_->Process();
SendAndExpectPacket(PacedSender::kNormalPriority,
ssrc,
sequence_number++,
@@ -373,7 +373,7 @@
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
- EXPECT_EQ(0, send_bucket_->Process());
+ send_bucket_->Process();
// 5 milliseconds later we have enough budget to send some padding.
EXPECT_CALL(callback_, TimeToSendPadding(250)).Times(1).
@@ -381,7 +381,7 @@
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
- EXPECT_EQ(0, send_bucket_->Process());
+ send_bucket_->Process();
}
TEST_F(PacedSenderTest, VerifyPaddingUpToBitrate) {
@@ -486,7 +486,7 @@
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
- EXPECT_EQ(0, send_bucket_->Process());
+ send_bucket_->Process();
EXPECT_CALL(callback_,
TimeToSendPacket(
@@ -497,7 +497,7 @@
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
- EXPECT_EQ(0, send_bucket_->Process());
+ send_bucket_->Process();
}
TEST_F(PacedSenderTest, HighPrioDoesntAffectBudget) {
@@ -587,7 +587,7 @@
for (int i = 0; i < 10; ++i) {
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
- EXPECT_EQ(0, send_bucket_->Process());
+ send_bucket_->Process();
}
// Expect high prio packets to come out first followed by all packets in the
// way they were added.
@@ -602,7 +602,7 @@
EXPECT_EQ(5, send_bucket_->TimeUntilNextProcess());
clock_.AdvanceTimeMilliseconds(5);
EXPECT_EQ(0, send_bucket_->TimeUntilNextProcess());
- EXPECT_EQ(0, send_bucket_->Process());
+ send_bucket_->Process();
EXPECT_EQ(0, send_bucket_->QueueInMs());
}
diff --git a/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h b/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h
index 588e1e7..2c35df8 100644
--- a/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h
+++ b/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h
@@ -37,7 +37,7 @@
// From Module.
MOCK_METHOD0(TimeUntilNextProcess, int64_t());
- MOCK_METHOD0(Process, int32_t());
+ MOCK_METHOD0(Process, void());
MOCK_METHOD1(SetMinBitrate, void(int));
};
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
index db54cab..bf3fdc2 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
@@ -333,9 +333,7 @@
}
}
-int32_t RemoteBitrateEstimatorAbsSendTime::Process() {
- return 0;
-}
+void RemoteBitrateEstimatorAbsSendTime::Process() {}
int64_t RemoteBitrateEstimatorAbsSendTime::TimeUntilNextProcess() {
const int64_t kDisabledModuleTime = 1000;
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
index 69b7773..39d3e03 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
@@ -82,7 +82,7 @@
// every other second) for streams to be timed out properly. Therefore it
// shouldn't be detached from the ProcessThread except if it's about to be
// deleted.
- int32_t Process() override;
+ void Process() override;
int64_t TimeUntilNextProcess() override;
void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
void RemoveStream(uint32_t ssrc) override;
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc
index c1a4988..7d39b03 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc
@@ -93,10 +93,10 @@
IncomingPacket(0, 1000, clock_.TimeInMilliseconds(), 0, 0, true);
clock_.AdvanceTimeMilliseconds(kStreamTimeOutMs + 1);
// Trigger timeout.
- EXPECT_EQ(0, bitrate_estimator_->Process());
+ bitrate_estimator_->Process();
clock_.AdvanceTimeMilliseconds(kProcessIntervalMs);
// This shouldn't crash.
- EXPECT_EQ(0, bitrate_estimator_->Process());
+ bitrate_estimator_->Process();
}
TEST_F(RemoteBitrateEstimatorAbsSendTimeTest, TestProbeDetection) {
@@ -118,7 +118,7 @@
true);
}
- EXPECT_EQ(0, bitrate_estimator_->Process());
+ bitrate_estimator_->Process();
EXPECT_TRUE(bitrate_observer_->updated());
EXPECT_GT(bitrate_observer_->latest_bitrate(), 1500000u);
}
@@ -140,7 +140,7 @@
false);
}
- EXPECT_EQ(0, bitrate_estimator_->Process());
+ bitrate_estimator_->Process();
EXPECT_TRUE(bitrate_observer_->updated());
EXPECT_GT(bitrate_observer_->latest_bitrate(), 800000u);
}
@@ -171,7 +171,7 @@
AbsSendTime(send_time_ms, 1000), true);
}
- EXPECT_EQ(0, bitrate_estimator_->Process());
+ bitrate_estimator_->Process();
EXPECT_TRUE(bitrate_observer_->updated());
EXPECT_NEAR(bitrate_observer_->latest_bitrate(), 800000u, 10000);
}
@@ -191,7 +191,7 @@
AbsSendTime(send_time_ms, 1000), true);
}
- EXPECT_EQ(0, bitrate_estimator_->Process());
+ bitrate_estimator_->Process();
EXPECT_TRUE(bitrate_observer_->updated());
EXPECT_GT(bitrate_observer_->latest_bitrate(), 800000u);
}
@@ -210,7 +210,7 @@
AbsSendTime(send_time_ms, 1000), true);
}
- EXPECT_EQ(0, bitrate_estimator_->Process());
+ bitrate_estimator_->Process();
EXPECT_FALSE(bitrate_observer_->updated());
}
@@ -228,7 +228,7 @@
AbsSendTime(send_time_ms, 1000), true);
}
- EXPECT_EQ(0, bitrate_estimator_->Process());
+ bitrate_estimator_->Process();
EXPECT_TRUE(bitrate_observer_->updated());
EXPECT_NEAR(bitrate_observer_->latest_bitrate(), 1140000, 10000);
}
@@ -248,7 +248,7 @@
AbsSendTime(send_time_ms, 1000), true);
}
- EXPECT_EQ(0, bitrate_estimator_->Process());
+ bitrate_estimator_->Process();
EXPECT_TRUE(bitrate_observer_->updated());
EXPECT_NEAR(bitrate_observer_->latest_bitrate(), 4000000u, 10000);
}
@@ -265,7 +265,7 @@
true);
}
- EXPECT_EQ(0, bitrate_estimator_->Process());
+ bitrate_estimator_->Process();
EXPECT_FALSE(bitrate_observer_->updated());
// Followed by a probe with 1000 bytes packets, should be detected as a
@@ -280,7 +280,7 @@
// Wait long enough so that we can call Process again.
clock_.AdvanceTimeMilliseconds(1000);
- EXPECT_EQ(0, bitrate_estimator_->Process());
+ bitrate_estimator_->Process();
EXPECT_TRUE(bitrate_observer_->updated());
EXPECT_NEAR(bitrate_observer_->latest_bitrate(), 800000u, 10000);
}
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
index 2b74043..9a1bbc1 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
@@ -118,16 +118,15 @@
}
}
-int32_t RemoteBitrateEstimatorSingleStream::Process() {
+void RemoteBitrateEstimatorSingleStream::Process() {
if (TimeUntilNextProcess() > 0) {
- return 0;
+ return;
}
{
CriticalSectionScoped cs(crit_sect_.get());
UpdateEstimate(clock_->TimeInMilliseconds());
}
last_process_time_ = clock_->TimeInMilliseconds();
- return 0;
}
int64_t RemoteBitrateEstimatorSingleStream::TimeUntilNextProcess() {
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
index 001311b..f3a208a 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
@@ -31,7 +31,7 @@
size_t payload_size,
const RTPHeader& header,
bool was_paced) override;
- int32_t Process() override;
+ void Process() override;
int64_t TimeUntilNextProcess() override;
void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
void RemoveStream(uint32_t ssrc) override;
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc
index ee17ad7..51f93f9 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc
+++ b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc
@@ -71,9 +71,9 @@
return time_until_next;
}
-int32_t RemoteEstimatorProxy::Process() {
+void RemoteEstimatorProxy::Process() {
if (TimeUntilNextProcess() > 0)
- return 0;
+ return;
last_process_time_ms_ = clock_->TimeInMilliseconds();
bool more_to_build = true;
@@ -86,8 +86,6 @@
more_to_build = false;
}
}
-
- return 0;
}
void RemoteEstimatorProxy::OnPacketArrival(uint16_t sequence_number,
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h
index 7145543..93d5244 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h
+++ b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h
@@ -47,7 +47,7 @@
void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override {}
void SetMinBitrate(int min_bitrate_bps) override {}
int64_t TimeUntilNextProcess() override;
- int32_t Process() override;
+ void Process() override;
static const int kDefaultProcessIntervalMs;
static const int kBackWindowMs;
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe.cc
index c667b68..5e282c6 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/bwe.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/bwe.cc
@@ -67,7 +67,7 @@
int64_t TimeUntilNextProcess() override {
return std::numeric_limits<int64_t>::max();
}
- int Process() override { return 0; }
+ void Process() override {}
private:
RTC_DISALLOW_COPY_AND_ASSIGN(NullBweSender);
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc
index 066b4b5..b91ee6d 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc
@@ -238,8 +238,7 @@
return 100;
}
-int NadaBweSender::Process() {
- return 0;
+void NadaBweSender::Process() {
}
void NadaBweSender::AcceleratedRampUp(const NadaFeedback& fb) {
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h
index bf23d09..ab45416 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h
@@ -71,7 +71,7 @@
void GiveFeedback(const FeedbackPacket& feedback) override;
void OnPacketsSent(const Packets& packets) override {}
int64_t TimeUntilNextProcess() override;
- int Process() override;
+ void Process() override;
void AcceleratedRampUp(const NadaFeedback& fb);
void AcceleratedRampDown(const NadaFeedback& fb);
void GradualRateUpdate(const NadaFeedback& fb,
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc
index 3f049df..d469e67 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc
@@ -53,8 +53,8 @@
return bitrate_controller_->TimeUntilNextProcess();
}
-int RembBweSender::Process() {
- return bitrate_controller_->Process();
+void RembBweSender::Process() {
+ bitrate_controller_->Process();
}
int RembBweSender::GetFeedbackIntervalMs() const {
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h
index c6fddf7..058873e 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h
@@ -35,7 +35,7 @@
void GiveFeedback(const FeedbackPacket& feedback) override;
void OnPacketsSent(const Packets& packets) override {}
int64_t TimeUntilNextProcess() override;
- int Process() override;
+ void Process() override;
protected:
rtc::scoped_ptr<BitrateController> bitrate_controller_;
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
index c55bb1a..36dff1f 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
@@ -110,9 +110,9 @@
return bitrate_controller_->TimeUntilNextProcess();
}
-int FullBweSender::Process() {
+void FullBweSender::Process() {
rbe_->Process();
- return bitrate_controller_->Process();
+ bitrate_controller_->Process();
}
SendSideBweReceiver::SendSideBweReceiver(int flow_id)
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h
index 57d0432..9832eb2 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h
@@ -31,7 +31,7 @@
void OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs,
uint32_t bitrate) override;
int64_t TimeUntilNextProcess() override;
- int Process() override;
+ void Process() override;
protected:
rtc::scoped_ptr<BitrateController> bitrate_controller_;
diff --git a/webrtc/modules/rtp_rtcp/include/receive_statistics.h b/webrtc/modules/rtp_rtcp/include/receive_statistics.h
index b4a7cd0..cc21e22 100644
--- a/webrtc/modules/rtp_rtcp/include/receive_statistics.h
+++ b/webrtc/modules/rtp_rtcp/include/receive_statistics.h
@@ -90,7 +90,7 @@
StatisticianMap GetActiveStatisticians() const override;
StreamStatistician* GetStatistician(uint32_t ssrc) const override;
int64_t TimeUntilNextProcess() override;
- int32_t Process() override;
+ void Process() override;
void SetMaxReorderingThreshold(int max_reordering_threshold) override;
void RegisterRtcpStatisticsCallback(
RtcpStatisticsCallback* callback) override;
diff --git a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
index 796be13..d4d6e14 100644
--- a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
+++ b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
@@ -249,7 +249,7 @@
MOCK_METHOD0(TimeUntilNextProcess,
int64_t());
MOCK_METHOD0(Process,
- int32_t());
+ void());
MOCK_METHOD1(RegisterSendFrameCountObserver,
void(FrameCountObserver*));
MOCK_CONST_METHOD0(GetSendFrameCountObserver,
diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
index 24f1e2c..022fc96 100644
--- a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
@@ -454,14 +454,13 @@
}
}
-int32_t ReceiveStatisticsImpl::Process() {
+void ReceiveStatisticsImpl::Process() {
CriticalSectionScoped cs(receive_statistics_lock_.get());
for (StatisticianImplMap::iterator it = statisticians_.begin();
it != statisticians_.end(); ++it) {
it->second->ProcessBitrate();
}
last_rate_update_ms_ = clock_->TimeInMilliseconds();
- return 0;
}
int64_t ReceiveStatisticsImpl::TimeUntilNextProcess() {
@@ -530,7 +529,7 @@
int64_t NullReceiveStatistics::TimeUntilNextProcess() { return 0; }
-int32_t NullReceiveStatistics::Process() { return 0; }
+void NullReceiveStatistics::Process() {}
void NullReceiveStatistics::RegisterRtcpStatisticsCallback(
RtcpStatisticsCallback* callback) {}
diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h
index 025dcd4..6da8334 100644
--- a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h
+++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h
@@ -112,7 +112,7 @@
void SetMaxReorderingThreshold(int max_reordering_threshold) override;
// Implement Module.
- int32_t Process() override;
+ void Process() override;
int64_t TimeUntilNextProcess() override;
void RegisterRtcpStatisticsCallback(
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index 07889f9..7f33bc2 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -118,7 +118,7 @@
}
// Process any pending tasks such as timeouts (non time critical events).
-int32_t ModuleRtpRtcpImpl::Process() {
+void ModuleRtpRtcpImpl::Process() {
const int64_t now = clock_->TimeInMilliseconds();
last_process_time_ = now;
@@ -202,7 +202,6 @@
// A receiver has timed out
rtcp_receiver_.UpdateTMMBR();
}
- return 0;
}
void ModuleRtpRtcpImpl::SetRtxSendStatus(int mode) {
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h
index 3621f9b..8c211e4 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h
@@ -35,7 +35,7 @@
int64_t TimeUntilNextProcess() override;
// Process any pending tasks such as timeouts.
- int32_t Process() override;
+ void Process() override;
// Receiver part.
diff --git a/webrtc/modules/utility/source/process_thread_impl_unittest.cc b/webrtc/modules/utility/source/process_thread_impl_unittest.cc
index 0b35fad..4f70e8a 100644
--- a/webrtc/modules/utility/source/process_thread_impl_unittest.cc
+++ b/webrtc/modules/utility/source/process_thread_impl_unittest.cc
@@ -28,7 +28,7 @@
class MockModule : public Module {
public:
MOCK_METHOD0(TimeUntilNextProcess, int64_t());
- MOCK_METHOD0(Process, int32_t());
+ MOCK_METHOD0(Process, void());
MOCK_METHOD1(ProcessThreadAttached, void(ProcessThread*));
};
@@ -77,8 +77,8 @@
MockModule module;
EXPECT_CALL(module, TimeUntilNextProcess()).WillRepeatedly(Return(0));
EXPECT_CALL(module, Process())
- .WillOnce(DoAll(SetEvent(event.get()), Return(0)))
- .WillRepeatedly(Return(0));
+ .WillOnce(DoAll(SetEvent(event.get()), Return()))
+ .WillRepeatedly(Return());
EXPECT_CALL(module, ProcessThreadAttached(&thread)).Times(1);
thread.RegisterModule(&module);
@@ -97,8 +97,8 @@
MockModule module;
EXPECT_CALL(module, TimeUntilNextProcess()).WillRepeatedly(Return(0));
EXPECT_CALL(module, Process())
- .WillOnce(DoAll(SetEvent(event.get()), Return(0)))
- .WillRepeatedly(Return(0));
+ .WillOnce(DoAll(SetEvent(event.get()), Return()))
+ .WillRepeatedly(Return());
thread.RegisterModule(&module);
@@ -122,8 +122,8 @@
EXPECT_CALL(module, Process())
.WillOnce(DoAll(SetEvent(event.get()),
Increment(&process_count),
- Return(0)))
- .WillRepeatedly(DoAll(Increment(&process_count), Return(0)));
+ Return()))
+ .WillRepeatedly(DoAll(Increment(&process_count), Return()));
thread.RegisterModule(&module);
@@ -163,8 +163,8 @@
EXPECT_CALL(module, Process())
.WillOnce(DoAll(SetTimestamp(&called_time),
SetEvent(event.get()),
- Return(0)))
- .WillRepeatedly(Return(0));
+ Return()))
+ .WillRepeatedly(Return());
EXPECT_CALL(module, ProcessThreadAttached(&thread)).Times(1);
thread.RegisterModule(&module);
@@ -225,7 +225,7 @@
.WillRepeatedly(Return(20));
EXPECT_CALL(module, Process())
.WillRepeatedly(DoAll(Increment(&callback_count),
- Return(0)));
+ Return()));
EXPECT_CALL(module, ProcessThreadAttached(&thread)).Times(1);
thread.RegisterModule(&module);
@@ -269,10 +269,9 @@
Return(1000)))
.WillOnce(Return(1000));
EXPECT_CALL(module, Process())
- .WillOnce(DoAll(SetTimestamp(&called_time),
- SetEvent(called.get()),
- Return(0)))
- .WillRepeatedly(Return(0));
+ .WillOnce(
+ DoAll(SetTimestamp(&called_time), SetEvent(called.get()), Return()))
+ .WillRepeatedly(Return());
EXPECT_CALL(module, ProcessThreadAttached(&thread)).Times(1);
thread.RegisterModule(&module);
diff --git a/webrtc/modules/video_capture/video_capture_impl.cc b/webrtc/modules/video_capture/video_capture_impl.cc
index 90730cd..3013a7d 100644
--- a/webrtc/modules/video_capture/video_capture_impl.cc
+++ b/webrtc/modules/video_capture/video_capture_impl.cc
@@ -93,7 +93,7 @@
}
// Process any pending tasks such as timeouts
-int32_t VideoCaptureImpl::Process()
+void VideoCaptureImpl::Process()
{
CriticalSectionScoped cs(&_callBackCs);
@@ -136,8 +136,6 @@
}
_lastProcessFrameCount = _incomingFrameTimes[0];
-
- return 0;
}
VideoCaptureImpl::VideoCaptureImpl(const int32_t id)
diff --git a/webrtc/modules/video_capture/video_capture_impl.h b/webrtc/modules/video_capture/video_capture_impl.h
index 1644217..4aa3939 100644
--- a/webrtc/modules/video_capture/video_capture_impl.h
+++ b/webrtc/modules/video_capture/video_capture_impl.h
@@ -79,7 +79,7 @@
// Module handling
virtual int64_t TimeUntilNextProcess();
- virtual int32_t Process();
+ virtual void Process();
// Implement VideoCaptureExternal
// |capture_time| must be specified in NTP time format in milliseconds.
diff --git a/webrtc/modules/video_coding/test/vcm_payload_sink_factory.cc b/webrtc/modules/video_coding/test/vcm_payload_sink_factory.cc
index c9ec372..88242fd 100644
--- a/webrtc/modules/video_coding/test/vcm_payload_sink_factory.cc
+++ b/webrtc/modules/video_coding/test/vcm_payload_sink_factory.cc
@@ -74,9 +74,7 @@
bool Process() {
if (vcm_->TimeUntilNextProcess() <= 0) {
- if (vcm_->Process() < 0) {
- return false;
- }
+ vcm_->Process();
}
return true;
}
diff --git a/webrtc/modules/video_coding/video_coding_impl.cc b/webrtc/modules/video_coding/video_coding_impl.cc
index 7f74b41..7d6d177 100644
--- a/webrtc/modules/video_coding/video_coding_impl.cc
+++ b/webrtc/modules/video_coding/video_coding_impl.cc
@@ -94,12 +94,9 @@
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,
diff --git a/webrtc/modules/video_coding/video_coding_impl.h b/webrtc/modules/video_coding/video_coding_impl.h
index 581ab0e..dc766b1 100644
--- a/webrtc/modules/video_coding/video_coding_impl.h
+++ b/webrtc/modules/video_coding/video_coding_impl.h
@@ -93,7 +93,7 @@
bool VideoSuspended() const;
int64_t TimeUntilNextProcess();
- int32_t Process();
+ void Process();
private:
void SetEncoderParameters(EncoderParameters params)
@@ -172,7 +172,7 @@
int32_t SetVideoProtection(VCMVideoProtection videoProtection, bool enable);
int64_t TimeUntilNextProcess();
- int32_t Process();
+ void Process();
void RegisterPreDecodeImageCallback(EncodedImageCallback* observer);
void TriggerDecoderShutdown();
diff --git a/webrtc/modules/video_coding/video_coding_robustness_unittest.cc b/webrtc/modules/video_coding/video_coding_robustness_unittest.cc
index 51cffcd..eb5d485 100644
--- a/webrtc/modules/video_coding/video_coding_robustness_unittest.cc
+++ b/webrtc/modules/video_coding/video_coding_robustness_unittest.cc
@@ -113,20 +113,20 @@
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 @@
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 @@
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);
diff --git a/webrtc/modules/video_coding/video_receiver.cc b/webrtc/modules/video_coding/video_receiver.cc
index 02d51a7..e7844d0 100644
--- a/webrtc/modules/video_coding/video_receiver.cc
+++ b/webrtc/modules/video_coding/video_receiver.cc
@@ -63,9 +63,7 @@
#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 @@
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 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 @@
}
}
}
-
- return returnValue;
}
int64_t VideoReceiver::TimeUntilNextProcess() {
diff --git a/webrtc/modules/video_coding/video_receiver_unittest.cc b/webrtc/modules/video_coding/video_receiver_unittest.cc
index 820ce9a..693fdc6 100644
--- a/webrtc/modules/video_coding/video_receiver_unittest.cc
+++ b/webrtc/modules/video_coding/video_receiver_unittest.cc
@@ -52,7 +52,7 @@
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 @@
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));
}
diff --git a/webrtc/modules/video_coding/video_sender.cc b/webrtc/modules/video_coding/video_sender.cc
index f14f852..d92ad45 100644
--- a/webrtc/modules/video_coding/video_sender.cc
+++ b/webrtc/modules/video_coding/video_sender.cc
@@ -53,9 +53,7 @@
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 @@
// updated even if bandwidth hasn't changed.
encoder_params_.input_frame_rate = _mediaOpt.InputFrameRate();
}
-
- return returnValue;
}
int64_t VideoSender::TimeUntilNextProcess() {
diff --git a/webrtc/modules/video_render/video_render.h b/webrtc/modules/video_render/video_render.h
index a193a18..84c9536 100644
--- a/webrtc/modules/video_render/video_render.h
+++ b/webrtc/modules/video_render/video_render.h
@@ -53,7 +53,7 @@
static void DestroyVideoRender(VideoRender* module);
int64_t TimeUntilNextProcess() override = 0;
- int32_t Process() override = 0;
+ void Process() override = 0;
/**************************************************************************
*
diff --git a/webrtc/modules/video_render/video_render_impl.cc b/webrtc/modules/video_render/video_render_impl.cc
index d2a074b..2f145a7 100644
--- a/webrtc/modules/video_render/video_render_impl.cc
+++ b/webrtc/modules/video_render/video_render_impl.cc
@@ -119,11 +119,7 @@
// Not used
return 50;
}
-int32_t ModuleVideoRenderImpl::Process()
-{
- // Not used
- return 0;
-}
+void ModuleVideoRenderImpl::Process() {}
void*
ModuleVideoRenderImpl::Window()
diff --git a/webrtc/modules/video_render/video_render_impl.h b/webrtc/modules/video_render/video_render_impl.h
index ce93cea..12244a6 100644
--- a/webrtc/modules/video_render/video_render_impl.h
+++ b/webrtc/modules/video_render/video_render_impl.h
@@ -35,7 +35,7 @@
virtual ~ModuleVideoRenderImpl();
virtual int64_t TimeUntilNextProcess();
- virtual int32_t Process();
+ virtual void Process();
/*
* Returns the render window
diff --git a/webrtc/modules/video_render/video_render_internal_impl.cc b/webrtc/modules/video_render/video_render_internal_impl.cc
index 1fed26e..a9ae0b0 100644
--- a/webrtc/modules/video_render/video_render_internal_impl.cc
+++ b/webrtc/modules/video_render/video_render_internal_impl.cc
@@ -299,11 +299,7 @@
// Not used
return 50;
}
-int32_t ModuleVideoRenderImpl::Process()
-{
- // Not used
- return 0;
-}
+void ModuleVideoRenderImpl::Process() {}
void*
ModuleVideoRenderImpl::Window()
diff --git a/webrtc/video/call_stats.cc b/webrtc/video/call_stats.cc
index 1ee4625..8874c2b 100644
--- a/webrtc/video/call_stats.cc
+++ b/webrtc/video/call_stats.cc
@@ -109,11 +109,11 @@
return last_process_time_ + kUpdateIntervalMs - clock_->TimeInMilliseconds();
}
-int32_t CallStats::Process() {
+void CallStats::Process() {
rtc::CritScope cs(&crit_);
int64_t now = clock_->TimeInMilliseconds();
if (now < last_process_time_ + kUpdateIntervalMs)
- return 0;
+ return;
last_process_time_ = now;
@@ -132,7 +132,6 @@
sum_avg_rtt_ms_ += avg_rtt_ms_;
++num_avg_rtt_;
}
- return 0;
}
int64_t CallStats::avg_rtt_ms() const {
diff --git a/webrtc/video/call_stats.h b/webrtc/video/call_stats.h
index 385f6ff..bb3670c 100644
--- a/webrtc/video/call_stats.h
+++ b/webrtc/video/call_stats.h
@@ -34,7 +34,7 @@
// Implements Module, to use the process thread.
int64_t TimeUntilNextProcess() override;
- int32_t Process() override;
+ void Process() override;
// Returns a RtcpRttStats to register at a statistics provider. The object
// has the same lifetime as the CallStats instance.
diff --git a/webrtc/video/overuse_frame_detector.cc b/webrtc/video/overuse_frame_detector.cc
index 9f12137..18c6b9e 100644
--- a/webrtc/video/overuse_frame_detector.cc
+++ b/webrtc/video/overuse_frame_detector.cc
@@ -297,14 +297,14 @@
}
}
-int32_t OveruseFrameDetector::Process() {
+void OveruseFrameDetector::Process() {
RTC_DCHECK(processing_thread_.CalledOnValidThread());
int64_t now = clock_->TimeInMilliseconds();
// Used to protect against Process() being called too often.
if (now < next_process_time_ms_)
- return 0;
+ return;
next_process_time_ms_ = now + kProcessIntervalMs;
@@ -313,7 +313,7 @@
rtc::CritScope cs(&crit_);
++num_process_times_;
if (num_process_times_ <= options_.min_process_count || !metrics_)
- return 0;
+ return;
current_metrics = *metrics_;
}
@@ -358,8 +358,6 @@
<< " encode usage " << current_metrics.encode_usage_percent
<< " overuse detections " << num_overuse_detections_
<< " rampup delay " << rampup_delay;
-
- return 0;
}
bool OveruseFrameDetector::IsOverusing(const CpuOveruseMetrics& metrics) {
diff --git a/webrtc/video/overuse_frame_detector.h b/webrtc/video/overuse_frame_detector.h
index 80c9b55..43c9e28 100644
--- a/webrtc/video/overuse_frame_detector.h
+++ b/webrtc/video/overuse_frame_detector.h
@@ -90,7 +90,7 @@
// Implements Module.
int64_t TimeUntilNextProcess() override;
- int32_t Process() override;
+ void Process() override;
private:
class SendProcessingUsage;
diff --git a/webrtc/video/vie_sync_module.cc b/webrtc/video/vie_sync_module.cc
index dc924fb..f8376e5 100644
--- a/webrtc/video/vie_sync_module.cc
+++ b/webrtc/video/vie_sync_module.cc
@@ -88,14 +88,14 @@
return kSyncIntervalMs - (TickTime::Now() - last_sync_time_).Milliseconds();
}
-int32_t ViESyncModule::Process() {
+void ViESyncModule::Process() {
rtc::CritScope lock(&data_cs_);
last_sync_time_ = TickTime::Now();
const int current_video_delay_ms = vcm_->Delay();
if (voe_channel_id_ == -1) {
- return 0;
+ return;
}
assert(video_rtp_rtcp_ && voe_sync_interface_);
assert(sync_.get());
@@ -105,7 +105,7 @@
if (voe_sync_interface_->GetDelayEstimate(voe_channel_id_,
&audio_jitter_buffer_delay_ms,
&playout_buffer_delay_ms) != 0) {
- return 0;
+ return;
}
const int current_audio_delay_ms = audio_jitter_buffer_delay_ms +
playout_buffer_delay_ms;
@@ -114,26 +114,26 @@
RtpReceiver* voice_receiver = NULL;
if (0 != voe_sync_interface_->GetRtpRtcp(voe_channel_id_, &voice_rtp_rtcp,
&voice_receiver)) {
- return 0;
+ return;
}
assert(voice_rtp_rtcp);
assert(voice_receiver);
if (UpdateMeasurements(&video_measurement_, *video_rtp_rtcp_,
*video_receiver_) != 0) {
- return 0;
+ return;
}
if (UpdateMeasurements(&audio_measurement_, *voice_rtp_rtcp,
*voice_receiver) != 0) {
- return 0;
+ return;
}
int relative_delay_ms;
// Calculate how much later or earlier the audio stream is compared to video.
if (!sync_->ComputeRelativeDelay(audio_measurement_, video_measurement_,
&relative_delay_ms)) {
- return 0;
+ return;
}
TRACE_COUNTER1("webrtc", "SyncCurrentVideoDelay", current_video_delay_ms);
@@ -147,7 +147,7 @@
current_audio_delay_ms,
&target_audio_delay_ms,
&target_video_delay_ms)) {
- return 0;
+ return;
}
if (voe_sync_interface_->SetMinimumPlayoutDelay(
@@ -155,7 +155,6 @@
LOG(LS_ERROR) << "Error setting voice delay.";
}
vcm_->SetMinimumPlayoutDelay(target_video_delay_ms);
- return 0;
}
} // namespace webrtc
diff --git a/webrtc/video/vie_sync_module.h b/webrtc/video/vie_sync_module.h
index 779eb00..5724ce7 100644
--- a/webrtc/video/vie_sync_module.h
+++ b/webrtc/video/vie_sync_module.h
@@ -40,7 +40,7 @@
// Implements Module.
int64_t TimeUntilNextProcess() override;
- int32_t Process() override;
+ void Process() override;
private:
rtc::CriticalSection data_cs_;
diff --git a/webrtc/voice_engine/monitor_module.cc b/webrtc/voice_engine/monitor_module.cc
index 2d8f4d4..fb3c2b4 100644
--- a/webrtc/voice_engine/monitor_module.cc
+++ b/webrtc/voice_engine/monitor_module.cc
@@ -57,7 +57,7 @@
return kAverageProcessUpdateTimeMs - (now - _lastProcessTime);
}
-int32_t
+void
MonitorModule::Process()
{
_lastProcessTime = TickTime::MillisecondTimestamp();
@@ -66,7 +66,6 @@
{
_observerPtr->OnPeriodicProcess();
}
- return 0;
}
} // namespace voe
diff --git a/webrtc/voice_engine/monitor_module.h b/webrtc/voice_engine/monitor_module.h
index 5539915..f026f72 100644
--- a/webrtc/voice_engine/monitor_module.h
+++ b/webrtc/voice_engine/monitor_module.h
@@ -42,7 +42,7 @@
public: // module
int64_t TimeUntilNextProcess() override;
- int32_t Process() override;
+ void Process() override;
private:
rtc::CriticalSection _callbackCritSect;
diff --git a/webrtc/voice_engine/output_mixer.cc b/webrtc/voice_engine/output_mixer.cc
index aa50e0b..1c9525a 100644
--- a/webrtc/voice_engine/output_mixer.cc
+++ b/webrtc/voice_engine/output_mixer.cc
@@ -224,7 +224,8 @@
int32_t
OutputMixer::MixActiveChannels()
{
- return _mixerModule.Process();
+ _mixerModule.Process();
+ return 0;
}
int