mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

RequestedResolution - Bug fix

Browse source 
Change default value of is_active to false,
this means that VideoRenderer or other VideoSinks
added with default rtc::VideoSinkWants() does not
block usage of RequestedResolution, e.g JNI_VideoTrack_AddSink.

This problem occurs when attaching a VideoRenderer directly to
the sending VideoTrack (which is a great solution!). But the
VideoRenderer is "passive" and should not block adaptations
from RequestedResolution.

Bug: webrtc:14451
Change-Id: I2ab02596245c7b82bf94fe86f8788f458c7ea286
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/305024
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40105}
This commit is contained in:
Jonas Oreland 2023-05-12 16:36:41 +02:00 committed by WebRTC LUCI CQ
parent b7a688c68e
commit 1d3452f31b
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
api/video/video_source_interface.h
View file

@ -35,6 +35,7 @@ struct RTC_EXPORT VideoSinkWants {
VideoSinkWants();
VideoSinkWants(const VideoSinkWants&);
~VideoSinkWants();
// Tells the source whether the sink wants frames with rotation applied.
// By default, any rotation must be applied by the sink.
bool rotation_applied = false;
@ -84,8 +85,12 @@ struct RTC_EXPORT VideoSinkWants {
// This is the resolution requested by the user using RtpEncodingParameters.
absl::optional<FrameSize> requested_resolution;
// `active` : is (any) of the layers/sink(s) active.
bool is_active = true;
// `is_active` : Is this VideoSinkWants from an encoder that is encoding any
// layer. IF YES, it will affect how the VideoAdapter will choose to
// prioritize the OnOutputFormatRequest vs. requested_resolution. IF NO,
// VideoAdapter consider this VideoSinkWants as a passive listener (e.g a
// VideoRenderer or a VideoEncoder that is not currently actively encoding).
bool is_active = false;
// This sub-struct contains information computed by VideoBroadcaster
// that aggregates several VideoSinkWants (and sends them to

2
media/base/video_broadcaster_unittest.cc
View file

@ -337,6 +337,7 @@ TEST(VideoBroadcasterTest, AppliesMaxOfSinkWantsRequestedResolution) {
FakeVideoRenderer sink1;
VideoSinkWants wants1;
wants1.is_active = true;
wants1.requested_resolution = FrameSize(640, 360);
broadcaster.AddOrUpdateSink(&sink1, wants1);
@ -344,6 +345,7 @@ TEST(VideoBroadcasterTest, AppliesMaxOfSinkWantsRequestedResolution) {
FakeVideoRenderer sink2;
VideoSinkWants wants2;
wants2.is_active = true;
wants2.requested_resolution = FrameSize(650, 350);
broadcaster.AddOrUpdateSink(&sink2, wants2);
EXPECT_EQ(FrameSize(650, 360), *broadcaster.wants().requested_resolution);