summaryrefslogtreecommitdiff
path: root/libavcodec/vaapi_encode_vp9.c
diff options
context:
space:
mode:
authorZhang yuankun <yuankunx.zhang@intel.com>2021-04-12 09:47:24 +0800
committerHaihao Xiang <haihao.xiang@intel.com>2021-12-27 11:19:27 +0800
commitdb901276c0ae4799a0d2c8f81f09497dd66b4ed7 (patch)
tree67b6dbc2c0c5924f7a940db62b2f97a141256d13 /libavcodec/vaapi_encode_vp9.c
parentdd7c0bc4f981f7113d7bef267cc1eca8d9fb10f1 (diff)
downloadffmpeg-db901276c0ae4799a0d2c8f81f09497dd66b4ed7.tar.gz
avcodec/vaapi_encode_vp9: fix > 4k encode fail issue
This patch will fix following command: ffmpeg -hwaccel vaapi -hwaccel_output_format vaapi -i input.264 \ -vf 'scale_vaapi=w=7680:h=4096' -c:v vp9_vaapi output.ivf Max width of a vp9 tile is 4096. If the source frame > 4096, we need split to multiple tiles. Reviewed-by: Limin Wang <lance.lmwang@gmail.com> Signed-off-by: Zhang yuankun <yuankunx.zhang@intel.com> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
Diffstat (limited to 'libavcodec/vaapi_encode_vp9.c')
-rw-r--r--libavcodec/vaapi_encode_vp9.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c
index b3f45fb8fe..be706e3bd6 100644
--- a/libavcodec/vaapi_encode_vp9.c
+++ b/libavcodec/vaapi_encode_vp9.c
@@ -31,6 +31,7 @@
#define VP9_MAX_QUANT 255
+#define VP9_MAX_TILE_WIDTH 4096
typedef struct VAAPIEncodeVP9Picture {
int slot;
@@ -82,10 +83,17 @@ static int vaapi_encode_vp9_init_picture_params(AVCodecContext *avctx,
VAAPIEncodeVP9Picture *hpic = pic->priv_data;
VAEncPictureParameterBufferVP9 *vpic = pic->codec_picture_params;
int i;
+ int num_tile_columns;
vpic->reconstructed_frame = pic->recon_surface;
vpic->coded_buf = pic->output_buffer;
+ // Maximum width of a tile in units of superblocks is MAX_TILE_WIDTH_B64(64)
+ // So the number of tile columns is related to the width of the picture.
+ // We set the minimum possible number for num_tile_columns as default value.
+ num_tile_columns = (vpic->frame_width_src + VP9_MAX_TILE_WIDTH - 1) / VP9_MAX_TILE_WIDTH;
+ vpic->log2_tile_columns = num_tile_columns == 1 ? 0 : av_log2(num_tile_columns - 1) + 1;
+
switch (pic->type) {
case PICTURE_TYPE_IDR:
av_assert0(pic->nb_refs == 0);