diff options
author | Zhang yuankun <yuankunx.zhang@intel.com> | 2021-04-23 11:02:05 +0800 |
---|---|---|
committer | Zhang yuankun <yuankunx.zhang@intel.com> | 2021-04-23 11:02:05 +0800 |
commit | 722d6bb625ca825b7d15142fe5e4343ed7d5a6c8 (patch) | |
tree | b5e685db5f4e654143622f21b09953d56cc2ce12 /gst-libs | |
parent | 0193751ce844776ef1823f99aff053ee423f7004 (diff) |
libs: encoder: VP9: fix > 4k encode fail issue
The VP9 spec defines the MAX_TILE_WIDTH_B64(64), which is the maximum
width of a tile in units of superblocks. So the max width of one tile
should not be larger than 64x64=4096. When the width exceeds 4k, we
need to split it into multiple tiles in columns. The current vp9 encoder
does not handle this correctly.
The command such as:
gst-launch-1.0 videotestsrc ! video/x-raw,width=7680,height=4320 ! \
vaapivp9enc ! fakesink
will crash.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/424>
Diffstat (limited to 'gst-libs')
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapiencoder_vp9.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_vp9.c b/gst-libs/gst/vaapi/gstvaapiencoder_vp9.c index bb338452..bd47c0d6 100644 --- a/gst-libs/gst/vaapi/gstvaapiencoder_vp9.c +++ b/gst-libs/gst/vaapi/gstvaapiencoder_vp9.c @@ -33,6 +33,8 @@ #define DEBUG 1 #include "gstvaapidebug.h" +#define MAX_TILE_WIDTH_B64 64 + /* Define default rate control mode ("constant-qp") */ #define DEFAULT_RATECONTROL GST_VAAPI_RATECONTROL_CQP @@ -356,6 +358,7 @@ fill_picture (GstVaapiEncoderVP9 * encoder, VAEncPictureParameterBufferVP9 *const pic_param = picture->param; guint i, last_idx = 0, gf_idx = 0, arf_idx = 0; guint8 refresh_frame_flags = 0; + gint sb_cols = 0, min_log2_tile_columns = 0; memset (pic_param, 0, sizeof (VAEncPictureParameterBufferVP9)); @@ -399,6 +402,14 @@ fill_picture (GstVaapiEncoderVP9 * encoder, pic_param->refresh_frame_flags = refresh_frame_flags; } + /* Maximum width of a tile in units of superblocks is MAX_TILE_WIDTH_B64(64). + * When the width is enough to partition more than MAX_TILE_WIDTH_B64(64) superblocks, + * we need multi tiles to handle it.*/ + sb_cols = (pic_param->frame_width_src + 63) / 64; + while ((MAX_TILE_WIDTH_B64 << min_log2_tile_columns) < sb_cols) + ++min_log2_tile_columns; + pic_param->log2_tile_columns = min_log2_tile_columns; + pic_param->luma_ac_qindex = encoder->yac_qi; pic_param->luma_dc_qindex_delta = 1; pic_param->chroma_ac_qindex_delta = 1; |