Rename FrameToRender to OnFrameToRender
This is to make the name consistent with the other methods in the
interface and additionally to in the future not have a function that has
the same name as the `FrameToRender` struct.
Bug: webrtc:358039777
Change-Id: Iac727d93ab9e020a073477bd33d0f67f9983a0aa
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364961
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Auto-Submit: Fanny Linderborg <linderborg@webrtc.org>
Commit-Queue: Fanny Linderborg <linderborg@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43195}
diff --git a/modules/video_coding/generic_decoder.cc b/modules/video_coding/generic_decoder.cc
index 753d6d9..166ce1d 100644
--- a/modules/video_coding/generic_decoder.cc
+++ b/modules/video_coding/generic_decoder.cc
@@ -238,11 +238,11 @@
decodedImage.set_timestamp_us(
frame_info->render_time ? frame_info->render_time->us() : -1);
- _receiveCallback->FrameToRender({.video_frame = decodedImage,
- .qp = qp,
- .decode_time = decode_time,
- .content_type = frame_info->content_type,
- .frame_type = frame_info->frame_type});
+ _receiveCallback->OnFrameToRender({.video_frame = decodedImage,
+ .qp = qp,
+ .decode_time = decode_time,
+ .content_type = frame_info->content_type,
+ .frame_type = frame_info->frame_type});
}
void VCMDecodedFrameCallback::OnDecoderInfoChanged(
diff --git a/modules/video_coding/generic_decoder_unittest.cc b/modules/video_coding/generic_decoder_unittest.cc
index 1700c93..9f362e4 100644
--- a/modules/video_coding/generic_decoder_unittest.cc
+++ b/modules/video_coding/generic_decoder_unittest.cc
@@ -56,14 +56,14 @@
TimeDelta decode_time,
VideoContentType content_type,
VideoFrameType frame_type) override {
- return FrameToRender({.video_frame = frame,
- .qp = qp,
- .decode_time = decode_time,
- .content_type = content_type,
- .frame_type = frame_type});
+ return OnFrameToRender({.video_frame = frame,
+ .qp = qp,
+ .decode_time = decode_time,
+ .content_type = content_type,
+ .frame_type = frame_type});
}
- int32_t FrameToRender(const struct FrameToRender& arguments) override {
+ int32_t OnFrameToRender(const struct FrameToRender& arguments) override {
frames_.push_back(arguments.video_frame);
return 0;
}
diff --git a/modules/video_coding/include/video_coding_defines.h b/modules/video_coding/include/video_coding_defines.h
index c7f85a7..1347431 100644
--- a/modules/video_coding/include/video_coding_defines.h
+++ b/modules/video_coding/include/video_coding_defines.h
@@ -67,8 +67,9 @@
TimeDelta decode_time,
VideoContentType content_type,
VideoFrameType frame_type) = 0;
+
// TODO: bugs.webrtc.org/358039777 - Make this pure virtual.
- virtual int32_t FrameToRender(const struct FrameToRender& arguments) {
+ virtual int32_t OnFrameToRender(const struct FrameToRender& arguments) {
return FrameToRender(arguments.video_frame, arguments.qp,
arguments.decode_time, arguments.content_type,
arguments.frame_type);
diff --git a/modules/video_coding/video_receiver2_unittest.cc b/modules/video_coding/video_receiver2_unittest.cc
index 27c8bfb..1ceba0c 100644
--- a/modules/video_coding/video_receiver2_unittest.cc
+++ b/modules/video_coding/video_receiver2_unittest.cc
@@ -50,7 +50,7 @@
VideoFrameType),
(override));
MOCK_METHOD(int32_t,
- FrameToRender,
+ OnFrameToRender,
(const struct FrameToRender&),
(override));
MOCK_METHOD(void, OnIncomingPayloadType, (int), (override));
diff --git a/modules/video_coding/video_receiver_unittest.cc b/modules/video_coding/video_receiver_unittest.cc
index 7e21a5c..eab7fa6 100644
--- a/modules/video_coding/video_receiver_unittest.cc
+++ b/modules/video_coding/video_receiver_unittest.cc
@@ -55,7 +55,7 @@
VideoFrameType),
(override));
MOCK_METHOD(int32_t,
- FrameToRender,
+ OnFrameToRender,
(const struct FrameToRender&),
(override));
MOCK_METHOD(void, OnIncomingPayloadType, (int), (override));
diff --git a/video/video_stream_decoder2.cc b/video/video_stream_decoder2.cc
index 1f5ef42..c8bec27 100644
--- a/video/video_stream_decoder2.cc
+++ b/video/video_stream_decoder2.cc
@@ -55,13 +55,13 @@
TimeDelta decode_time,
VideoContentType content_type,
VideoFrameType frame_type) {
- return FrameToRender({.video_frame = video_frame,
- .qp = qp,
- .decode_time = decode_time,
- .content_type = content_type,
- .frame_type = frame_type});
+ return OnFrameToRender({.video_frame = video_frame,
+ .qp = qp,
+ .decode_time = decode_time,
+ .content_type = content_type,
+ .frame_type = frame_type});
}
-int32_t VideoStreamDecoder::FrameToRender(
+int32_t VideoStreamDecoder::OnFrameToRender(
const struct FrameToRender& arguments) {
receive_stats_callback_->OnDecodedFrame(
arguments.video_frame, arguments.qp, arguments.decode_time,
diff --git a/video/video_stream_decoder2.h b/video/video_stream_decoder2.h
index 8a89e32..df73cf4 100644
--- a/video/video_stream_decoder2.h
+++ b/video/video_stream_decoder2.h
@@ -51,7 +51,7 @@
TimeDelta decode_time,
VideoContentType content_type,
VideoFrameType frame_type) override;
- int32_t FrameToRender(const struct FrameToRender& arguments) override;
+ int32_t OnFrameToRender(const struct FrameToRender& arguments) override;
void OnDroppedFrames(uint32_t frames_dropped) override;
void OnIncomingPayloadType(int payload_type) override;
void OnDecoderInfoChanged(
