[FFmpeg-cvslog] hevcdec: add a VAAPI hwaccel
Anton Khirnov
git at videolan.org
Sat Apr 29 13:45:28 EEST 2017
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Oct 2 08:51:32 2016 +0200| [ea8b730d8e67152107d7fcdd5590bbb51ec236b1] | committer: Anton Khirnov
hevcdec: add a VAAPI hwaccel
Partially based on a patch by Timo Rothenpieler <timo at rothenpieler.org>.
Additional scaling list handling fix by Jun Zhao <mypopydev at gmail.com>.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea8b730d8e67152107d7fcdd5590bbb51ec236b1
---
Changelog | 2 +-
configure | 3 +
libavcodec/Makefile | 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/hevcdec.c | 6 +-
libavcodec/vaapi_decode.c | 1 +
libavcodec/vaapi_hevc.c | 439 ++++++++++++++++++++++++++++++++++++++++++++++
libavcodec/version.h | 2 +-
8 files changed, 452 insertions(+), 3 deletions(-)
diff --git a/Changelog b/Changelog
index ab7f1b6bb0..e17ef204a6 100644
--- a/Changelog
+++ b/Changelog
@@ -4,7 +4,7 @@ releases are sorted from youngest to oldest.
version <next>:
- Support for spherical videos
- Intel QSV-accelerated VP8 and VC-1 decoding
-- VAAPI-accelerated VP8 decoding
+- VAAPI-accelerated VP8 and HEVC decoding
- VAAPI-accelerated deinterlacing
diff --git a/configure b/configure
index 365bbb2bf2..d30d38445e 100755
--- a/configure
+++ b/configure
@@ -2157,6 +2157,8 @@ hevc_d3d11va_hwaccel_select="hevc_decoder"
hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"
hevc_dxva2_hwaccel_select="hevc_decoder"
hevc_qsv_hwaccel_deps="libmfx"
+hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC"
+hevc_vaapi_hwaccel_select="hevc_decoder"
hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC"
hevc_vdpau_hwaccel_select="hevc_decoder"
mpeg1_vdpau_hwaccel_deps="vdpau"
@@ -4569,6 +4571,7 @@ check_type "windows.h dxva.h" "DXVA_PicParams_HEVC" -DWINAPI_FAMILY=WINAPI_FAMIL
check_type "windows.h d3d11.h" "ID3D11VideoDecoder"
check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602
+check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC"
check_type "va/va.h va/va_dec_vp8.h" "VAPictureParameterBufferVP8"
check_type "va/va.h va/va_vpp.h" "VAProcPipelineParameterBuffer"
check_type "va/va.h va/va_enc_h264.h" "VAEncPictureParameterBufferH264"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index f07253a84d..239a4c0f0a 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -629,6 +629,7 @@ OBJS-$(CONFIG_H264_VDPAU_HWACCEL) += vdpau_h264.o
OBJS-$(CONFIG_HEVC_D3D11VA_HWACCEL) += dxva2_hevc.o
OBJS-$(CONFIG_HEVC_DXVA2_HWACCEL) += dxva2_hevc.o
OBJS-$(CONFIG_HEVC_QSV_HWACCEL) += qsvdec_h2645.o
+OBJS-$(CONFIG_HEVC_VAAPI_HWACCEL) += vaapi_hevc.o
OBJS-$(CONFIG_HEVC_VDPAU_HWACCEL) += vdpau_hevc.o
OBJS-$(CONFIG_MPEG1_VDPAU_HWACCEL) += vdpau_mpeg12.o
OBJS-$(CONFIG_MPEG2_D3D11VA_HWACCEL) += dxva2_mpeg2.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 591fd87339..74cbc8ff03 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -79,6 +79,7 @@ void avcodec_register_all(void)
REGISTER_HWACCEL(HEVC_D3D11VA, hevc_d3d11va);
REGISTER_HWACCEL(HEVC_DXVA2, hevc_dxva2);
REGISTER_HWACCEL(HEVC_QSV, hevc_qsv);
+ REGISTER_HWACCEL(HEVC_VAAPI, hevc_vaapi);
REGISTER_HWACCEL(HEVC_VDPAU, hevc_vdpau);
REGISTER_HWACCEL(MPEG1_VDPAU, mpeg1_vdpau);
REGISTER_HWACCEL(MPEG2_D3D11VA, mpeg2_d3d11va);
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index 147243e3fe..8326690038 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -382,7 +382,8 @@ static void export_stream_params(AVCodecContext *avctx, const HEVCParamSets *ps,
static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps)
{
- #define HWACCEL_MAX (CONFIG_HEVC_DXVA2_HWACCEL + CONFIG_HEVC_D3D11VA_HWACCEL + CONFIG_HEVC_VDPAU_HWACCEL)
+ #define HWACCEL_MAX (CONFIG_HEVC_DXVA2_HWACCEL + CONFIG_HEVC_D3D11VA_HWACCEL + \
+ CONFIG_HEVC_VAAPI_HWACCEL + CONFIG_HEVC_VDPAU_HWACCEL)
enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts;
if (sps->pix_fmt == AV_PIX_FMT_YUV420P || sps->pix_fmt == AV_PIX_FMT_YUVJ420P ||
@@ -390,6 +391,9 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps)
#if CONFIG_HEVC_DXVA2_HWACCEL
*fmt++ = AV_PIX_FMT_DXVA2_VLD;
#endif
+#if CONFIG_HEVC_VAAPI_HWACCEL
+ *fmt++ = AV_PIX_FMT_VAAPI;
+#endif
}
if (sps->pix_fmt == AV_PIX_FMT_YUV420P || sps->pix_fmt == AV_PIX_FMT_YUVJ420P) {
#if CONFIG_HEVC_D3D11VA_HWACCEL
diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c
index b02f2b8cf3..88bd889515 100644
--- a/libavcodec/vaapi_decode.c
+++ b/libavcodec/vaapi_decode.c
@@ -250,6 +250,7 @@ static const struct {
MAP(H264, H264_HIGH, H264High ),
#if VA_CHECK_VERSION(0, 37, 0)
MAP(HEVC, HEVC_MAIN, HEVCMain ),
+ MAP(HEVC, HEVC_MAIN_10, HEVCMain10 ),
#endif
MAP(WMV3, VC1_SIMPLE, VC1Simple ),
MAP(WMV3, VC1_MAIN, VC1Main ),
diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c
new file mode 100644
index 0000000000..4b4d8782ac
--- /dev/null
+++ b/libavcodec/vaapi_hevc.c
@@ -0,0 +1,439 @@
+/*
+ * HEVC HW decode acceleration through VA API
+ *
+ * Copyright (C) 2015 Timo Rothenpieler <timo at rothenpieler.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <va/va.h>
+#include <va/va_dec_hevc.h>
+
+#include "avcodec.h"
+#include "hevcdec.h"
+#include "hwaccel.h"
+#include "vaapi_decode.h"
+
+typedef struct VAAPIDecodePictureHEVC {
+ VAPictureParameterBufferHEVC pic_param;
+ VASliceParameterBufferHEVC last_slice_param;
+ const uint8_t *last_buffer;
+ size_t last_size;
+
+ VAAPIDecodePicture pic;
+} VAAPIDecodePictureHEVC;
+
+static void init_vaapi_pic(VAPictureHEVC *va_pic)
+{
+ va_pic->picture_id = VA_INVALID_ID;
+ va_pic->flags = VA_PICTURE_HEVC_INVALID;
+ va_pic->pic_order_cnt = 0;
+}
+
+static void fill_vaapi_pic(VAPictureHEVC *va_pic, const HEVCFrame *pic, int rps_type)
+{
+ va_pic->picture_id = ff_vaapi_get_surface_id(pic->frame);
+ va_pic->pic_order_cnt = pic->poc;
+ va_pic->flags = rps_type;
+
+ if (pic->flags & HEVC_FRAME_FLAG_LONG_REF)
+ va_pic->flags |= VA_PICTURE_HEVC_LONG_TERM_REFERENCE;
+
+ if (pic->frame->interlaced_frame) {
+ va_pic->flags |= VA_PICTURE_HEVC_FIELD_PIC;
+
+ if (!pic->frame->top_field_first)
+ va_pic->flags |= VA_PICTURE_HEVC_BOTTOM_FIELD;
+ }
+}
+
+static int find_frame_rps_type(const HEVCContext *h, const HEVCFrame *pic)
+{
+ VASurfaceID pic_surf = ff_vaapi_get_surface_id(pic->frame);
+ int i;
+
+ for (i = 0; i < h->rps[ST_CURR_BEF].nb_refs; i++) {
+ if (pic_surf == ff_vaapi_get_surface_id(h->rps[ST_CURR_BEF].ref[i]->frame))
+ return VA_PICTURE_HEVC_RPS_ST_CURR_BEFORE;
+ }
+
+ for (i = 0; i < h->rps[ST_CURR_AFT].nb_refs; i++) {
+ if (pic_surf == ff_vaapi_get_surface_id(h->rps[ST_CURR_AFT].ref[i]->frame))
+ return VA_PICTURE_HEVC_RPS_ST_CURR_AFTER;
+ }
+
+ for (i = 0; i < h->rps[LT_CURR].nb_refs; i++) {
+ if (pic_surf == ff_vaapi_get_surface_id(h->rps[LT_CURR].ref[i]->frame))
+ return VA_PICTURE_HEVC_RPS_LT_CURR;
+ }
+
+ return 0;
+}
+
+static void fill_vaapi_reference_frames(const HEVCContext *h, VAPictureParameterBufferHEVC *pp)
+{
+ const HEVCFrame *current_picture = h->ref;
+ int i, j, rps_type;
+
+ for (i = 0, j = 0; i < FF_ARRAY_ELEMS(pp->ReferenceFrames); i++) {
+ const HEVCFrame *frame = NULL;
+
+ while (!frame && j < FF_ARRAY_ELEMS(h->DPB)) {
+ if (&h->DPB[j] != current_picture && (h->DPB[j].flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF)))
+ frame = &h->DPB[j];
+ j++;
+ }
+
+ init_vaapi_pic(&pp->ReferenceFrames[i]);
+
+ if (frame) {
+ rps_type = find_frame_rps_type(h, frame);
+ fill_vaapi_pic(&pp->ReferenceFrames[i], frame, rps_type);
+ }
+ }
+}
+
+static int vaapi_hevc_start_frame(AVCodecContext *avctx,
+ av_unused const uint8_t *buffer,
+ av_unused uint32_t size)
+{
+ const HEVCContext *h = avctx->priv_data;
+ VAAPIDecodePictureHEVC *pic = h->ref->hwaccel_picture_private;
+ const HEVCSPS *sps = h->ps.sps;
+ const HEVCPPS *pps = h->ps.pps;
+
+ const ScalingList *scaling_list = NULL;
+ int err, i;
+
+ pic->pic.output_surface = ff_vaapi_get_surface_id(h->ref->frame);
+
+ pic->pic_param = (VAPictureParameterBufferHEVC) {
+ .pic_fields.value = 0,
+ .slice_parsing_fields.value = 0,
+ .pic_width_in_luma_samples = sps->width,
+ .pic_height_in_luma_samples = sps->height,
+ .log2_min_luma_coding_block_size_minus3 = sps->log2_min_cb_size - 3,
+ .sps_max_dec_pic_buffering_minus1 = sps->temporal_layer[sps->max_sub_layers - 1].max_dec_pic_buffering - 1,
+ .log2_diff_max_min_luma_coding_block_size = sps->log2_diff_max_min_coding_block_size,
+ .log2_min_transform_block_size_minus2 = sps->log2_min_tb_size - 2,
+ .log2_diff_max_min_transform_block_size = sps->log2_max_trafo_size - sps->log2_min_tb_size,
+ .max_transform_hierarchy_depth_inter = sps->max_transform_hierarchy_depth_inter,
+ .max_transform_hierarchy_depth_intra = sps->max_transform_hierarchy_depth_intra,
+ .num_short_term_ref_pic_sets = sps->nb_st_rps,
+ .num_long_term_ref_pic_sps = sps->num_long_term_ref_pics_sps,
+ .num_ref_idx_l0_default_active_minus1 = pps->num_ref_idx_l0_default_active - 1,
+ .num_ref_idx_l1_default_active_minus1 = pps->num_ref_idx_l1_default_active - 1,
+ .init_qp_minus26 = pps->pic_init_qp_minus26,
+ .pps_cb_qp_offset = pps->cb_qp_offset,
+ .pps_cr_qp_offset = pps->cr_qp_offset,
+ .pcm_sample_bit_depth_luma_minus1 = sps->pcm.bit_depth - 1,
+ .pcm_sample_bit_depth_chroma_minus1 = sps->pcm.bit_depth_chroma - 1,
+ .log2_min_pcm_luma_coding_block_size_minus3 = sps->pcm.log2_min_pcm_cb_size - 3,
+ .log2_diff_max_min_pcm_luma_coding_block_size = sps->pcm.log2_max_pcm_cb_size - sps->pcm.log2_min_pcm_cb_size,
+ .diff_cu_qp_delta_depth = pps->diff_cu_qp_delta_depth,
+ .pps_beta_offset_div2 = pps->beta_offset / 2,
+ .pps_tc_offset_div2 = pps->tc_offset / 2,
+ .log2_parallel_merge_level_minus2 = pps->log2_parallel_merge_level - 2,
+ .bit_depth_luma_minus8 = sps->bit_depth - 8,
+ .bit_depth_chroma_minus8 = sps->bit_depth - 8,
+ .log2_max_pic_order_cnt_lsb_minus4 = sps->log2_max_poc_lsb - 4,
+ .num_extra_slice_header_bits = pps->num_extra_slice_header_bits,
+ .pic_fields.bits = {
+ .chroma_format_idc = sps->chroma_format_idc,
+ .tiles_enabled_flag = pps->tiles_enabled_flag,
+ .separate_colour_plane_flag = sps->separate_colour_plane_flag,
+ .pcm_enabled_flag = sps->pcm_enabled_flag,
+ .scaling_list_enabled_flag = sps->scaling_list_enable_flag,
+ .transform_skip_enabled_flag = pps->transform_skip_enabled_flag,
+ .amp_enabled_flag = sps->amp_enabled_flag,
+ .strong_intra_smoothing_enabled_flag = sps->sps_strong_intra_smoothing_enable_flag,
+ .sign_data_hiding_enabled_flag = pps->sign_data_hiding_flag,
+ .constrained_intra_pred_flag = pps->constrained_intra_pred_flag,
+ .cu_qp_delta_enabled_flag = pps->cu_qp_delta_enabled_flag,
+ .weighted_pred_flag = pps->weighted_pred_flag,
+ .weighted_bipred_flag = pps->weighted_bipred_flag,
+ .transquant_bypass_enabled_flag = pps->transquant_bypass_enable_flag,
+ .entropy_coding_sync_enabled_flag = pps->entropy_coding_sync_enabled_flag,
+ .pps_loop_filter_across_slices_enabled_flag = pps->seq_loop_filter_across_slices_enabled_flag,
+ .loop_filter_across_tiles_enabled_flag = pps->loop_filter_across_tiles_enabled_flag,
+ .pcm_loop_filter_disabled_flag = sps->pcm.loop_filter_disable_flag,
+ },
+ .slice_parsing_fields.bits = {
+ .lists_modification_present_flag = pps->lists_modification_present_flag,
+ .long_term_ref_pics_present_flag = sps->long_term_ref_pics_present_flag,
+ .sps_temporal_mvp_enabled_flag = sps->sps_temporal_mvp_enabled_flag,
+ .cabac_init_present_flag = pps->cabac_init_present_flag,
+ .output_flag_present_flag = pps->output_flag_present_flag,
+ .dependent_slice_segments_enabled_flag = pps->dependent_slice_segments_enabled_flag,
+ .pps_slice_chroma_qp_offsets_present_flag = pps->pic_slice_level_chroma_qp_offsets_present_flag,
+ .sample_adaptive_offset_enabled_flag = sps->sao_enabled,
+ .deblocking_filter_override_enabled_flag = pps->deblocking_filter_override_enabled_flag,
+ .pps_disable_deblocking_filter_flag = pps->disable_dbf,
+ .slice_segment_header_extension_present_flag = pps->slice_header_extension_present_flag,
+ .RapPicFlag = IS_IRAP(h),
+ .IdrPicFlag = IS_IDR(h),
+ .IntraPicFlag = IS_IRAP(h),
+ },
+ };
+
+ fill_vaapi_pic(&pic->pic_param.CurrPic, h->ref, 0);
+ fill_vaapi_reference_frames(h, &pic->pic_param);
+
+ if (pps->tiles_enabled_flag) {
+ pic->pic_param.num_tile_columns_minus1 = pps->num_tile_columns - 1;
+ pic->pic_param.num_tile_rows_minus1 = pps->num_tile_rows - 1;
+
+ for (i = 0; i < pps->num_tile_columns; i++)
+ pic->pic_param.column_width_minus1[i] = pps->column_width[i] - 1;
+
+ for (i = 0; i < pps->num_tile_rows; i++)
+ pic->pic_param.row_height_minus1[i] = pps->row_height[i] - 1;
+ }
+
+ if (h->sh.short_term_ref_pic_set_sps_flag == 0 && h->sh.short_term_rps) {
+ pic->pic_param.st_rps_bits = h->sh.short_term_ref_pic_set_size;
+ } else {
+ pic->pic_param.st_rps_bits = 0;
+ }
+
+ err = ff_vaapi_decode_make_param_buffer(avctx, &pic->pic,
+ VAPictureParameterBufferType,
+ &pic->pic_param, sizeof(pic->pic_param));
+ if (err < 0)
+ goto fail;
+
+ if (pps->scaling_list_data_present_flag)
+ scaling_list = &pps->scaling_list;
+ else if (sps->scaling_list_enable_flag)
+ scaling_list = &sps->scaling_list;
+
+ if (scaling_list) {
+ VAIQMatrixBufferHEVC iq_matrix;
+ int j;
+
+ for (i = 0; i < 6; i++) {
+ for (j = 0; j < 16; j++)
+ iq_matrix.ScalingList4x4[i][j] = scaling_list->sl[0][i][j];
+ for (j = 0; j < 64; j++) {
+ iq_matrix.ScalingList8x8[i][j] = scaling_list->sl[1][i][j];
+ iq_matrix.ScalingList16x16[i][j] = scaling_list->sl[2][i][j];
+ if (i < 2)
+ iq_matrix.ScalingList32x32[i][j] = scaling_list->sl[3][i][j];
+ }
+ iq_matrix.ScalingListDC16x16[i] = scaling_list->sl_dc[0][i];
+ if (i < 2)
+ iq_matrix.ScalingListDC32x32[i] = scaling_list->sl_dc[1][i];
+ }
+
+ err = ff_vaapi_decode_make_param_buffer(avctx, &pic->pic,
+ VAIQMatrixBufferType,
+ &iq_matrix, sizeof(iq_matrix));
+ if (err < 0)
+ goto fail;
+ }
+
+ return 0;
+
+fail:
+ ff_vaapi_decode_cancel(avctx, &pic->pic);
+ return err;
+}
+
+static int vaapi_hevc_end_frame(AVCodecContext *avctx)
+{
+ const HEVCContext *h = avctx->priv_data;
+ VAAPIDecodePictureHEVC *pic = h->ref->hwaccel_picture_private;
+ int ret;
+
+ if (pic->last_size) {
+ pic->last_slice_param.LongSliceFlags.fields.LastSliceOfPic = 1;
+ ret = ff_vaapi_decode_make_slice_buffer(avctx, &pic->pic,
+ &pic->last_slice_param, sizeof(pic->last_slice_param),
+ pic->last_buffer, pic->last_size);
+ if (ret < 0)
+ goto fail;
+ }
+
+
+ ret = ff_vaapi_decode_issue(avctx, &pic->pic);
+ if (ret < 0)
+ goto fail;
+
+ return 0;
+fail:
+ ff_vaapi_decode_cancel(avctx, &pic->pic);
+ return ret;
+}
+
+static void fill_pred_weight_table(const HEVCContext *h,
+ const SliceHeader *sh,
+ VASliceParameterBufferHEVC *slice_param)
+{
+ int i;
+
+ memset(slice_param->delta_luma_weight_l0, 0, sizeof(slice_param->delta_luma_weight_l0));
+ memset(slice_param->delta_luma_weight_l1, 0, sizeof(slice_param->delta_luma_weight_l1));
+ memset(slice_param->luma_offset_l0, 0, sizeof(slice_param->luma_offset_l0));
+ memset(slice_param->luma_offset_l1, 0, sizeof(slice_param->luma_offset_l1));
+ memset(slice_param->delta_chroma_weight_l0, 0, sizeof(slice_param->delta_chroma_weight_l0));
+ memset(slice_param->delta_chroma_weight_l1, 0, sizeof(slice_param->delta_chroma_weight_l1));
+ memset(slice_param->ChromaOffsetL0, 0, sizeof(slice_param->ChromaOffsetL0));
+ memset(slice_param->ChromaOffsetL1, 0, sizeof(slice_param->ChromaOffsetL1));
+
+ slice_param->delta_chroma_log2_weight_denom = 0;
+ slice_param->luma_log2_weight_denom = 0;
+
+ if (sh->slice_type == HEVC_SLICE_I ||
+ (sh->slice_type == HEVC_SLICE_P && !h->ps.pps->weighted_pred_flag) ||
+ (sh->slice_type == HEVC_SLICE_B && !h->ps.pps->weighted_bipred_flag))
+ return;
+
+ slice_param->luma_log2_weight_denom = sh->luma_log2_weight_denom;
+
+ if (h->ps.sps->chroma_format_idc) {
+ slice_param->delta_chroma_log2_weight_denom = sh->chroma_log2_weight_denom - sh->luma_log2_weight_denom;
+ }
+
+ for (i = 0; i < 15 && i < sh->nb_refs[L0]; i++) {
+ slice_param->delta_luma_weight_l0[i] = sh->luma_weight_l0[i] - (1 << sh->luma_log2_weight_denom);
+ slice_param->luma_offset_l0[i] = sh->luma_offset_l0[i];
+ slice_param->delta_chroma_weight_l0[i][0] = sh->chroma_weight_l0[i][0] - (1 << sh->chroma_log2_weight_denom);
+ slice_param->delta_chroma_weight_l0[i][1] = sh->chroma_weight_l0[i][1] - (1 << sh->chroma_log2_weight_denom);
+ slice_param->ChromaOffsetL0[i][0] = sh->chroma_offset_l0[i][0];
+ slice_param->ChromaOffsetL0[i][1] = sh->chroma_offset_l0[i][1];
+ }
+
+ if (sh->slice_type == HEVC_SLICE_B) {
+ for (i = 0; i < 15 && i < sh->nb_refs[L1]; i++) {
+ slice_param->delta_luma_weight_l1[i] = sh->luma_weight_l1[i] - (1 << sh->luma_log2_weight_denom);
+ slice_param->luma_offset_l1[i] = sh->luma_offset_l1[i];
+ slice_param->delta_chroma_weight_l1[i][0] = sh->chroma_weight_l1[i][0] - (1 << sh->chroma_log2_weight_denom);
+ slice_param->delta_chroma_weight_l1[i][1] = sh->chroma_weight_l1[i][1] - (1 << sh->chroma_log2_weight_denom);
+ slice_param->ChromaOffsetL1[i][0] = sh->chroma_offset_l1[i][0];
+ slice_param->ChromaOffsetL1[i][1] = sh->chroma_offset_l1[i][1];
+ }
+ }
+}
+
+static uint8_t get_ref_pic_index(const HEVCContext *h, const HEVCFrame *frame)
+{
+ VAAPIDecodePictureHEVC *pic = h->ref->hwaccel_picture_private;
+ VAPictureParameterBufferHEVC *pp = &pic->pic_param;
+ uint8_t i;
+
+ if (!frame)
+ return 0xff;
+
+ for (i = 0; i < FF_ARRAY_ELEMS(pp->ReferenceFrames); i++) {
+ VASurfaceID pid = pp->ReferenceFrames[i].picture_id;
+ int poc = pp->ReferenceFrames[i].pic_order_cnt;
+ if (pid != VA_INVALID_ID && pid == ff_vaapi_get_surface_id(frame->frame) && poc == frame->poc)
+ return i;
+ }
+
+ return 0xff;
+}
+
+static int vaapi_hevc_decode_slice(AVCodecContext *avctx,
+ const uint8_t *buffer,
+ uint32_t size)
+{
+ const HEVCContext *h = avctx->priv_data;
+ const SliceHeader *sh = &h->sh;
+ VAAPIDecodePictureHEVC *pic = h->ref->hwaccel_picture_private;
+
+ int nb_list = (sh->slice_type == HEVC_SLICE_B) ?
+ 2 : (sh->slice_type == HEVC_SLICE_I ? 0 : 1);
+
+ int err, i, list_idx;
+
+ if (!sh->first_slice_in_pic_flag) {
+ err = ff_vaapi_decode_make_slice_buffer(avctx, &pic->pic,
+ &pic->last_slice_param, sizeof(pic->last_slice_param),
+ pic->last_buffer, pic->last_size);
+ pic->last_buffer = NULL;
+ pic->last_size = 0;
+ if (err) {
+ ff_vaapi_decode_cancel(avctx, &pic->pic);
+ return err;
+ }
+ }
+
+ pic->last_slice_param = (VASliceParameterBufferHEVC) {
+ .slice_data_size = size,
+ .slice_data_offset = 0,
+ .slice_data_flag = VA_SLICE_DATA_FLAG_ALL,
+ /* Add 1 to the bits count here to account for the byte_alignment bit, which
+ * always is at least one bit and not accounted for otherwise. */
+ .slice_data_byte_offset = (get_bits_count(&h->HEVClc.gb) + 1 + 7) / 8,
+ .slice_segment_address = sh->slice_segment_addr,
+ .slice_qp_delta = sh->slice_qp_delta,
+ .slice_cb_qp_offset = sh->slice_cb_qp_offset,
+ .slice_cr_qp_offset = sh->slice_cr_qp_offset,
+ .slice_beta_offset_div2 = sh->beta_offset / 2,
+ .slice_tc_offset_div2 = sh->tc_offset / 2,
+ .collocated_ref_idx = sh->slice_temporal_mvp_enabled_flag ? sh->collocated_ref_idx : 0xFF,
+ .five_minus_max_num_merge_cand = sh->slice_type == HEVC_SLICE_I ? 0 : 5 - sh->max_num_merge_cand,
+ .num_ref_idx_l0_active_minus1 = sh->nb_refs[L0] ? sh->nb_refs[L0] - 1 : 0,
+ .num_ref_idx_l1_active_minus1 = sh->nb_refs[L1] ? sh->nb_refs[L1] - 1 : 0,
+
+ .LongSliceFlags.fields = {
+ .dependent_slice_segment_flag = sh->dependent_slice_segment_flag,
+ .slice_type = sh->slice_type,
+ .color_plane_id = sh->colour_plane_id,
+ .mvd_l1_zero_flag = sh->mvd_l1_zero_flag,
+ .cabac_init_flag = sh->cabac_init_flag,
+ .slice_temporal_mvp_enabled_flag = sh->slice_temporal_mvp_enabled_flag,
+ .slice_deblocking_filter_disabled_flag = sh->disable_deblocking_filter_flag,
+ .collocated_from_l0_flag = sh->collocated_list == L0 ? 1 : 0,
+ .slice_loop_filter_across_slices_enabled_flag = sh->slice_loop_filter_across_slices_enabled_flag,
+ .slice_sao_luma_flag = sh->slice_sample_adaptive_offset_flag[0],
+ .slice_sao_chroma_flag = sh->slice_sample_adaptive_offset_flag[1],
+ },
+ };
+
+ memset(pic->last_slice_param.RefPicList, 0xFF, sizeof(pic->last_slice_param.RefPicList));
+
+ for (list_idx = 0; list_idx < nb_list; list_idx++) {
+ RefPicList *rpl = &h->ref->refPicList[list_idx];
+
+ for (i = 0; i < rpl->nb_refs; i++)
+ pic->last_slice_param.RefPicList[list_idx][i] = get_ref_pic_index(h, rpl->ref[i]);
+ }
+
+ fill_pred_weight_table(h, sh, &pic->last_slice_param);
+
+ pic->last_buffer = buffer;
+ pic->last_size = size;
+
+ return 0;
+}
+
+AVHWAccel ff_hevc_vaapi_hwaccel = {
+ .name = "hevc_vaapi",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_HEVC,
+ .pix_fmt = AV_PIX_FMT_VAAPI,
+ .start_frame = vaapi_hevc_start_frame,
+ .end_frame = vaapi_hevc_end_frame,
+ .decode_slice = vaapi_hevc_decode_slice,
+ .frame_priv_data_size = sizeof(VAAPIDecodePictureHEVC),
+ .init = ff_vaapi_decode_init,
+ .uninit = ff_vaapi_decode_uninit,
+ .priv_data_size = sizeof(VAAPIDecodeContext),
+ .caps_internal = HWACCEL_CAP_ASYNC_SAFE,
+};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 3756275086..5b6fb6ce59 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 30
-#define LIBAVCODEC_VERSION_MICRO 1
+#define LIBAVCODEC_VERSION_MICRO 2
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
More information about the ffmpeg-cvslog
mailing list