diff mbox series

[FFmpeg-devel] avcodec/vaapi_encode_vp9: fix > 4k encode fail issue

Message ID 20210412014724.18563-1-yuankunx.zhang@intel.com
State New
Headers show
Series [FFmpeg-devel] avcodec/vaapi_encode_vp9: fix > 4k encode fail issue
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Zhang, YuankunX April 12, 2021, 1:47 a.m. UTC
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.

Signed-off-by: Zhang yuankun <yuankunx.zhang@intel.com>
---
 libavcodec/vaapi_encode_vp9.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Zhang, YuankunX May 6, 2021, 5:33 a.m. UTC | #1
Ping on this patch.

> -----Original Message-----
> From: Zhang, YuankunX <yuankunx.zhang@intel.com>
> Sent: Monday, April 12, 2021 9:47 AM
> To: ffmpeg-devel@ffmpeg.org
> Cc: Zhang, YuankunX <yuankunx.zhang@intel.com>
> Subject: [PATCH] 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.
> 
> Signed-off-by: Zhang yuankun <yuankunx.zhang@intel.com>
> ---
>  libavcodec/vaapi_encode_vp9.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c
> index 0e1c52c92a..ed45cd6d03 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 defualt
> 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);
> --
> 2.17.1
diff mbox series

Patch

diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c
index 0e1c52c92a..ed45cd6d03 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 defualt 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);