shithub: libvpx

--- a/vp9/common/vp9_common.h

+++ b/vp9/common/vp9_common.h

@@ -67,6 +67,24 @@

 #define VP9_FRAME_MARKER 0x2

+typedef enum {

+  LEVEL_UNKNOWN = 0,

+  LEVEL_1 = 10,

+  LEVEL_1_1 = 11,

+  LEVEL_2 = 20,

+  LEVEL_2_1 = 21,

+  LEVEL_3 = 30,

+  LEVEL_3_1 = 31,

+  LEVEL_4 = 40,

+  LEVEL_4_1 = 41,

+  LEVEL_5 = 50,

+  LEVEL_5_1 = 51,

+  LEVEL_5_2 = 52,

+  LEVEL_6 = 60,

+  LEVEL_6_1 = 61,

+  LEVEL_6_2 = 62,

+  LEVEL_NOT_CARE = 255,

+} VP9_LEVEL;

 #ifdef __cplusplus

 }  // extern "C"

--- a/vp9/common/vp9_onyxc_int.h

+++ b/vp9/common/vp9_onyxc_int.h

@@ -168,6 +168,8 @@

   int allow_high_precision_mv;

+  int keep_level_stats;

   // Flag signaling that the frame context should be reset to default values.

   // 0 or 1 implies don't reset, 2 reset just the context specified in the

   // frame header, 3 reset all contexts.

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -4035,7 +4035,6 @@

   rdc->m_search_count = 0;   // Count of motion search hits.

   rdc->ex_search_count = 0;  // Exhaustive mesh search hits.

   xd->lossless = cm->base_qindex == 0 &&

                  cm->y_dc_delta_q == 0 &&

                  cm->uv_dc_delta_q == 0 &&

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -774,7 +774,6 @@

   cpi->oxcf = *oxcf;

   cpi->framerate = oxcf->init_framerate;

   cm->profile = oxcf->profile;

   cm->bit_depth = oxcf->bit_depth;

 #if CONFIG_VP9_HIGHBITDEPTH

@@ -783,6 +782,9 @@

   cm->color_space = oxcf->color_space;

   cm->color_range = oxcf->color_range;

+  cpi->target_level = oxcf->target_level;

+  cm->keep_level_stats = oxcf->target_level != LEVEL_NOT_CARE;

   cm->width = oxcf->width;

   cm->height = oxcf->height;

   alloc_compressor_data(cpi);

@@ -1472,6 +1474,9 @@

   cm->bit_depth = oxcf->bit_depth;

   cm->color_space = oxcf->color_space;

   cm->color_range = oxcf->color_range;

+  cpi->target_level = oxcf->target_level;

+  cm->keep_level_stats = oxcf->target_level != LEVEL_NOT_CARE;

   if (cm->profile <= PROFILE_1)

     assert(cm->bit_depth == VPX_BITS_8);

--- a/vp9/encoder/vp9_encoder.h

+++ b/vp9/encoder/vp9_encoder.h

@@ -227,6 +227,8 @@

   int max_threads;

+  int target_level;

   vpx_fixed_buf_t two_pass_stats_in;

   struct vpx_codec_pkt_list *output_pkt_list;

@@ -496,6 +498,8 @@

   int resize_count;

   int use_skin_detection;

+  int target_level;

   NOISE_ESTIMATE noise_estimate;

--- a/vp9/vp9_cx_iface.c

+++ b/vp9/vp9_cx_iface.c

@@ -40,6 +40,7 @@

   unsigned int                rc_max_inter_bitrate_pct;

   unsigned int                gf_cbr_boost_pct;

   unsigned int                lossless;

+  unsigned int                target_level;

   unsigned int                frame_parallel_decoding_mode;

   AQ_MODE                     aq_mode;

   unsigned int                frame_periodic_boost;

@@ -69,6 +70,7 @@

   0,                          // rc_max_inter_bitrate_pct

   0,                          // gf_cbr_boost_pct

   0,                          // lossless

+  255,                        // target_level

   1,                          // frame_parallel_decoding_mode

   NO_AQ,                      // aq_mode

   0,                          // frame_periodic_delta_q

@@ -196,6 +198,17 @@

   RANGE_CHECK(cfg, ss_number_layers, 1, VPX_SS_MAX_LAYERS);

   RANGE_CHECK(cfg, ts_number_layers, 1, VPX_TS_MAX_LAYERS);

