summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorMarco Paniconi <marpan@google.com>2020-05-11 12:22:19 -0700
committerMarco Paniconi <marpan@google.com>2020-08-25 13:06:41 -0700
commitd1a78971ebcfd728c9c73b0cfbee69f470d4dc72 (patch)
tree31870ecedc0c80850e6992bf80f3ef0bc0e1909b /examples
parentc413c8f18eb1932b100850505031980e27160d5f (diff)
downloadlibvpx-d1a78971ebcfd728c9c73b0cfbee69f470d4dc72.tar
libvpx-d1a78971ebcfd728c9c73b0cfbee69f470d4dc72.tar.gz
libvpx-d1a78971ebcfd728c9c73b0cfbee69f470d4dc72.tar.bz2
libvpx-d1a78971ebcfd728c9c73b0cfbee69f470d4dc72.zip
vp9-rtc: Add control to disable maxq on overshoot
Add encoder control to disable feature to increase Q on overshoot detection, for CBR. Default (no usage of the control) means the feature is internally enabled. Add the control to the sample encoders, but keep it disabled as default (set to 0, so feature is on). Change-Id: Ia2237bc4aaea9770e5080dab20bfff9e3fd09199
Diffstat (limited to 'examples')
-rw-r--r--examples/vp9_spatial_svc_encoder.c2
-rw-r--r--examples/vpx_temporal_svc_encoder.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/examples/vp9_spatial_svc_encoder.c b/examples/vp9_spatial_svc_encoder.c
index f273c1208..5bb5a3183 100644
--- a/examples/vp9_spatial_svc_encoder.c
+++ b/examples/vp9_spatial_svc_encoder.c
@@ -1053,6 +1053,8 @@ int main(int argc, const char **argv) {
vpx_codec_control(&encoder, VP9E_SET_TUNE_CONTENT, app_input.tune_content);
+ vpx_codec_control(&encoder, VP9E_SET_DISABLE_OVERSHOOT_MAXQ_CBR, 0);
+
svc_drop_frame.framedrop_mode = FULL_SUPERFRAME_DROP;
for (sl = 0; sl < (unsigned int)svc_ctx.spatial_layers; ++sl)
svc_drop_frame.framedrop_thresh[sl] = enc_cfg.rc_dropframe_thresh;
diff --git a/examples/vpx_temporal_svc_encoder.c b/examples/vpx_temporal_svc_encoder.c
index 872751cef..c5a3228b1 100644
--- a/examples/vpx_temporal_svc_encoder.c
+++ b/examples/vpx_temporal_svc_encoder.c
@@ -831,6 +831,7 @@ int main(int argc, char **argv) {
} else if (strncmp(encoder->name, "vp9", 3) == 0) {
vpx_svc_extra_cfg_t svc_params;
memset(&svc_params, 0, sizeof(svc_params));
+ vpx_codec_control(&codec, VP9E_SET_DISABLE_OVERSHOOT_MAXQ_CBR, 0);
vpx_codec_control(&codec, VP8E_SET_CPUUSED, speed);
vpx_codec_control(&codec, VP9E_SET_AQ_MODE, 3);
vpx_codec_control(&codec, VP9E_SET_GF_CBR_BOOST_PCT, 0);