shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9/10: improve support for render_width/height."

--- a/test/encode_test_driver.h

+++ b/test/encode_test_driver.h

@@ -124,6 +124,11 @@

     ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError();

   }

+  void Control(int ctrl_id, int *arg) {

+    const vpx_codec_err_t res = vpx_codec_control_(&encoder_, ctrl_id, arg);

+    ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError();

+  }

+

   void Control(int ctrl_id, struct vpx_scaling_mode *arg) {

     const vpx_codec_err_t res = vpx_codec_control_(&encoder_, ctrl_id, arg);

     ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError();

--- a/test/vp9_encoder_parms_get_to_decoder.cc

+++ b/test/vp9_encoder_parms_get_to_decoder.cc

@@ -42,6 +42,7 @@

   int32_t frame_parallel;

   int32_t color_range;

   vpx_color_space_t cs;

+  int render_size[2];

   // TODO(JBB): quantizers / bitrate

 };

@@ -49,7 +50,7 @@

   {0, 0, 0, 1, 0, 0, VPX_CS_BT_601},

   {0, 0, 0, 0, 0, 1, VPX_CS_BT_709},

   {0, 0, 1, 0, 0, 1, VPX_CS_BT_2020},

-  {0, 2, 0, 0, 1, 0, VPX_CS_UNKNOWN},

+  {0, 2, 0, 0, 1, 0, VPX_CS_UNKNOWN, { 640, 480 }},

   // TODO(JBB): Test profiles (requires more work).

 };

@@ -88,6 +89,8 @@

       encoder->Control(VP8E_SET_ARNR_MAXFRAMES, 7);

       encoder->Control(VP8E_SET_ARNR_STRENGTH, 5);

       encoder->Control(VP8E_SET_ARNR_TYPE, 3);

+      if (encode_parms.render_size[0] > 0 && encode_parms.render_size[1] > 0)

+        encoder->Control(VP9E_SET_RENDER_SIZE, encode_parms.render_size);

     }

   }

@@ -118,6 +121,10 @@

     }

     EXPECT_EQ(encode_parms.color_range, common->color_range);

     EXPECT_EQ(encode_parms.cs, common->color_space);

+    if (encode_parms.render_size[0] > 0 && encode_parms.render_size[1] > 0) {

+      EXPECT_EQ(encode_parms.render_size[0], common->render_width);

+      EXPECT_EQ(encode_parms.render_size[1], common->render_height);

+    }

     EXPECT_EQ(encode_parms.tile_cols, common->log2_tile_cols);

     EXPECT_EQ(encode_parms.tile_rows, common->log2_tile_rows);

--- a/vp10/decoder/decodeframe.c

+++ b/vp10/decoder/decodeframe.c

@@ -1253,6 +1253,8 @@

   pool->frame_bufs[cm->new_fb_idx].buf.bit_depth = (unsigned int)cm->bit_depth;

   pool->frame_bufs[cm->new_fb_idx].buf.color_space = cm->color_space;

   pool->frame_bufs[cm->new_fb_idx].buf.color_range = cm->color_range;

+  pool->frame_bufs[cm->new_fb_idx].buf.render_width  = cm->render_width;

