diff --git a/webrtc/modules/video_coding/include/video_coding.h b/webrtc/modules/video_coding/include/video_coding.h index 27af381bd4..7b52a6d5c8 100644 --- a/webrtc/modules/video_coding/include/video_coding.h +++ b/webrtc/modules/video_coding/include/video_coding.h @@ -311,18 +311,6 @@ class VideoCodingModule : public Module { virtual int32_t RegisterReceiveStatisticsCallback( VCMReceiveStatisticsCallback* receiveStats) = 0; - // Register a decoder timing callback which will be called to deliver - // information about the timing of the decoder in the receiving side of the - // VCM, for instance the current and maximum frame decode latency. - // - // Input: - // - decoderTiming : The callback object to register. - // - // Return value : VCM_OK, on success. - // < 0, on error. - virtual int32_t RegisterDecoderTimingCallback( - VCMDecoderTimingCallback* decoderTiming) = 0; - // Register a frame type request callback. This callback will be called when // the // module needs to request specific frame types from the send side. diff --git a/webrtc/modules/video_coding/include/video_coding_defines.h b/webrtc/modules/video_coding/include/video_coding_defines.h index cabe437875..4ed80a6f81 100644 --- a/webrtc/modules/video_coding/include/video_coding_defines.h +++ b/webrtc/modules/video_coding/include/video_coding_defines.h @@ -104,21 +104,6 @@ class VCMReceiveStatisticsCallback { virtual ~VCMReceiveStatisticsCallback() {} }; -// Callback class used for informing the user of decode timing info. -class VCMDecoderTimingCallback { - public: - virtual void OnDecoderTiming(int decode_ms, - int max_decode_ms, - int current_delay_ms, - int target_delay_ms, - int jitter_buffer_ms, - int min_playout_delay_ms, - int render_delay_ms) = 0; - - protected: - virtual ~VCMDecoderTimingCallback() {} -}; - // Callback class used for telling the user about how to configure the FEC, // and the rates sent the last second is returned to the VCM. class VCMProtectionCallback { diff --git a/webrtc/modules/video_coding/video_coding_impl.cc b/webrtc/modules/video_coding/video_coding_impl.cc index ff44dd2051..1f24662bd1 100644 --- a/webrtc/modules/video_coding/video_coding_impl.cc +++ b/webrtc/modules/video_coding/video_coding_impl.cc @@ -200,11 +200,6 @@ class VideoCodingModuleImpl : public VideoCodingModule { return receiver_.RegisterReceiveStatisticsCallback(receiveStats); } - int32_t RegisterDecoderTimingCallback( - VCMDecoderTimingCallback* decoderTiming) override { - return receiver_.RegisterDecoderTimingCallback(decoderTiming); - } - int32_t RegisterFrameTypeCallback( VCMFrameTypeCallback* frameTypeCallback) override { return receiver_.RegisterFrameTypeCallback(frameTypeCallback); diff --git a/webrtc/modules/video_coding/video_coding_impl.h b/webrtc/modules/video_coding/video_coding_impl.h index 9974454d89..214dc7ee57 100644 --- a/webrtc/modules/video_coding/video_coding_impl.h +++ b/webrtc/modules/video_coding/video_coding_impl.h @@ -163,8 +163,6 @@ class VideoReceiver : public Module { int32_t RegisterReceiveCallback(VCMReceiveCallback* receiveCallback); int32_t RegisterReceiveStatisticsCallback( VCMReceiveStatisticsCallback* receiveStats); - int32_t RegisterDecoderTimingCallback( - VCMDecoderTimingCallback* decoderTiming); int32_t RegisterFrameTypeCallback(VCMFrameTypeCallback* frameTypeCallback); int32_t RegisterPacketRequestCallback(VCMPacketRequestCallback* callback); @@ -215,7 +213,6 @@ class VideoReceiver : public Module { VCMDecodedFrameCallback _decodedFrameCallback; VCMFrameTypeCallback* _frameTypeCallback GUARDED_BY(process_crit_); VCMReceiveStatisticsCallback* _receiveStatsCallback GUARDED_BY(process_crit_); - VCMDecoderTimingCallback* _decoderTimingCallback GUARDED_BY(process_crit_); VCMPacketRequestCallback* _packetRequestCallback GUARDED_BY(process_crit_); VCMFrameBuffer _frameFromFile; diff --git a/webrtc/modules/video_coding/video_receiver.cc b/webrtc/modules/video_coding/video_receiver.cc index 6a4819eb1d..3807519348 100644 --- a/webrtc/modules/video_coding/video_receiver.cc +++ b/webrtc/modules/video_coding/video_receiver.cc @@ -39,7 +39,6 @@ VideoReceiver::VideoReceiver(Clock* clock, _decodedFrameCallback(_timing, clock_), _frameTypeCallback(nullptr), _receiveStatsCallback(nullptr), - _decoderTimingCallback(nullptr), _packetRequestCallback(nullptr), _frameFromFile(), _scheduleKeyRequest(false), @@ -186,14 +185,6 @@ int32_t VideoReceiver::RegisterReceiveStatisticsCallback( return VCM_OK; } -int32_t VideoReceiver::RegisterDecoderTimingCallback( - VCMDecoderTimingCallback* decoderTiming) { - RTC_DCHECK(construction_thread_.CalledOnValidThread()); - rtc::CritScope cs(&process_crit_); - _decoderTimingCallback = decoderTiming; - return VCM_OK; -} - // Register an externally defined decoder object. void VideoReceiver::RegisterExternalDecoder(VideoDecoder* externalDecoder, uint8_t payloadType) { diff --git a/webrtc/video/video_stream_decoder.cc b/webrtc/video/video_stream_decoder.cc index 17f29dfe2a..6eea13f4d4 100644 --- a/webrtc/video/video_stream_decoder.cc +++ b/webrtc/video/video_stream_decoder.cc @@ -46,7 +46,6 @@ VideoStreamDecoder::VideoStreamDecoder( video_receiver_->RegisterReceiveCallback(this); video_receiver_->RegisterFrameTypeCallback(vcm_frame_type_callback); video_receiver_->RegisterReceiveStatisticsCallback(this); - video_receiver_->RegisterDecoderTimingCallback(this); VCMVideoProtection video_protection = enable_nack ? (enable_fec ? kProtectionNackFEC : kProtectionNack) @@ -67,7 +66,6 @@ VideoStreamDecoder::~VideoStreamDecoder() { // Unset all the callback pointers that we set in the ctor. video_receiver_->RegisterPacketRequestCallback(nullptr); - video_receiver_->RegisterDecoderTimingCallback(nullptr); video_receiver_->RegisterReceiveStatisticsCallback(nullptr); video_receiver_->RegisterFrameTypeCallback(nullptr); video_receiver_->RegisterReceiveCallback(nullptr); @@ -113,14 +111,6 @@ void VideoStreamDecoder::OnFrameCountsUpdated(const FrameCounts& frame_counts) { receive_stats_callback_->OnFrameCountsUpdated(frame_counts); } -void VideoStreamDecoder::OnDecoderTiming(int decode_ms, - int max_decode_ms, - int current_delay_ms, - int target_delay_ms, - int jitter_buffer_ms, - int min_playout_delay_ms, - int render_delay_ms) {} - void VideoStreamDecoder::OnFrameBufferTimingsUpdated(int decode_ms, int max_decode_ms, int current_delay_ms, diff --git a/webrtc/video/video_stream_decoder.h b/webrtc/video/video_stream_decoder.h index 270c16b986..4bca3edfc3 100644 --- a/webrtc/video/video_stream_decoder.h +++ b/webrtc/video/video_stream_decoder.h @@ -43,7 +43,6 @@ enum StreamType { class VideoStreamDecoder : public VCMReceiveCallback, public VCMReceiveStatisticsCallback, - public VCMDecoderTimingCallback, public CallStatsObserver { public: friend class ChannelStatsObserver; @@ -78,15 +77,6 @@ class VideoStreamDecoder : public VCMReceiveCallback, int min_playout_delay_ms, int render_delay_ms) override; - // Implements VCMDecoderTimingCallback. - void OnDecoderTiming(int decode_ms, - int max_decode_ms, - int current_delay_ms, - int target_delay_ms, - int jitter_buffer_ms, - int min_playout_delay_ms, - int render_delay_ms) override; - void RegisterReceiveStatisticsProxy( ReceiveStatisticsProxy* receive_statistics_proxy);