admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename FrameToRender to OnFrameToRender

Browse Source 
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}
This commit is contained in:
Fanny Linderborg 2024-10-08 16:10:40 +02:00 committed by WebRTC LUCI CQ
parent b9c4c242d4
commit e1adfc05ac
7 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/video_coding/generic_decoder.cc
View File

@ -238,11 +238,11 @@ void VCMDecodedFrameCallback::Decoded(VideoFrame& decodedImage,
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(

12
modules/video_coding/generic_decoder_unittest.cc
View File

@ -56,14 +56,14 @@ class ReceiveCallback : public VCMReceiveCallback {
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;
}

3
modules/video_coding/include/video_coding_defines.h
View File

@ -67,8 +67,9 @@ class VCMReceiveCallback {
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);

2
modules/video_coding/video_receiver2_unittest.cc
View File

@ -50,7 +50,7 @@ class MockVCMReceiveCallback : public VCMReceiveCallback {
VideoFrameType),
(override));
MOCK_METHOD(int32_t,
FrameToRender,
OnFrameToRender,
(const struct FrameToRender&),
(override));
MOCK_METHOD(void, OnIncomingPayloadType, (int), (override));

2
modules/video_coding/video_receiver_unittest.cc
View File

@ -55,7 +55,7 @@ class MockVCMReceiveCallback : public VCMReceiveCallback {
VideoFrameType),
(override));
MOCK_METHOD(int32_t,
FrameToRender,
OnFrameToRender,
(const struct FrameToRender&),
(override));
MOCK_METHOD(void, OnIncomingPayloadType, (int), (override));

12
video/video_stream_decoder2.cc
View File

@ -55,13 +55,13 @@ int32_t VideoStreamDecoder::FrameToRender(VideoFrame& video_frame,
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,

2
video/video_stream_decoder2.h
View File

@ -51,7 +51,7 @@ class VideoStreamDecoder : public VCMReceiveCallback {
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(