+  pool->frame_bufs[cm->new_fb_idx].buf.render_height = cm->render_height;

 }

 static INLINE int valid_ref_frame_img_fmt(vpx_bit_depth_t ref_bit_depth,

@@ -1335,6 +1337,8 @@

   pool->frame_bufs[cm->new_fb_idx].buf.bit_depth = (unsigned int)cm->bit_depth;

   pool->frame_bufs[cm->new_fb_idx].buf.color_space = cm->color_space;

   pool->frame_bufs[cm->new_fb_idx].buf.color_range = cm->color_range;

+  pool->frame_bufs[cm->new_fb_idx].buf.render_width  = cm->render_width;

+  pool->frame_bufs[cm->new_fb_idx].buf.render_height = cm->render_height;

 }

 static void setup_tile_info(VP10_COMMON *cm, struct vpx_read_bit_buffer *rb) {

@@ -1975,6 +1979,8 @@

 #endif

   get_frame_new_buffer(cm)->color_space = cm->color_space;

   get_frame_new_buffer(cm)->color_range = cm->color_range;

+  get_frame_new_buffer(cm)->render_width  = cm->render_width;

+  get_frame_new_buffer(cm)->render_height = cm->render_height;

   if (pbi->need_resync) {

     vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,

--- a/vp10/encoder/encoder.c

+++ b/vp10/encoder/encoder.c

@@ -1455,8 +1455,13 @@

   cm->interp_filter = cpi->sf.default_interp_filter;

-  cm->render_width = cpi->oxcf.width;

-  cm->render_height = cpi->oxcf.height;

+  if (cpi->oxcf.render_width > 0 && cpi->oxcf.render_height > 0) {

+    cm->render_width = cpi->oxcf.render_width;

+    cm->render_height = cpi->oxcf.render_height;

+  } else {

+    cm->render_width = cpi->oxcf.width;

+    cm->render_height = cpi->oxcf.height;

+  }

   cm->width = cpi->oxcf.width;

   cm->height = cpi->oxcf.height;

@@ -3627,6 +3632,8 @@

   cm->frame_to_show = get_frame_new_buffer(cm);

   cm->frame_to_show->color_space = cm->color_space;

   cm->frame_to_show->color_range = cm->color_range;

+  cm->frame_to_show->render_width  = cm->render_width;

+  cm->frame_to_show->render_height = cm->render_height;

   // Pick the loop filter level for the frame.

   loopfilter_frame(cpi, cm);

--- a/vp10/encoder/encoder.h

+++ b/vp10/encoder/encoder.h

@@ -229,6 +229,8 @@

 #endif

   vpx_color_space_t color_space;

   int color_range;

+  int render_width;

+  int render_height;

 } VP10EncoderConfig;

 static INLINE int is_lossless_requested(const VP10EncoderConfig *cfg) {

--- a/vp10/vp10_cx_iface.c

+++ b/vp10/vp10_cx_iface.c

@@ -46,6 +46,8 @@

   vp9e_tune_content           content;

   vpx_color_space_t           color_space;

   int                         color_range;

+  int                         render_width;

+  int                         render_height;

 };

 static struct vp10_extracfg default_extra_cfg = {

@@ -73,6 +75,8 @@

   VP9E_CONTENT_DEFAULT,       // content

   VPX_CS_UNKNOWN,             // color space

   0,                          // color range

+  0,                          // render width

+  0,                          // render height

 };

 struct vpx_codec_alg_priv {

@@ -402,6 +406,8 @@

   oxcf->color_space = extra_cfg->color_space;

   oxcf->color_range = extra_cfg->color_range;

+  oxcf->render_width  = extra_cfg->render_width;

+  oxcf->render_height = extra_cfg->render_height;

   oxcf->arnr_max_frames = extra_cfg->arnr_max_frames;

   oxcf->arnr_strength   = extra_cfg->arnr_strength;

   oxcf->min_gf_interval = extra_cfg->min_gf_interval;

@@ -1232,6 +1238,15 @@

   return update_extra_cfg(ctx, &extra_cfg);

 }

+static vpx_codec_err_t ctrl_set_render_size(vpx_codec_alg_priv_t *ctx,

+                                            va_list args) {

+  struct vp10_extracfg extra_cfg = ctx->extra_cfg;

+  int *const render_size = va_arg(args, int *);

+  extra_cfg.render_width  = render_size[0];

+  extra_cfg.render_height = render_size[0];

+  return update_extra_cfg(ctx, &extra_cfg);

+}

+

 static vpx_codec_ctrl_fn_map_t encoder_ctrl_maps[] = {

   {VP8_COPY_REFERENCE,                ctrl_copy_reference},

   {VP8E_UPD_ENTROPY,                  ctrl_update_entropy},

@@ -1269,6 +1284,7 @@

   {VP9E_SET_NOISE_SENSITIVITY,        ctrl_set_noise_sensitivity},

   {VP9E_SET_MIN_GF_INTERVAL,          ctrl_set_min_gf_interval},

   {VP9E_SET_MAX_GF_INTERVAL,          ctrl_set_max_gf_interval},

+  {VP9E_SET_RENDER_SIZE,              ctrl_set_render_size},

   // Getters

   {VP8E_GET_LAST_QUANTIZER,           ctrl_get_quantizer},

--- a/vp10/vp10_iface_common.h

+++ b/vp10/vp10_iface_common.h

@@ -43,6 +43,8 @@

   img->h = ALIGN_POWER_OF_TWO(yv12->y_height + 2 * VP9_ENC_BORDER_IN_PIXELS, 3);

   img->d_w = yv12->y_crop_width;

   img->d_h = yv12->y_crop_height;

+  img->r_w = yv12->render_width;

+  img->r_h = yv12->render_height;

   img->x_chroma_shift = yv12->subsampling_x;

   img->y_chroma_shift = yv12->subsampling_y;

   img->planes[VPX_PLANE_Y] = yv12->y_buffer;

@@ -84,6 +86,8 @@

   yv12->y_crop_width  = img->d_w;

   yv12->y_crop_height = img->d_h;

+  yv12->render_width  = img->r_w;

+  yv12->render_height = img->r_h;

   yv12->y_width  = img->d_w;

   yv12->y_height = img->d_h;

--- a/vp8/vp8_dx_iface.c

+++ b/vp8/vp8_dx_iface.c

@@ -246,8 +246,8 @@

     img->fmt = VPX_IMG_FMT_I420;

     img->w = yv12->y_stride;

     img->h = (yv12->y_height + 2 * VP8BORDERINPIXELS + 15) & ~15;

-    img->d_w = yv12->y_width;

-    img->d_h = yv12->y_height;

+    img->d_w = img->r_w = yv12->y_width;

+    img->d_h = img->r_h = yv12->y_height;

     img->x_chroma_shift = 1;

     img->y_chroma_shift = 1;

     img->planes[VPX_PLANE_Y] = yv12->y_buffer;

--- a/vp9/decoder/vp9_decodeframe.c

+++ b/vp9/decoder/vp9_decodeframe.c

@@ -1257,6 +1257,8 @@

   pool->frame_bufs[cm->new_fb_idx].buf.bit_depth = (unsigned int)cm->bit_depth;

   pool->frame_bufs[cm->new_fb_idx].buf.color_space = cm->color_space;

   pool->frame_bufs[cm->new_fb_idx].buf.color_range = cm->color_range;

+  pool->frame_bufs[cm->new_fb_idx].buf.render_width  = cm->render_width;

+  pool->frame_bufs[cm->new_fb_idx].buf.render_height = cm->render_height;

 }

 static INLINE int valid_ref_frame_img_fmt(vpx_bit_depth_t ref_bit_depth,

@@ -1339,6 +1341,8 @@

   pool->frame_bufs[cm->new_fb_idx].buf.bit_depth = (unsigned int)cm->bit_depth;

   pool->frame_bufs[cm->new_fb_idx].buf.color_space = cm->color_space;

   pool->frame_bufs[cm->new_fb_idx].buf.color_range = cm->color_range;

+  pool->frame_bufs[cm->new_fb_idx].buf.render_width  = cm->render_width;

+  pool->frame_bufs[cm->new_fb_idx].buf.render_height = cm->render_height;

 }

 static void setup_tile_info(VP9_COMMON *cm, struct vpx_read_bit_buffer *rb) {

@@ -1948,6 +1952,8 @@

 #endif

   get_frame_new_buffer(cm)->color_space = cm->color_space;

   get_frame_new_buffer(cm)->color_range = cm->color_range;

+  get_frame_new_buffer(cm)->render_width  = cm->render_width;

+  get_frame_new_buffer(cm)->render_height = cm->render_height;

   if (pbi->need_resync) {

     vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,

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

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

@@ -1509,8 +1509,13 @@

   cm->interp_filter = cpi->sf.default_interp_filter;

-  cm->render_width = cpi->oxcf.width;

-  cm->render_height = cpi->oxcf.height;

+  if (cpi->oxcf.render_width > 0 && cpi->oxcf.render_height > 0) {

+    cm->render_width = cpi->oxcf.render_width;

+    cm->render_height = cpi->oxcf.render_height;

+  } else {

+    cm->render_width = cpi->oxcf.width;

+    cm->render_height = cpi->oxcf.height;

+  }

   if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) {

     cm->width = cpi->oxcf.width;

     cm->height = cpi->oxcf.height;

@@ -3824,6 +3829,8 @@

   cm->frame_to_show = get_frame_new_buffer(cm);

   cm->frame_to_show->color_space = cm->color_space;

   cm->frame_to_show->color_range = cm->color_range;

+  cm->frame_to_show->render_width  = cm->render_width;

+  cm->frame_to_show->render_height = cm->render_height;

   // Pick the loop filter level for the frame.

   loopfilter_frame(cpi, cm);

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

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

@@ -239,6 +239,8 @@

 #endif

   vpx_color_space_t color_space;

   int color_range;

+  int render_width;

+  int render_height;

   VP9E_TEMPORAL_LAYERING_MODE temporal_layering_mode;

 } VP9EncoderConfig;

--- a/vp9/vp9_cx_iface.c

+++ b/vp9/vp9_cx_iface.c

@@ -46,6 +46,8 @@

   vp9e_tune_content           content;

   vpx_color_space_t           color_space;

   int                         color_range;

+  int                         render_width;

+  int                         render_height;

 };

 static struct vp9_extracfg default_extra_cfg = {

@@ -73,6 +75,8 @@

   VP9E_CONTENT_DEFAULT,       // content

   VPX_CS_UNKNOWN,             // color space

   0,                          // color range

+  0,                          // render width

+  0,                          // render height

 };

 struct vpx_codec_alg_priv {

@@ -469,6 +473,8 @@

   oxcf->color_space = extra_cfg->color_space;

   oxcf->color_range = extra_cfg->color_range;

+  oxcf->render_width  = extra_cfg->render_width;

+  oxcf->render_height = extra_cfg->render_height;

   oxcf->arnr_max_frames = extra_cfg->arnr_max_frames;

   oxcf->arnr_strength   = extra_cfg->arnr_strength;

   oxcf->min_gf_interval = extra_cfg->min_gf_interval;

@@ -1461,6 +1467,15 @@

   return update_extra_cfg(ctx, &extra_cfg);

 }

+static vpx_codec_err_t ctrl_set_render_size(vpx_codec_alg_priv_t *ctx,

+                                            va_list args) {

+  struct vp9_extracfg extra_cfg = ctx->extra_cfg;

+  int *const render_size = va_arg(args, int *);

+  extra_cfg.render_width  = render_size[0];

+  extra_cfg.render_height = render_size[1];

+  return update_extra_cfg(ctx, &extra_cfg);

+}

+

 static vpx_codec_ctrl_fn_map_t encoder_ctrl_maps[] = {

   {VP8_COPY_REFERENCE,                ctrl_copy_reference},

   {VP8E_UPD_ENTROPY,                  ctrl_update_entropy},

@@ -1502,6 +1517,7 @@

   {VP9E_SET_MIN_GF_INTERVAL,          ctrl_set_min_gf_interval},

   {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},

   // Getters

   {VP8E_GET_LAST_QUANTIZER,           ctrl_get_quantizer},

--- a/vp9/vp9_iface_common.h

+++ b/vp9/vp9_iface_common.h

@@ -43,6 +43,8 @@

   img->h = ALIGN_POWER_OF_TWO(yv12->y_height + 2 * VP9_ENC_BORDER_IN_PIXELS, 3);

   img->d_w = yv12->y_crop_width;

   img->d_h = yv12->y_crop_height;

+  img->r_w = yv12->render_width;

+  img->r_h = yv12->render_height;

   img->x_chroma_shift = yv12->subsampling_x;

   img->y_chroma_shift = yv12->subsampling_y;

   img->planes[VPX_PLANE_Y] = yv12->y_buffer;

@@ -84,6 +86,8 @@

   yv12->y_crop_width  = img->d_w;

   yv12->y_crop_height = img->d_h;

+  yv12->render_width  = img->r_w;

+  yv12->render_height = img->r_h;

   yv12->y_width  = img->d_w;

   yv12->y_height = img->d_h;

--- a/vpx/vp8cx.h

+++ b/vpx/vp8cx.h

@@ -564,6 +564,14 @@

    * Supported in codecs: VP9

   */

   VP9E_SET_SVC_REF_FRAME_CONFIG,

+

+  /*!\brief Codec control function to set intended rendering image size.

+   *

+   * By default, this is identical to the image size in pixels.

+   *

+   * Supported in codecs: VP9

+   */

+  VP9E_SET_RENDER_SIZE,

 };

 /*!\brief vpx 1-D scaling mode

@@ -798,6 +806,13 @@

 VPX_CTRL_USE_TYPE(VP9E_SET_COLOR_RANGE, int)

 VPX_CTRL_USE_TYPE(VP9E_SET_SVC_REF_FRAME_CONFIG, vpx_svc_ref_frame_config_t *)

+

+/*!\brief

+ *

+ * TODO(rbultje) : add support of the control in ffmpeg

+ */

+#define VPX_CTRL_VP9E_SET_RENDER_SIZE

+VPX_CTRL_USE_TYPE(VP9E_SET_RENDER_SIZE, int *)

 /*! @} - end defgroup vp8_encoder */

 #ifdef __cplusplus

 }  // extern "C"

--- a/vpx/vpx_image.h

+++ b/vpx/vpx_image.h

@@ -93,6 +93,10 @@

     unsigned int  d_w;   /**< Displayed image width */

     unsigned int  d_h;   /**< Displayed image height */

+    /* Image intended rendering dimensions */

+    unsigned int  r_w;   /**< Intended rendering image width */

+    unsigned int  r_h;   /**< Intended rendering image height */

+

     /* Chroma subsampling info */

     unsigned int  x_chroma_shift;   /**< subsampling order, X */

     unsigned int  y_chroma_shift;   /**< subsampling order, Y */

--- a/vpx_scale/yv12config.h

+++ b/vpx_scale/yv12config.h

@@ -57,6 +57,8 @@

   unsigned int bit_depth;

   vpx_color_space_t color_space;

   int color_range;

+  int render_width;

+  int render_height;

   int corrupted;

   int flags;