Commit 91394626 authored by Chih-Yu Huang's avatar Chih-Yu Huang Committed by Commit Bot

Revert "media/gpu/vaapi: Fill min and max qp in VAEncMiscParameterRateControl"

This reverts commit f20690e8.

Reason for revert: This CL broke some CTS. b/146838257

Original change's description:
> media/gpu/vaapi: Fill min and max qp in VAEncMiscParameterRateControl
> 
> VAEncMiscParameterRateControl has parameters about minimum and
> maximum of quantization values. These values should be filled.
> 
> Bug: 1034382
> Test: VEA test on atlas
> Change-Id: I185b3e710c05095313aa71bc9fe90b23c8885345
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1969196
> Commit-Queue: Hirokazu Honda <hiroh@chromium.org>
> Reviewed-by: Miguel Casas <mcasas@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#726700}

TBR=mcasas@chromium.org,sprang@chromium.org,hiroh@chromium.org,sreerenj.balachandran@intel.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1034382
Change-Id: I3bd3007985adfc72f0601b8995c2bf4fd91c47f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1981961Reviewed-by: default avatarChih-Yu Huang <akahuang@chromium.org>
Commit-Queue: Chih-Yu Huang <akahuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727435}
parent 09291515
...@@ -17,11 +17,7 @@ constexpr int kIDRPeriod = 2048; ...@@ -17,11 +17,7 @@ constexpr int kIDRPeriod = 2048;
constexpr int kIPeriod = 0; constexpr int kIPeriod = 0;
constexpr int kIPPeriod = 1; constexpr int kIPPeriod = 1;
// The qp range is 0-51 in H264. Select 26 because of the center value.
constexpr int kDefaultQP = 26; constexpr int kDefaultQP = 26;
// Webrtc default values, see h264_encoder_impl.cc.
constexpr int kMinQP = 24;
constexpr int kMaxQP = 37;
// Subjectively chosen bitrate window size for rate control, in ms. // Subjectively chosen bitrate window size for rate control, in ms.
constexpr int kCPBWindowSizeMs = 1500; constexpr int kCPBWindowSizeMs = 1500;
...@@ -47,9 +43,7 @@ H264Encoder::EncodeParams::EncodeParams() ...@@ -47,9 +43,7 @@ H264Encoder::EncodeParams::EncodeParams()
framerate(0), framerate(0),
cpb_window_size_ms(kCPBWindowSizeMs), cpb_window_size_ms(kCPBWindowSizeMs),
cpb_size_bits(0), cpb_size_bits(0),
initial_qp(kDefaultQP), qp(kDefaultQP),
min_qp(kMinQP),
max_qp(kMaxQP),
max_num_ref_frames(kMaxNumReferenceFrames), max_num_ref_frames(kMaxNumReferenceFrames),
max_ref_pic_list0_size(kMaxRefIdxL0Size), max_ref_pic_list0_size(kMaxRefIdxL0Size),
max_ref_pic_list1_size(kMaxRefIdxL1Size) {} max_ref_pic_list1_size(kMaxRefIdxL1Size) {}
...@@ -382,8 +376,8 @@ void H264Encoder::UpdatePPS() { ...@@ -382,8 +376,8 @@ void H264Encoder::UpdatePPS() {
curr_params_.max_ref_pic_list1_size > 0 curr_params_.max_ref_pic_list1_size > 0
? curr_params_.max_ref_pic_list1_size - 1 ? curr_params_.max_ref_pic_list1_size - 1
: curr_params_.max_ref_pic_list1_size; : curr_params_.max_ref_pic_list1_size;
DCHECK_LE(curr_params_.initial_qp, 51); DCHECK_LE(curr_params_.qp, 51);
current_pps_.pic_init_qp_minus26 = curr_params_.initial_qp - 26; current_pps_.pic_init_qp_minus26 = curr_params_.qp - 26;
current_pps_.deblocking_filter_control_present_flag = true; current_pps_.deblocking_filter_control_present_flag = true;
current_pps_.transform_8x8_mode_flag = current_pps_.transform_8x8_mode_flag =
(current_sps_.profile_idc == H264SPS::kProfileIDCHigh); (current_sps_.profile_idc == H264SPS::kProfileIDCHigh);
......
...@@ -54,9 +54,7 @@ class H264Encoder : public AcceleratedVideoEncoder { ...@@ -54,9 +54,7 @@ class H264Encoder : public AcceleratedVideoEncoder {
unsigned int cpb_size_bits; unsigned int cpb_size_bits;
// Quantization parameter. // Quantization parameter.
int initial_qp; int qp;
int min_qp;
int max_qp;
// Maxium Number of Reference frames. // Maxium Number of Reference frames.
size_t max_num_ref_frames; size_t max_num_ref_frames;
......
...@@ -1075,8 +1075,6 @@ bool VaapiVideoEncodeAccelerator::H264Accelerator::SubmitFrameParameters( ...@@ -1075,8 +1075,6 @@ bool VaapiVideoEncodeAccelerator::H264Accelerator::SubmitFrameParameters(
rate_control_param.target_percentage = kTargetBitratePercentage; rate_control_param.target_percentage = kTargetBitratePercentage;
rate_control_param.window_size = encode_params.cpb_window_size_ms; rate_control_param.window_size = encode_params.cpb_window_size_ms;
rate_control_param.initial_qp = pic_param.pic_init_qp; rate_control_param.initial_qp = pic_param.pic_init_qp;
rate_control_param.min_qp = encode_params.min_qp;
rate_control_param.max_qp = encode_params.max_qp;
rate_control_param.rc_flags.bits.disable_frame_skip = true; rate_control_param.rc_flags.bits.disable_frame_skip = true;
VAEncMiscParameterFrameRate framerate_param = {}; VAEncMiscParameterFrameRate framerate_param = {};
...@@ -1287,8 +1285,6 @@ bool VaapiVideoEncodeAccelerator::VP8Accelerator::SubmitFrameParameters( ...@@ -1287,8 +1285,6 @@ bool VaapiVideoEncodeAccelerator::VP8Accelerator::SubmitFrameParameters(
rate_control_param.target_percentage = kTargetBitratePercentage; rate_control_param.target_percentage = kTargetBitratePercentage;
rate_control_param.window_size = encode_params.cpb_window_size_ms; rate_control_param.window_size = encode_params.cpb_window_size_ms;
rate_control_param.initial_qp = encode_params.initial_qp; rate_control_param.initial_qp = encode_params.initial_qp;
rate_control_param.min_qp = encode_params.min_qp;
rate_control_param.max_qp = encode_params.max_qp;
rate_control_param.rc_flags.bits.disable_frame_skip = true; rate_control_param.rc_flags.bits.disable_frame_skip = true;
VAEncMiscParameterFrameRate framerate_param = {}; VAEncMiscParameterFrameRate framerate_param = {};
...@@ -1425,8 +1421,6 @@ bool VaapiVideoEncodeAccelerator::VP9Accelerator::SubmitFrameParameters( ...@@ -1425,8 +1421,6 @@ bool VaapiVideoEncodeAccelerator::VP9Accelerator::SubmitFrameParameters(
rate_control_param.target_percentage = kTargetBitratePercentage; rate_control_param.target_percentage = kTargetBitratePercentage;
rate_control_param.window_size = encode_params.cpb_window_size_ms; rate_control_param.window_size = encode_params.cpb_window_size_ms;
rate_control_param.initial_qp = encode_params.initial_qp; rate_control_param.initial_qp = encode_params.initial_qp;
rate_control_param.min_qp = encode_params.min_qp;
rate_control_param.max_qp = encode_params.max_qp;
rate_control_param.rc_flags.bits.disable_frame_skip = true; rate_control_param.rc_flags.bits.disable_frame_skip = true;
VAEncMiscParameterFrameRate framerate_param = {}; VAEncMiscParameterFrameRate framerate_param = {};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment