Delete method VCMJitterBuffer::RegisterStatsCallback
Unused in the legacy VideoCodingModule api since
https://webrtc-review.googlesource.com/c/src/+/62101/
and unused by the VideoReceiveStream code path since
https://webrtc-review.googlesource.com/c/src/+/128870
Bug: webrtc:7408
Change-Id: I800dba08a6e0e8f5de6169241d217bd5e8e5d0de
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129961
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27319}diff --git a/modules/video_coding/include/video_coding_defines.h b/modules/video_coding/include/video_coding_defines.h
index 81ec68d..0998610 100644
--- a/modules/video_coding/include/video_coding_defines.h
+++ b/modules/video_coding/include/video_coding_defines.h
@@ -84,7 +84,9 @@
virtual void OnCompleteFrame(bool is_keyframe,
size_t size_bytes,
VideoContentType content_type) = 0;
+ // TODO(nisse): Delete.
virtual void OnDiscardedPacketsUpdated(int discarded_packets) = 0;
+ // TODO(nisse): Delete.
virtual void OnFrameCountsUpdated(const FrameCounts& frame_counts) = 0;
virtual void OnFrameBufferTimingsUpdated(int decode_ms,
int max_decode_ms,
diff --git a/modules/video_coding/jitter_buffer.cc b/modules/video_coding/jitter_buffer.cc
index cc27323..9c4ab2f 100644
--- a/modules/video_coding/jitter_buffer.cc
+++ b/modules/video_coding/jitter_buffer.cc
@@ -234,7 +234,6 @@
incomplete_frames_(),
last_decoded_state_(),
first_packet_since_reset_(true),
- stats_callback_(nullptr),
incoming_frame_rate_(0),
incoming_frame_count_(0),
time_last_incoming_frame_count_(0),
@@ -611,8 +610,6 @@
if (packet.sizeBytes > 0) {
num_discarded_packets_++;
num_consecutive_old_packets_++;
- if (stats_callback_ != NULL)
- stats_callback_->OnDiscardedPacketsUpdated(num_discarded_packets_);
}
// Update last decoded sequence number if the packet arrived late and
// belongs to a frame with a timestamp equal to the last decoded
@@ -1071,12 +1068,6 @@
missing_sequence_numbers_.upper_bound(last_decoded_sequence_number));
}
-void VCMJitterBuffer::RegisterStatsCallback(
- VCMReceiveStatisticsCallback* callback) {
- rtc::CritScope cs(&crit_sect_);
- stats_callback_ = callback;
-}
-
VCMFrameBuffer* VCMJitterBuffer::GetEmptyFrame() {
if (free_frames_.empty()) {
if (!TryToIncreaseJitterBufferSize()) {
@@ -1152,9 +1143,6 @@
} else {
++receive_statistics_.delta_frames;
}
-
- if (stats_callback_ != NULL)
- stats_callback_->OnFrameCountsUpdated(receive_statistics_);
}
}
diff --git a/modules/video_coding/jitter_buffer.h b/modules/video_coding/jitter_buffer.h
index f19e7a7..c896208 100644
--- a/modules/video_coding/jitter_buffer.h
+++ b/modules/video_coding/jitter_buffer.h
@@ -190,8 +190,6 @@
// Returns a list of the sequence numbers currently missing.
std::vector<uint16_t> GetNackList(bool* request_key_frame);
- void RegisterStatsCallback(VCMReceiveStatisticsCallback* callback);
-
private:
class SequenceNumberLessThan {
public:
@@ -317,8 +315,6 @@
VCMDecodingState last_decoded_state_ RTC_GUARDED_BY(crit_sect_);
bool first_packet_since_reset_;
- // Statistics.
- VCMReceiveStatisticsCallback* stats_callback_ RTC_GUARDED_BY(crit_sect_);
// Frame counts for each type (key, delta, ...)
FrameCounts receive_statistics_;
// Latest calculated frame rates of incoming stream.
diff --git a/modules/video_coding/receiver.cc b/modules/video_coding/receiver.cc
index e5205af..0d58d9e 100644
--- a/modules/video_coding/receiver.cc
+++ b/modules/video_coding/receiver.cc
@@ -259,9 +259,4 @@
return jitter_buffer_.GetNackList(request_key_frame);
}
-void VCMReceiver::RegisterStatsCallback(
- VCMReceiveStatisticsCallback* callback) {
- jitter_buffer_.RegisterStatsCallback(callback);
-}
-
} // namespace webrtc
diff --git a/modules/video_coding/receiver.h b/modules/video_coding/receiver.h
index 44294e2..0dfee63 100644
--- a/modules/video_coding/receiver.h
+++ b/modules/video_coding/receiver.h
@@ -79,8 +79,6 @@
VCMNackMode NackMode() const;
std::vector<uint16_t> NackList(bool* request_key_frame);
- void RegisterStatsCallback(VCMReceiveStatisticsCallback* callback);
-
void TriggerDecoderShutdown();
private:
diff --git a/modules/video_coding/video_coding_impl.h b/modules/video_coding/video_coding_impl.h
index 1f3a59c..7ec04d2 100644
--- a/modules/video_coding/video_coding_impl.h
+++ b/modules/video_coding/video_coding_impl.h
@@ -70,8 +70,6 @@
void RegisterExternalDecoder(VideoDecoder* externalDecoder,
uint8_t payloadType);
int32_t RegisterReceiveCallback(VCMReceiveCallback* receiveCallback);
- int32_t RegisterReceiveStatisticsCallback(
- VCMReceiveStatisticsCallback* receiveStats);
int32_t RegisterFrameTypeCallback(VCMFrameTypeCallback* frameTypeCallback);
int32_t RegisterPacketRequestCallback(VCMPacketRequestCallback* callback);
diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc
index 544b660..af35aea 100644
--- a/modules/video_coding/video_receiver.cc
+++ b/modules/video_coding/video_receiver.cc
@@ -189,18 +189,6 @@
return VCM_OK;
}
-int32_t VideoReceiver::RegisterReceiveStatisticsCallback(
- VCMReceiveStatisticsCallback* receiveStats) {
- RTC_DCHECK_RUN_ON(&construction_thread_checker_);
- RTC_DCHECK(!IsDecoderThreadRunning() && !is_attached_to_process_thread_);
- // |_receiver| is used on both the decoder and module threads.
- // However, since we make sure that we never do anything on the module thread
- // when the decoder thread is not running, we don't need a lock for the
- // |_receiver| here.
- _receiver.RegisterStatsCallback(receiveStats);
- return VCM_OK;
-}
-
// Register an externally defined decoder object.
void VideoReceiver::RegisterExternalDecoder(VideoDecoder* externalDecoder,
uint8_t payloadType) {