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

Rename minimum_qp to min_qp

Browse Source 
For better consistency with the rest codebase (it is min_/max_ for all params in video_encoder.h; only qp is for some reason prefixed with minimum_).

Also fixed constant names in libaom AV1 encoder wrapper (moved min from suffix to prefix, minimum -> min_).

Bug: chromium:328598314
Change-Id: I6d8521a3abff3a0595a5241c02ef4746eb4694df
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/356600
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42604}
This commit is contained in:
Sergey Silkin 2024-07-08 11:55:55 +02:00 committed by WebRTC LUCI CQ
parent db519e75b7
commit 7a6053ae62
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/video_codecs/video_encoder.h
View File

@ -263,7 +263,7 @@ class RTC_EXPORT VideoEncoder {
// The minimum QP that the encoder is expected to use with the current // The minimum QP that the encoder is expected to use with the current
// configuration. This may be used to determine if the encoder has reached // configuration. This may be used to determine if the encoder has reached
// its target video quality for static screenshare content. // its target video quality for static screenshare content.
absl::optional<int> minimum_qp; absl::optional<int> min_qp;
}; };
struct RTC_EXPORT RateControlParameters { struct RTC_EXPORT RateControlParameters {

23
modules/video_coding/codecs/av1/libaom_av1_encoder.cc
View File

@ -58,16 +58,15 @@ namespace webrtc {
namespace { namespace {
// Encoder configuration parameters // Encoder configuration parameters
constexpr int kQpMin = 10; constexpr int kMinQp = 10;
constexpr int kAv1ScreenshareMinimumQindex = constexpr int kMinQindex = 40; // Min qindex corresponding to kMinQp.
40; // Min qindex corresponding to kQpMin.
constexpr int kUsageProfile = AOM_USAGE_REALTIME; constexpr int kUsageProfile = AOM_USAGE_REALTIME;
constexpr int kMinQindex = 145; // Min qindex threshold for QP scaling. constexpr int kLowQindex = 145; // Low qindex threshold for QP scaling.
constexpr int kMaxQindex = 205; // Max qindex threshold for QP scaling. constexpr int kHighQindex = 205; // High qindex threshold for QP scaling.
constexpr int kBitDepth = 8; constexpr int kBitDepth = 8;
constexpr int kLagInFrames = 0; // No look ahead. constexpr int kLagInFrames = 0; // No look ahead.
constexpr int kRtpTicksPerSecond = 90000; constexpr int kRtpTicksPerSecond = 90000;
constexpr double kMinimumFrameRate = 1.0; constexpr double kMinFrameRateFps = 1.0;
aom_superblock_size_t GetSuperblockSize(int width, int height, int threads) { aom_superblock_size_t GetSuperblockSize(int width, int height, int threads) {
int resolution = width * height; int resolution = width * height;
@ -159,7 +158,7 @@ int32_t VerifyCodecSettings(const VideoCodec& codec_settings) {
if (codec_settings.maxFramerate < 1) { if (codec_settings.maxFramerate < 1) {
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER; return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
} }
if (codec_settings.qpMax < kQpMin || codec_settings.qpMax > 63) { if (codec_settings.qpMax < kMinQp || codec_settings.qpMax > 63) {
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER; return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
} }
return WEBRTC_VIDEO_CODEC_OK; return WEBRTC_VIDEO_CODEC_OK;
@ -248,7 +247,7 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* codec_settings,
cfg_.rc_dropframe_thresh = encoder_settings_.GetFrameDropEnabled() ? 30 : 0; cfg_.rc_dropframe_thresh = encoder_settings_.GetFrameDropEnabled() ? 30 : 0;
cfg_.g_input_bit_depth = kBitDepth; cfg_.g_input_bit_depth = kBitDepth;
cfg_.kf_mode = AOM_KF_DISABLED; cfg_.kf_mode = AOM_KF_DISABLED;
cfg_.rc_min_quantizer = kQpMin; cfg_.rc_min_quantizer = kMinQp;
cfg_.rc_max_quantizer = encoder_settings_.qpMax; cfg_.rc_max_quantizer = encoder_settings_.qpMax;
cfg_.rc_undershoot_pct = 50; cfg_.rc_undershoot_pct = 50;
cfg_.rc_overshoot_pct = 50; cfg_.rc_overshoot_pct = 50;
@ -797,9 +796,9 @@ void LibaomAv1Encoder::SetRates(const RateControlParameters& parameters) {
RTC_LOG(LS_WARNING) << "SetRates() while encoder is not initialized"; RTC_LOG(LS_WARNING) << "SetRates() while encoder is not initialized";
return; return;
} }
if (parameters.framerate_fps < kMinimumFrameRate) { if (parameters.framerate_fps < kMinFrameRateFps) {
RTC_LOG(LS_WARNING) << "Unsupported framerate (must be >= " RTC_LOG(LS_WARNING) << "Unsupported framerate (must be >= "
<< kMinimumFrameRate << kMinFrameRateFps
<< " ): " << parameters.framerate_fps; << " ): " << parameters.framerate_fps;
return; return;
} }
@ -851,7 +850,7 @@ VideoEncoder::EncoderInfo LibaomAv1Encoder::GetEncoderInfo() const {
info.scaling_settings = info.scaling_settings =
(inited_ && !encoder_settings_.AV1().automatic_resize_on) (inited_ && !encoder_settings_.AV1().automatic_resize_on)
? VideoEncoder::ScalingSettings::kOff ? VideoEncoder::ScalingSettings::kOff
: VideoEncoder::ScalingSettings(kMinQindex, kMaxQindex); : VideoEncoder::ScalingSettings(kLowQindex, kHighQindex);
info.preferred_pixel_formats = {VideoFrameBuffer::Type::kI420, info.preferred_pixel_formats = {VideoFrameBuffer::Type::kI420,
VideoFrameBuffer::Type::kNV12}; VideoFrameBuffer::Type::kNV12};
if (SvcEnabled()) { if (SvcEnabled()) {
@ -868,7 +867,7 @@ VideoEncoder::EncoderInfo LibaomAv1Encoder::GetEncoderInfo() const {
encoder_info_override_.resolution_bitrate_limits(); encoder_info_override_.resolution_bitrate_limits();
} }
info.minimum_qp = kAv1ScreenshareMinimumQindex; info.min_qp = kMinQindex;
return info; return info;
} }

4
modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
View File

@ -68,7 +68,7 @@ constexpr char kVp8ForcePartitionResilience[] =
// bitstream range of [0, 127] and not the user-level range of [0,63]. // bitstream range of [0, 127] and not the user-level range of [0,63].
constexpr int kLowVp8QpThreshold = 29; constexpr int kLowVp8QpThreshold = 29;
constexpr int kHighVp8QpThreshold = 95; constexpr int kHighVp8QpThreshold = 95;
constexpr int kVp8ScreenshareMinimumQp = 15; constexpr int kScreenshareMinQp = 15;
constexpr int kTokenPartitions = VP8_ONE_TOKENPARTITION; constexpr int kTokenPartitions = VP8_ONE_TOKENPARTITION;
constexpr uint32_t kVp832ByteAlign = 32u; constexpr uint32_t kVp832ByteAlign = 32u;
@ -1351,7 +1351,7 @@ VideoEncoder::EncoderInfo LibvpxVp8Encoder::GetEncoderInfo() const {
} }
if (codec_.mode == VideoCodecMode::kScreensharing) { if (codec_.mode == VideoCodecMode::kScreensharing) {
info.minimum_qp = kVp8ScreenshareMinimumQp; info.min_qp = kScreenshareMinQp;
} }
} }

2
modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
View File

@ -1805,7 +1805,7 @@ VideoEncoder::EncoderInfo LibvpxVp9Encoder::GetEncoderInfo() const {
} }
if (codec_.mode == VideoCodecMode::kScreensharing) { if (codec_.mode == VideoCodecMode::kScreensharing) {
info.minimum_qp = variable_framerate_screenshare::kMinQP; info.min_qp = variable_framerate_screenshare::kMinQP;
} }
} }
if (!encoder_info_override_.resolution_bitrate_limits().empty()) { if (!encoder_info_override_.resolution_bitrate_limits().empty()) {