diff options
| author | James Zern <jzern@google.com> | 2023-03-30 22:44:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-03-30 22:44:51 +0000 |
| commit | 0f42bd3fb81cd79dfaef5c6aef26c643c48be909 (patch) | |
| tree | 1447252951d3056827e7aced81d980e4ee1aa79b /test | |
| parent | a257b4d6be525c50aea1e9f33f791fd4b627e92b (diff) | |
| parent | 66885a69ffdec30f0142dbff20568ebeb249107e (diff) | |
| download | libvpx-0f42bd3fb81cd79dfaef5c6aef26c643c48be909.tar.gz | |
Merge changes Idaf49de6,I6d7d96ff,I0d64c923 into main
* changes:
svc_datarate_test: clear -Wshadow warning
vp9_mcomp.c: clear -Wshadow warnings
vp9_rc_get_second_pass_params: clear -Wshadow warning
Diffstat (limited to 'test')
| -rw-r--r-- | test/svc_datarate_test.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/svc_datarate_test.cc b/test/svc_datarate_test.cc index 484252ca4..d571f5086 100644 --- a/test/svc_datarate_test.cc +++ b/test/svc_datarate_test.cc @@ -256,13 +256,13 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc { temporal_layer_id_ = layer_id.temporal_layer_id; for (int i = 0; i < number_spatial_layers_; i++) { layer_id.temporal_layer_id_per_spatial[i] = temporal_layer_id_; - ref_frame_config.duration[i] = 1; + ref_frame_config_.duration[i] = 1; } encoder->Control(VP9E_SET_SVC_LAYER_ID, &layer_id); set_frame_flags_bypass_mode(layer_id.temporal_layer_id, - number_spatial_layers_, 0, &ref_frame_config, + number_spatial_layers_, 0, &ref_frame_config_, 1); - encoder->Control(VP9E_SET_SVC_REF_FRAME_CONFIG, &ref_frame_config); + encoder->Control(VP9E_SET_SVC_REF_FRAME_CONFIG, &ref_frame_config_); } if (update_pattern_ && video->frame() >= 100) { @@ -277,13 +277,13 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc { temporal_layer_id_ = layer_id.temporal_layer_id; for (int i = 0; i < number_spatial_layers_; i++) { layer_id.temporal_layer_id_per_spatial[i] = temporal_layer_id_; - ref_frame_config.duration[i] = 1; + ref_frame_config_.duration[i] = 1; } encoder->Control(VP9E_SET_SVC_LAYER_ID, &layer_id); set_frame_flags_bypass_mode(layer_id.temporal_layer_id, - number_spatial_layers_, 0, &ref_frame_config, + number_spatial_layers_, 0, &ref_frame_config_, 0); - encoder->Control(VP9E_SET_SVC_REF_FRAME_CONFIG, &ref_frame_config); + encoder->Control(VP9E_SET_SVC_REF_FRAME_CONFIG, &ref_frame_config_); } if (change_bitrate_ && video->frame() == 200) { @@ -611,7 +611,7 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc { bool single_layer_resize_; unsigned int top_sl_width_; unsigned int top_sl_height_; - vpx_svc_ref_frame_config_t ref_frame_config; + vpx_svc_ref_frame_config_t ref_frame_config_; int update_pattern_; bool change_bitrate_; vpx_codec_pts_t last_pts_ref_; |