shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Add Flag to Enable Row Based MultiThreading"

--- a/vp9/decoder/vp9_decoder.h

+++ b/vp9/decoder/vp9_decoder.h

@@ -72,6 +72,8 @@

   int inv_tile_order;

   int need_resync;   // wait for key/intra-only frame.

   int hold_ref_buf;  // hold the reference buffer.

+

+  int row_mt;

 } VP9Decoder;

 int vp9_receive_compressed_data(struct VP9Decoder *pbi, size_t size,

--- a/vp9/vp9_dx_iface.c

+++ b/vp9/vp9_dx_iface.c

@@ -235,6 +235,19 @@

   flags->noise_level = ctx->postproc_cfg.noise_level;

 }

+#undef ERROR

+#define ERROR(str)                  \

+  do {                              \

+    ctx->base.err_detail = str;     \

+    return VPX_CODEC_INVALID_PARAM; \

+  } while (0)

+

+#define RANGE_CHECK(p, memb, lo, hi)                                 \

+  do {                                                               \

+    if (!(((p)->memb == lo || (p)->memb > (lo)) && (p)->memb <= hi)) \

+      ERROR(#memb " out of range [" #lo ".." #hi "]");               \

+  } while (0)

+

 static vpx_codec_err_t init_decoder(vpx_codec_alg_priv_t *ctx) {

   ctx->last_show_frame = -1;

   ctx->need_resync = 1;

@@ -251,6 +264,9 @@

   ctx->pbi->max_threads = ctx->cfg.threads;

   ctx->pbi->inv_tile_order = ctx->invert_tile_order;

+  RANGE_CHECK(ctx, row_mt, 0, 1);

+  ctx->pbi->row_mt = ctx->row_mt;

+

   // If postprocessing was enabled by the application and a

   // configuration has not been provided, default it.

   if (!ctx->postproc_cfg_set && (ctx->base.init_flags & VPX_CODEC_USE_POSTPROC))

@@ -632,6 +648,13 @@

     return VPX_CODEC_OK;

 }

+static vpx_codec_err_t ctrl_set_row_mt(vpx_codec_alg_priv_t *ctx,

+                                       va_list args) {

+  ctx->row_mt = va_arg(args, int);

+

+  return VPX_CODEC_OK;

+}

+

 static vpx_codec_ctrl_fn_map_t decoder_ctrl_maps[] = {

   { VP8_COPY_REFERENCE, ctrl_copy_reference },

@@ -643,6 +666,7 @@

   { VP9_SET_BYTE_ALIGNMENT, ctrl_set_byte_alignment },

   { VP9_SET_SKIP_LOOP_FILTER, ctrl_set_skip_loop_filter },

   { VP9_DECODE_SVC_SPATIAL_LAYER, ctrl_set_spatial_layer_svc },

+  { VP9D_SET_ROW_MT, ctrl_set_row_mt },

   // Getters

   { VPXD_GET_LAST_QUANTIZER, ctrl_get_quantizer },

--- a/vp9/vp9_dx_iface.h

+++ b/vp9/vp9_dx_iface.h

@@ -45,6 +45,7 @@

   // Allow for decoding up to a given spatial layer for SVC stream.

   int svc_decoding;

   int svc_spatial_layer;

+  int row_mt;

 };

 #endif  // VP9_VP9_DX_IFACE_H_

--- a/vpx/vp8dx.h

+++ b/vpx/vp8dx.h

@@ -124,6 +124,14 @@

    */

   VPXD_GET_LAST_QUANTIZER,

+  /*!\brief Codec control function to set row level multi-threading.

+   *

+   * 0 : off, 1 : on

+   *

+   * Supported in codecs: VP9

+   */

+  VP9D_SET_ROW_MT,

+

   VP8_DECODER_CTRL_ID_MAX

 };

@@ -181,6 +189,8 @@

 VPX_CTRL_USE_TYPE(VP9_DECODE_SVC_SPATIAL_LAYER, int)

 #define VPX_CTRL_VP9_SET_SKIP_LOOP_FILTER

 VPX_CTRL_USE_TYPE(VP9_SET_SKIP_LOOP_FILTER, int)

+#define VPX_CTRL_VP9_DECODE_SET_ROW_MT

+VPX_CTRL_USE_TYPE(VP9D_SET_ROW_MT, int)

 /*!\endcond */

 /*! @} - end defgroup vp8_decoder */

--- a/vpxdec.c

+++ b/vpxdec.c

@@ -98,19 +98,20 @@

     NULL, "svc-decode-layer", 1, "Decode SVC stream up to given spatial layer");

 static const arg_def_t framestatsarg =

     ARG_DEF(NULL, "framestats", 1, "Output per-frame stats (.csv format)");

+static const arg_def_t rowmtarg =

+    ARG_DEF(NULL, "row-mt", 1, "Enable multi-threading to run row-wise");

 static const arg_def_t *all_args[] = {

-  &help,           &codecarg,          &use_yv12,

-  &use_i420,       &flipuvarg,         &rawvideo,

-  &noblitarg,      &progressarg,       &limitarg,

-  &skiparg,        &postprocarg,       &summaryarg,

-  &outputfile,     &threadsarg,        &frameparallelarg,

-  &verbosearg,     &scalearg,          &fb_arg,

-  &md5arg,         &error_concealment, &continuearg,

+  &help,           &codecarg,      &use_yv12,         &use_i420,

+  &flipuvarg,      &rawvideo,      &noblitarg,        &progressarg,

+  &limitarg,       &skiparg,       &postprocarg,      &summaryarg,

+  &outputfile,     &threadsarg,    &frameparallelarg, &verbosearg,

+  &scalearg,       &fb_arg,        &md5arg,           &error_concealment,

+  &continuearg,

 #if CONFIG_VP9_HIGHBITDEPTH

   &outbitdeptharg,

 #endif

-  &svcdecodingarg, &framestatsarg,     NULL

+  &svcdecodingarg, &framestatsarg, &rowmtarg,         NULL

 };

 #if CONFIG_VP8_DECODER

@@ -507,6 +508,7 @@

   int arg_skip = 0;

   int ec_enabled = 0;

   int keep_going = 0;

+  int enable_row_mt = 0;

   const VpxInterface *interface = NULL;

   const VpxInterface *fourcc_interface = NULL;

   uint64_t dx_time = 0;

@@ -629,6 +631,8 @@

         die("Error: Could not open --framestats file (%s) for writing.\n",

             arg.val);

       }

+    } else if (arg_match(&arg, &rowmtarg, argi)) {

+      enable_row_mt = arg_parse_uint(&arg);

     }

 #if CONFIG_VP8_DECODER

     else if (arg_match(&arg, &addnoise_level, argi)) {

@@ -753,6 +757,11 @@

               vpx_codec_error(&decoder));

       goto fail;

     }

+  }

+  if (vpx_codec_control(&decoder, VP9D_SET_ROW_MT, enable_row_mt)) {

+    fprintf(stderr, "Failed to set decoder in row multi-thread mode: %s\n",

+            vpx_codec_error(&decoder));

+    goto fail;

   }

   if (!quiet) fprintf(stderr, "%s\n", decoder.name);