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

Delete requested_resolution, the old name for scale_resolution_down_to.

Browse Source 
Now that Chromium and internal_compile_lite have migrated we can delete
the old name.

Bug: webrtc:375048799
Change-Id: I11d79f1d4ef1c0aa132cb50856faf83250e07caf
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/366600
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Auto-Submit: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43312}
This commit is contained in:
Henrik Boström 2024-10-24 10:40:58 +02:00 committed by WebRTC LUCI CQ
parent d7d77da203
commit 440ef02505
2 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
api/rtp_parameters.cc
View File

@ -106,27 +106,9 @@ RtpRtxParameters::RtpRtxParameters(uint32_t ssrc) : ssrc(ssrc) {}
RtpRtxParameters::RtpRtxParameters(const RtpRtxParameters& rhs) = default;
RtpRtxParameters::~RtpRtxParameters() = default;
// TODO(https://crbug.com/webrtc/375048799): Use "= default" when
// `requested_resolution` has been deleted
RtpEncodingParameters::RtpEncodingParameters()
: requested_resolution(scale_resolution_down_to) {}
RtpEncodingParameters::RtpEncodingParameters(const RtpEncodingParameters& rhs)
: ssrc(rhs.ssrc),
bitrate_priority(rhs.bitrate_priority),
network_priority(rhs.network_priority),
max_bitrate_bps(rhs.max_bitrate_bps),
min_bitrate_bps(rhs.min_bitrate_bps),
max_framerate(rhs.max_framerate),
num_temporal_layers(rhs.num_temporal_layers),
scale_resolution_down_by(rhs.scale_resolution_down_by),
scalability_mode(rhs.scalability_mode),
scale_resolution_down_to(rhs.scale_resolution_down_to),
requested_resolution(scale_resolution_down_to),
active(rhs.active),
rid(rhs.rid),
request_key_frame(rhs.request_key_frame),
adaptive_ptime(rhs.adaptive_ptime),
codec(rhs.codec) {}
RtpEncodingParameters::RtpEncodingParameters() = default;
RtpEncodingParameters::RtpEncodingParameters(const RtpEncodingParameters& rhs) =
default;
RtpEncodingParameters::~RtpEncodingParameters() = default;
RtpCodecParameters::RtpCodecParameters() = default;

25
api/rtp_parameters.h
View File

@ -506,13 +506,7 @@ struct RTC_EXPORT RtpEncodingParameters {
//
// See spec:
// https://w3c.github.io/webrtc-extensions/#dom-rtcrtpencodingparameters-scaleresolutiondownto
//
// This was previously known as "requested_resolution" in C++.
std::optional<Resolution> scale_resolution_down_to;
// Alternative name for `scale_resolution_down_to`.
// TODO(https://crbug.com/webrtc/375048799): Delete when downstream projects
// have migrated from `requested_resolution` to `scale_resolution_down_to`.
std::optional<Resolution>& requested_resolution;
// For an RtpSender, set to true to cause this encoding to be encoded and
// sent, and false for it not to be encoded and sent. This allows control
@ -550,25 +544,6 @@ struct RTC_EXPORT RtpEncodingParameters {
bool operator!=(const RtpEncodingParameters& o) const {
return !(*this == o);
}
// TODO(https://crbug.com/webrtc/375048799): Delete this operator overload
// when `requested_resolution` has been deleted in favor of auto generated op.
void operator=(const RtpEncodingParameters& o) {
ssrc = o.ssrc;
bitrate_priority = o.bitrate_priority;
network_priority = o.network_priority;
max_bitrate_bps = o.max_bitrate_bps;
min_bitrate_bps = o.min_bitrate_bps;
max_framerate = o.max_framerate;
num_temporal_layers = o.num_temporal_layers;
scale_resolution_down_by = o.scale_resolution_down_by;
scalability_mode = o.scalability_mode;
scale_resolution_down_to = o.scale_resolution_down_to;
active = o.active;
rid = o.rid;
request_key_frame = o.request_key_frame;
adaptive_ptime = o.adaptive_ptime;
codec = o.codec;
}
};
struct RTC_EXPORT RtpCodecParameters : public RtpCodec {