Some OnDroppedFrame / OnFrameDropped cleanup. This CL adds OnFrameDropped() overrides to some mocks missing it, and removes and old fallback method in the video quality analyzer interface. Bug: webrtc:467444018 Change-Id: I14bccf1f8b6e95a351905351697d754ec954fdbe Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/466520 Auto-Submit: Erik Språng <sprang@webrtc.org> Reviewed-by: Sergey Silkin <ssilkin@webrtc.org> Commit-Queue: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47546}
diff --git a/api/test/video_quality_analyzer_interface.h b/api/test/video_quality_analyzer_interface.h index a06342c..afa4d12 100644 --- a/api/test/video_quality_analyzer_interface.h +++ b/api/test/video_quality_analyzer_interface.h
@@ -22,7 +22,6 @@ #include "api/test/stats_observer_interface.h" #include "api/video/encoded_image.h" #include "api/video/video_frame.h" -#include "api/video_codecs/video_encoder.h" #include "rtc_base/checks.h" namespace webrtc { @@ -113,12 +112,6 @@ // Will be called for each frame dropped by encoder. // `peer_name` is name of the peer on which side frame drop was detected. virtual void OnFrameDropped(absl::string_view /* peer_name */) {} - // TODO: webrtc:467444018 - Remove when downstream usage is gone. - [[deprecated("Use callback without DropReason parameter")]] - virtual void OnFrameDropped(absl::string_view peer_name, - EncodedImageCallback::DropReason /* reason */) { - OnFrameDropped(peer_name); - } // Will be called before calling the decoder. // `peer_name` is name of the peer on which side frame was received. virtual void OnFramePreDecode(absl::string_view /* peer_name */,
diff --git a/video/video_send_stream_impl_unittest.cc b/video/video_send_stream_impl_unittest.cc index e39dc3e..f242d2b 100644 --- a/video/video_send_stream_impl_unittest.cc +++ b/video/video_send_stream_impl_unittest.cc
@@ -116,6 +116,12 @@ OnEncodedImage, (const EncodedImage&, const CodecSpecificInfo*), (override)); + MOCK_METHOD(void, + OnFrameDropped, + (uint32_t rtp_timestamp, + int spatial_id, + bool is_end_of_temporal_unit), + (override)); MOCK_METHOD(void, OnTransportOverheadChanged, (size_t), (override)); MOCK_METHOD(void, OnBitrateUpdated,
diff --git a/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc index f5167a1..3942261 100644 --- a/video/video_stream_encoder_unittest.cc +++ b/video/video_stream_encoder_unittest.cc
@@ -815,6 +815,9 @@ const CodecSpecificInfo* codec_specific_info) override { return Result(EncodedImageCallback::Result::OK); } + void OnFrameDropped(uint32_t rtp_timestamp, + int spatial_id, + bool is_end_of_temporal_unit) override {} }; FieldTrials field_trials_ = CreateTestFieldTrials();