summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco <marpan@google.com>2015-03-06 10:00:18 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2015-03-06 10:00:18 -0800
commit274af39eae458ee25dcc679754e99e017ac9f7eb (patch)
treeb213239b598745ec3fdfbb48cc1f7e8f2433cce4
parent0f37601fd75c1a769ff2a0dbdea7169649f1dc13 (diff)
parentc76ebffdcc6ecd870d90a4455cf86aaa40ff04e2 (diff)
downloadlibvpx-274af39eae458ee25dcc679754e99e017ac9f7eb.tar
libvpx-274af39eae458ee25dcc679754e99e017ac9f7eb.tar.gz
libvpx-274af39eae458ee25dcc679754e99e017ac9f7eb.tar.bz2
libvpx-274af39eae458ee25dcc679754e99e017ac9f7eb.zip
Merge "Set the threads/tile_columns in vpx_temporal_svc_encoder."
-rw-r--r--examples/vpx_temporal_svc_encoder.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/vpx_temporal_svc_encoder.c b/examples/vpx_temporal_svc_encoder.c
index 7a582d2b8..dea29c021 100644
--- a/examples/vpx_temporal_svc_encoder.c
+++ b/examples/vpx_temporal_svc_encoder.c
@@ -610,6 +610,9 @@ int main(int argc, char **argv) {
cfg.rc_buf_optimal_sz = 600;
cfg.rc_buf_sz = 1000;
+ // Use 1 thread as default.
+ cfg.g_threads = 1;
+
// Enable error resilient mode.
cfg.g_error_resilient = 1;
cfg.g_lag_in_frames = 0;
@@ -675,6 +678,7 @@ int main(int argc, char **argv) {
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);
+ vpx_codec_control(&codec, VP9E_SET_TILE_COLUMNS, (cfg.g_threads >> 1));
if (vpx_codec_control(&codec, VP9E_SET_SVC, layering_mode > 0 ? 1: 0)) {
die_codec(&codec, "Failed to set SVC");
}