+  {

+    unsigned int level = extra_cfg->target_level;

+    if (level != LEVEL_1 && level != LEVEL_1_1 && level != LEVEL_2 &&

+        level != LEVEL_2_1 && level != LEVEL_3 && level != LEVEL_3_1 &&

+        level != LEVEL_4 && level != LEVEL_4_1 && level != LEVEL_5 &&

+        level != LEVEL_5_1 && level != LEVEL_5_2 && level != LEVEL_6 &&

+        level != LEVEL_6_1 && level != LEVEL_6_2 &&

+        level != LEVEL_UNKNOWN && level != LEVEL_NOT_CARE)

+    ERROR("target_level is invalid");

+  }

   if (cfg->ss_number_layers * cfg->ts_number_layers > VPX_MAX_LAYERS)

     ERROR("ss_number_layers * ts_number_layers is out of range");

   if (cfg->ts_number_layers > 1) {

@@ -509,6 +522,8 @@

   oxcf->temporal_layering_mode = (enum vp9e_temporal_layering_mode)

       cfg->temporal_layering_mode;

+  oxcf->target_level = extra_cfg->target_level;

   for (sl = 0; sl < oxcf->ss_number_layers; ++sl) {

 #if CONFIG_SPATIAL_SVC

     oxcf->ss_enable_auto_arf[sl] = cfg->ss_enable_auto_alt_ref[sl];

@@ -535,6 +550,7 @@

/*

   printf("Current VP9 Settings: \n");

   printf("target_bandwidth: %d\n", oxcf->target_bandwidth);

+  printf("target_level: %d\n", oxcf->target_level);

   printf("noise_sensitivity: %d\n", oxcf->noise_sensitivity);

   printf("sharpness: %d\n",    oxcf->sharpness);

   printf("cpu_used: %d\n",  oxcf->cpu_used);

@@ -784,6 +800,13 @@

   return update_extra_cfg(ctx, &extra_cfg);

+static vpx_codec_err_t ctrl_set_target_level(vpx_codec_alg_priv_t *ctx,

+                                             va_list args) {

+  struct vp9_extracfg extra_cfg = ctx->extra_cfg;

+  extra_cfg.target_level = CAST(VP9E_SET_LEVEL_STATS, args);

+  return update_extra_cfg(ctx, &extra_cfg);

+}

 static vpx_codec_err_t encoder_init(vpx_codec_ctx_t *ctx,

                                     vpx_codec_priv_enc_mr_cfg_t *data) {

   vpx_codec_err_t res = VPX_CODEC_OK;

@@ -1516,6 +1539,7 @@

   {VP9E_SET_MAX_GF_INTERVAL,          ctrl_set_max_gf_interval},

   {VP9E_SET_SVC_REF_FRAME_CONFIG,     ctrl_set_svc_ref_frame_config},

   {VP9E_SET_RENDER_SIZE,              ctrl_set_render_size},

+  {VP9E_SET_TARGET_LEVEL,             ctrl_set_target_level},

   // Getters

   {VP8E_GET_LAST_QUANTIZER,           ctrl_get_quantizer},

--- a/vpx/vp8cx.h

+++ b/vpx/vp8cx.h

@@ -554,6 +554,15 @@

    * Supported in codecs: VP9

*/

   VP9E_SET_RENDER_SIZE,

+  /*!\brief Codec control function to set target level.

+   *

+   * 255: off (default); 0: only keep level stats; 10: target for level 1.0;

+   * 11: target for level 1.1; ... 62: target for level 6.2

+   *

+   * Supported in codecs: VP9

+   */

+  VP9E_SET_TARGET_LEVEL,

};

 /*!\brief vpx 1-D scaling mode

@@ -808,6 +817,9 @@

 VPX_CTRL_USE_TYPE(VP9E_SET_RENDER_SIZE, int *)

 #define VPX_CTRL_VP9E_SET_RENDER_SIZE

+VPX_CTRL_USE_TYPE(VP9E_SET_LEVEL_STATS,  unsigned int)

+#define VPX_CTRL_VP9E_SET_LEVEL_STATS

 /*!\endcond */

 /*! @} - end defgroup vp8_encoder */

--- a/vpxenc.c

+++ b/vpxenc.c

@@ -444,6 +444,11 @@

 static const arg_def_t tune_content = ARG_DEF_ENUM(

     NULL, "tune-content", 1, "Tune content type", tune_content_enum);

+static const arg_def_t target_level = ARG_DEF(

+    NULL, "target-level", 1,

+    "Target level (255: off (default); 0: only keep level stats; 10: level 1.0;"

+    " 11: level 1.1; ... 62: level 6.2)");

 #endif

 #if CONFIG_VP9_ENCODER

@@ -454,7 +459,7 @@

   &gf_cbr_boost_pct, &lossless,

   &frame_parallel_decoding, &aq_mode, &frame_periodic_boost,

   &noise_sens, &tune_content, &input_color_space,

-  &min_gf_interval, &max_gf_interval,

+  &min_gf_interval, &max_gf_interval, &target_level,

 #if CONFIG_VP9_HIGHBITDEPTH

   &bitdeptharg, &inbitdeptharg,

 #endif  // CONFIG_VP9_HIGHBITDEPTH

@@ -470,7 +475,7 @@

   VP9E_SET_LOSSLESS, VP9E_SET_FRAME_PARALLEL_DECODING, VP9E_SET_AQ_MODE,

   VP9E_SET_FRAME_PERIODIC_BOOST, VP9E_SET_NOISE_SENSITIVITY,

   VP9E_SET_TUNE_CONTENT, VP9E_SET_COLOR_SPACE,

-  VP9E_SET_MIN_GF_INTERVAL, VP9E_SET_MAX_GF_INTERVAL,

+  VP9E_SET_MIN_GF_INTERVAL, VP9E_SET_MAX_GF_INTERVAL, VP9E_SET_TARGET_LEVEL,

};

 #endif

--

⑨