Delete VCMSendStatisticsCallback and corresponding use of ProcessThread
Bug: webrtc:8422
Change-Id: I5863266a0226d475c4fdd810f2f6f1acdf922df3
Reviewed-on: https://webrtc-review.googlesource.com/14880
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20440}diff --git a/modules/video_coding/include/video_coding_defines.h b/modules/video_coding/include/video_coding_defines.h
index 5bf019d..08497b0 100644
--- a/modules/video_coding/include/video_coding_defines.h
+++ b/modules/video_coding/include/video_coding_defines.h
@@ -84,16 +84,6 @@
virtual ~VCMReceiveCallback() {}
};
-// Callback class used for informing the user of the bit rate and frame rate,
-// and the name of the encoder.
-class VCMSendStatisticsCallback {
- public:
- virtual void SendStatistics(uint32_t bitRate, uint32_t frameRate) = 0;
-
- protected:
- virtual ~VCMSendStatisticsCallback() {}
-};
-
// Callback class used for informing the user of the incoming bit rate and frame
// rate.
class VCMReceiveStatisticsCallback {
diff --git a/modules/video_coding/video_coding_impl.cc b/modules/video_coding/video_coding_impl.cc
index 61350fa..a4c6f4d 100644
--- a/modules/video_coding/video_coding_impl.cc
+++ b/modules/video_coding/video_coding_impl.cc
@@ -83,7 +83,7 @@
KeyFrameRequestSender* keyframe_request_sender,
EncodedImageCallback* pre_decode_image_callback)
: VideoCodingModule(),
- sender_(clock, &post_encode_callback_, nullptr),
+ sender_(clock, &post_encode_callback_),
timing_(new VCMTiming(clock)),
receiver_(clock,
event_factory,
@@ -95,15 +95,12 @@
virtual ~VideoCodingModuleImpl() {}
int64_t TimeUntilNextProcess() override {
- int64_t sender_time = sender_.TimeUntilNextProcess();
int64_t receiver_time = receiver_.TimeUntilNextProcess();
- RTC_DCHECK_GE(sender_time, 0);
RTC_DCHECK_GE(receiver_time, 0);
- return VCM_MIN(sender_time, receiver_time);
+ return receiver_time;
}
void Process() override {
- sender_.Process();
receiver_.Process();
}
diff --git a/modules/video_coding/video_coding_impl.h b/modules/video_coding/video_coding_impl.h
index d46f9cd..0bd5ab7 100644
--- a/modules/video_coding/video_coding_impl.h
+++ b/modules/video_coding/video_coding_impl.h
@@ -58,13 +58,12 @@
int64_t _latestMs;
};
-class VideoSender : public Module {
+class VideoSender {
public:
typedef VideoCodingModule::SenderNackMode SenderNackMode;
VideoSender(Clock* clock,
- EncodedImageCallback* post_encode_callback,
- VCMSendStatisticsCallback* send_stats_callback);
+ EncodedImageCallback* post_encode_callback);
~VideoSender();
@@ -109,9 +108,6 @@
int32_t IntraFrameRequest(size_t stream_index);
int32_t EnableFrameDropper(bool enable);
- int64_t TimeUntilNextProcess() override;
- void Process() override;
-
private:
EncoderParameters UpdateEncoderParameters(
const EncoderParameters& params,
@@ -120,17 +116,13 @@
void SetEncoderParameters(EncoderParameters params, bool has_internal_source)
RTC_EXCLUSIVE_LOCKS_REQUIRED(encoder_crit_);
- Clock* const clock_;
-
rtc::CriticalSection encoder_crit_;
VCMGenericEncoder* _encoder;
media_optimization::MediaOptimization _mediaOpt;
VCMEncodedFrameCallback _encodedFrameCallback RTC_GUARDED_BY(encoder_crit_);
EncodedImageCallback* const post_encode_callback_;
- VCMSendStatisticsCallback* const send_stats_callback_;
VCMCodecDataBase _codecDataBase RTC_GUARDED_BY(encoder_crit_);
bool frame_dropper_enabled_ RTC_GUARDED_BY(encoder_crit_);
- VCMProcessTimer _sendStatsTimer;
// Must be accessed on the construction thread of VideoSender.
VideoCodec current_codec_;
diff --git a/modules/video_coding/video_sender.cc b/modules/video_coding/video_sender.cc
index 5b7bcda..fbf6ff8 100644
--- a/modules/video_coding/video_sender.cc
+++ b/modules/video_coding/video_sender.cc
@@ -28,17 +28,13 @@
namespace vcm {
VideoSender::VideoSender(Clock* clock,
- EncodedImageCallback* post_encode_callback,
- VCMSendStatisticsCallback* send_stats_callback)
- : clock_(clock),
- _encoder(nullptr),
- _mediaOpt(clock_),
+ EncodedImageCallback* post_encode_callback)
+ : _encoder(nullptr),
+ _mediaOpt(clock),
_encodedFrameCallback(post_encode_callback, &_mediaOpt),
post_encode_callback_(post_encode_callback),
- send_stats_callback_(send_stats_callback),
_codecDataBase(&_encodedFrameCallback),
frame_dropper_enabled_(true),
- _sendStatsTimer(VCMProcessTimer::kDefaultProcessIntervalMs, clock_),
current_codec_(),
encoder_params_({BitrateAllocation(), 0, 0, 0}),
encoder_has_internal_source_(false),
@@ -52,24 +48,6 @@
VideoSender::~VideoSender() {}
-// TODO(asapersson): Remove _sendStatsTimer and send_stats_callback_.
-void VideoSender::Process() {
- if (_sendStatsTimer.TimeUntilProcess() == 0) {
- // |_sendStatsTimer.Processed()| must be called. Otherwise
- // VideoSender::Process() will be called in an infinite loop.
- _sendStatsTimer.Processed();
- if (send_stats_callback_) {
- uint32_t bitRate = 0;
- uint32_t frameRate = 0;
- send_stats_callback_->SendStatistics(bitRate, frameRate);
- }
- }
-}
-
-int64_t VideoSender::TimeUntilNextProcess() {
- return _sendStatsTimer.TimeUntilProcess();
-}
-
// Register the send codec to be used.
int32_t VideoSender::RegisterSendCodec(const VideoCodec* sendCodec,
uint32_t numberOfCores,
diff --git a/modules/video_coding/video_sender_unittest.cc b/modules/video_coding/video_sender_unittest.cc
index 1a51a40..6cc4ae9 100644
--- a/modules/video_coding/video_sender_unittest.cc
+++ b/modules/video_coding/video_sender_unittest.cc
@@ -182,7 +182,7 @@
TestVideoSender() : clock_(1000), encoded_frame_callback_(&clock_) {}
void SetUp() override {
- sender_.reset(new VideoSender(&clock_, &encoded_frame_callback_, nullptr));
+ sender_.reset(new VideoSender(&clock_, &encoded_frame_callback_));
}
void AddFrame() {