shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix settings for num of tiles in samples & tests."

--- a/examples/vp9_spatial_svc_encoder.c

+++ b/examples/vp9_spatial_svc_encoder.c

@@ -714,7 +714,7 @@

   if (svc_ctx.speed != -1)

     vpx_codec_control(&codec, VP8E_SET_CPUUSED, svc_ctx.speed);

   if (svc_ctx.threads) {

-    vpx_codec_control(&codec, VP9E_SET_TILE_COLUMNS, (svc_ctx.threads >> 1));

+    vpx_codec_control(&codec, VP9E_SET_TILE_COLUMNS, get_msb(svc_ctx.threads));

     if (svc_ctx.threads > 1)

       vpx_codec_control(&codec, VP9E_SET_ROW_MT, 1);

     else

--- a/examples/vpx_temporal_svc_encoder.c

+++ b/examples/vpx_temporal_svc_encoder.c

@@ -22,6 +22,7 @@

 #include "../vpx_ports/vpx_timer.h"

 #include "vpx/vp8cx.h"

 #include "vpx/vpx_encoder.h"

+#include "vpx_ports/bitops.h"

 #include "../tools_common.h"

 #include "../video_writer.h"

@@ -810,7 +811,7 @@

     vpx_codec_control(&codec, VP9E_SET_NOISE_SENSITIVITY, kVp9DenoiserOff);

     vpx_codec_control(&codec, VP8E_SET_STATIC_THRESHOLD, 1);

     vpx_codec_control(&codec, VP9E_SET_TUNE_CONTENT, 0);

-    vpx_codec_control(&codec, VP9E_SET_TILE_COLUMNS, (cfg.g_threads >> 1));

+    vpx_codec_control(&codec, VP9E_SET_TILE_COLUMNS, get_msb(cfg.g_threads));

 #if ROI_MAP

     set_roi_map(encoder->name, &cfg, &roi);

     if (vpx_codec_control(&codec, VP9E_SET_ROI_MAP, &roi))

--- a/test/svc_datarate_test.cc

+++ b/test/svc_datarate_test.cc

@@ -15,6 +15,7 @@

 #include "test/util.h"

 #include "test/y4m_video_source.h"

 #include "vpx/vpx_codec.h"

+#include "vpx_ports/bitops.h"

 namespace {

@@ -200,7 +201,7 @@

       encoder->Control(VP8E_SET_CPUUSED, speed_setting_);

       encoder->Control(VP9E_SET_TILE_COLUMNS, 0);

       encoder->Control(VP8E_SET_MAX_INTRA_BITRATE_PCT, 300);

-      encoder->Control(VP9E_SET_TILE_COLUMNS, (cfg_.g_threads >> 1));

+      encoder->Control(VP9E_SET_TILE_COLUMNS, get_msb(cfg_.g_threads));

       encoder->Control(VP9E_SET_ROW_MT, 1);

       encoder->Control(VP8E_SET_STATIC_THRESHOLD, 1);

       encoder->Control(VP9E_SET_TUNE_CONTENT, tune_content_);

--- a/test/vp9_datarate_test.cc

+++ b/test/vp9_datarate_test.cc

@@ -15,6 +15,7 @@

 #include "test/util.h"

 #include "test/y4m_video_source.h"

 #include "vpx/vpx_codec.h"

+#include "vpx_ports/bitops.h"

 namespace {

@@ -129,7 +130,7 @@

     }

     encoder->Control(VP9E_SET_NOISE_SENSITIVITY, denoiser_on_);

-    encoder->Control(VP9E_SET_TILE_COLUMNS, (cfg_.g_threads >> 1));

+    encoder->Control(VP9E_SET_TILE_COLUMNS, get_msb(cfg_.g_threads));

     encoder->Control(VP9E_SET_FRAME_PARALLEL_DECODING,

                      frame_parallel_decoding_mode_);