diff options
| author | Marco <marpan@google.com> | 2015-02-05 13:01:40 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-02-05 13:01:40 -0800 |
| commit | dc4cdf95172f3c003047168abefd66ea44c3e72d (patch) | |
| tree | 2aee3ec5d1dead9c685af55b0ec003841e56ce6f | |
| parent | 65f046e29fa03d45f884dadae12d7240c29839d8 (diff) | |
| parent | ef6d6ec285bca39c1c4ebb509163ef36896fbf6b (diff) | |
| download | libvpx-dc4cdf95172f3c003047168abefd66ea44c3e72d.tar libvpx-dc4cdf95172f3c003047168abefd66ea44c3e72d.tar.gz libvpx-dc4cdf95172f3c003047168abefd66ea44c3e72d.tar.bz2 libvpx-dc4cdf95172f3c003047168abefd66ea44c3e72d.zip | |
Merge "vpx_temporal_svc_encoder: change default setting for static threshold."
| -rw-r--r-- | examples/vpx_temporal_svc_encoder.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/vpx_temporal_svc_encoder.c b/examples/vpx_temporal_svc_encoder.c index bc56aaeb0..ef24d4471 100644 --- a/examples/vpx_temporal_svc_encoder.c +++ b/examples/vpx_temporal_svc_encoder.c @@ -666,11 +666,13 @@ int main(int argc, char **argv) { if (strncmp(encoder->name, "vp8", 3) == 0) { vpx_codec_control(&codec, VP8E_SET_CPUUSED, -speed); vpx_codec_control(&codec, VP8E_SET_NOISE_SENSITIVITY, kDenoiserOnYOnly); + vpx_codec_control(&codec, VP8E_SET_STATIC_THRESHOLD, 1); } else if (strncmp(encoder->name, "vp9", 3) == 0) { vpx_codec_control(&codec, VP8E_SET_CPUUSED, speed); vpx_codec_control(&codec, VP9E_SET_AQ_MODE, 3); vpx_codec_control(&codec, VP9E_SET_FRAME_PERIODIC_BOOST, 0); vpx_codec_control(&codec, VP9E_SET_NOISE_SENSITIVITY, 0); + vpx_codec_control(&codec, VP8E_SET_STATIC_THRESHOLD, 0); if (vpx_codec_control(&codec, VP9E_SET_SVC, layering_mode > 0 ? 1: 0)) { die_codec(&codec, "Failed to set SVC"); } @@ -678,7 +680,6 @@ int main(int argc, char **argv) { if (strncmp(encoder->name, "vp8", 3) == 0) { vpx_codec_control(&codec, VP8E_SET_SCREEN_CONTENT_MODE, 0); } - vpx_codec_control(&codec, VP8E_SET_STATIC_THRESHOLD, 1); vpx_codec_control(&codec, VP8E_SET_TOKEN_PARTITIONS, 1); // This controls the maximum target size of the key frame. // For generating smaller key frames, use a smaller max_intra_size_pct |