[Mesa-dev] [PATCH 7/8] st/va: move HEVC functions into separate file
Christian König
deathsimple at vodafone.de
Mon Nov 23 06:37:27 PST 2015
From: Christian König <christian.koenig at amd.com>
Signed-off-by: Christian König <christian.koenig at amd.com>
---
src/gallium/state_trackers/va/Makefile.sources | 1 +
src/gallium/state_trackers/va/picture.c | 174 +------------------------
src/gallium/state_trackers/va/picture_hevc.c | 159 ++++++++++++++++++++++
src/gallium/state_trackers/va/va_private.h | 3 +
4 files changed, 167 insertions(+), 170 deletions(-)
create mode 100644 src/gallium/state_trackers/va/picture_hevc.c
diff --git a/src/gallium/state_trackers/va/Makefile.sources b/src/gallium/state_trackers/va/Makefile.sources
index 74cc34e..daebf01 100644
--- a/src/gallium/state_trackers/va/Makefile.sources
+++ b/src/gallium/state_trackers/va/Makefile.sources
@@ -8,6 +8,7 @@ C_SOURCES := \
picture_mpeg12.c \
picture_mpeg4.c \
picture_h264.c \
+ picture_hevc.c \
picture_vc1.c \
postproc.c \
subpicture.c \
diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c
index fc10bf4..ce75e2d 100644
--- a/src/gallium/state_trackers/va/picture.c
+++ b/src/gallium/state_trackers/va/picture.c
@@ -89,9 +89,6 @@ vlVaGetReferenceFrame(vlVaDriver *drv, VASurfaceID surface_id,
static void
handlePictureParameterBuffer(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *buf)
{
- VAPictureParameterBufferHEVC *hevc;
- unsigned int i;
-
switch (u_reduce_video_profile(context->decoder->profile)) {
case PIPE_VIDEO_FORMAT_MPEG12:
vlVaHandlePictureParameterBufferMPEG12(drv, context, buf);
@@ -110,154 +107,7 @@ handlePictureParameterBuffer(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *
break;
case PIPE_VIDEO_FORMAT_HEVC:
- assert(buf->size >= sizeof(VAPictureParameterBufferHEVC) && buf->num_elements == 1);
- hevc = buf->data;
- context->desc.h265.pps->sps->chroma_format_idc = hevc->pic_fields.bits.chroma_format_idc;
- context->desc.h265.pps->sps->separate_colour_plane_flag =
- hevc->pic_fields.bits.separate_colour_plane_flag;
- context->desc.h265.pps->sps->pic_width_in_luma_samples = hevc->pic_width_in_luma_samples;
- context->desc.h265.pps->sps->pic_height_in_luma_samples = hevc->pic_height_in_luma_samples;
- context->desc.h265.pps->sps->bit_depth_luma_minus8 = hevc->bit_depth_luma_minus8;
- context->desc.h265.pps->sps->bit_depth_chroma_minus8 = hevc->bit_depth_chroma_minus8;
- context->desc.h265.pps->sps->log2_max_pic_order_cnt_lsb_minus4 =
- hevc->log2_max_pic_order_cnt_lsb_minus4;
- context->desc.h265.pps->sps->sps_max_dec_pic_buffering_minus1 =
- hevc->sps_max_dec_pic_buffering_minus1;
- context->desc.h265.pps->sps->log2_min_luma_coding_block_size_minus3 =
- hevc->log2_min_luma_coding_block_size_minus3;
- context->desc.h265.pps->sps->log2_diff_max_min_luma_coding_block_size =
- hevc->log2_diff_max_min_luma_coding_block_size;
- context->desc.h265.pps->sps->log2_min_transform_block_size_minus2 =
- hevc->log2_min_transform_block_size_minus2;
- context->desc.h265.pps->sps->log2_diff_max_min_transform_block_size =
- hevc->log2_diff_max_min_transform_block_size;
- context->desc.h265.pps->sps->max_transform_hierarchy_depth_inter =
- hevc->max_transform_hierarchy_depth_inter;
- context->desc.h265.pps->sps->max_transform_hierarchy_depth_intra =
- hevc->max_transform_hierarchy_depth_intra;
- context->desc.h265.pps->sps->scaling_list_enabled_flag =
- hevc->pic_fields.bits.scaling_list_enabled_flag;
- context->desc.h265.pps->sps->amp_enabled_flag = hevc->pic_fields.bits.amp_enabled_flag;
- context->desc.h265.pps->sps->sample_adaptive_offset_enabled_flag =
- hevc->slice_parsing_fields.bits.sample_adaptive_offset_enabled_flag;
- context->desc.h265.pps->sps->pcm_enabled_flag = hevc->pic_fields.bits.pcm_enabled_flag;
- if (hevc->pic_fields.bits.pcm_enabled_flag == 1) {
- context->desc.h265.pps->sps->pcm_sample_bit_depth_luma_minus1 =
- hevc->pcm_sample_bit_depth_luma_minus1;
- context->desc.h265.pps->sps->pcm_sample_bit_depth_chroma_minus1 =
- hevc->pcm_sample_bit_depth_chroma_minus1;
- context->desc.h265.pps->sps->log2_min_pcm_luma_coding_block_size_minus3 =
- hevc->log2_min_pcm_luma_coding_block_size_minus3;
- context->desc.h265.pps->sps->log2_diff_max_min_pcm_luma_coding_block_size =
- hevc->log2_diff_max_min_pcm_luma_coding_block_size;
- context->desc.h265.pps->sps->pcm_loop_filter_disabled_flag =
- hevc->pic_fields.bits.pcm_loop_filter_disabled_flag;
- }
- context->desc.h265.pps->sps->num_short_term_ref_pic_sets = hevc->num_short_term_ref_pic_sets;
- context->desc.h265.pps->sps->long_term_ref_pics_present_flag =
- hevc->slice_parsing_fields.bits.long_term_ref_pics_present_flag;
- context->desc.h265.pps->sps->num_long_term_ref_pics_sps = hevc->num_long_term_ref_pic_sps;
- context->desc.h265.pps->sps->sps_temporal_mvp_enabled_flag =
- hevc->slice_parsing_fields.bits.sps_temporal_mvp_enabled_flag;
- context->desc.h265.pps->sps->strong_intra_smoothing_enabled_flag =
- hevc->pic_fields.bits.strong_intra_smoothing_enabled_flag;
-
- context->desc.h265.pps->dependent_slice_segments_enabled_flag =
- hevc->slice_parsing_fields.bits.dependent_slice_segments_enabled_flag;
- context->desc.h265.pps->output_flag_present_flag =
- hevc->slice_parsing_fields.bits.output_flag_present_flag;
- context->desc.h265.pps->num_extra_slice_header_bits = hevc->num_extra_slice_header_bits;
- context->desc.h265.pps->sign_data_hiding_enabled_flag =
- hevc->pic_fields.bits.sign_data_hiding_enabled_flag;
- context->desc.h265.pps->cabac_init_present_flag =
- hevc->slice_parsing_fields.bits.cabac_init_present_flag;
- context->desc.h265.pps->num_ref_idx_l0_default_active_minus1 =
- hevc->num_ref_idx_l0_default_active_minus1;
- context->desc.h265.pps->num_ref_idx_l1_default_active_minus1 =
- hevc->num_ref_idx_l1_default_active_minus1;
- context->desc.h265.pps->init_qp_minus26 = hevc->init_qp_minus26;
- context->desc.h265.pps->constrained_intra_pred_flag =
- hevc->pic_fields.bits.constrained_intra_pred_flag;
- context->desc.h265.pps->transform_skip_enabled_flag =
- hevc->pic_fields.bits.transform_skip_enabled_flag;
- context->desc.h265.pps->cu_qp_delta_enabled_flag =
- hevc->pic_fields.bits.cu_qp_delta_enabled_flag;
- context->desc.h265.pps->diff_cu_qp_delta_depth = hevc->diff_cu_qp_delta_depth;
- context->desc.h265.pps->pps_cb_qp_offset = hevc->pps_cb_qp_offset;
- context->desc.h265.pps->pps_cr_qp_offset = hevc->pps_cr_qp_offset;
- context->desc.h265.pps->pps_slice_chroma_qp_offsets_present_flag =
- hevc->slice_parsing_fields.bits.pps_slice_chroma_qp_offsets_present_flag;
- context->desc.h265.pps->weighted_pred_flag = hevc->pic_fields.bits.weighted_pred_flag;
- context->desc.h265.pps->weighted_bipred_flag = hevc->pic_fields.bits.weighted_bipred_flag;
- context->desc.h265.pps->transquant_bypass_enabled_flag =
- hevc->pic_fields.bits.transquant_bypass_enabled_flag;
- context->desc.h265.pps->tiles_enabled_flag = hevc->pic_fields.bits.tiles_enabled_flag;
- context->desc.h265.pps->entropy_coding_sync_enabled_flag =
- hevc->pic_fields.bits.entropy_coding_sync_enabled_flag;
- if (hevc->pic_fields.bits.tiles_enabled_flag == 1) {
- context->desc.h265.pps->num_tile_columns_minus1 = hevc->num_tile_columns_minus1;
- context->desc.h265.pps->num_tile_rows_minus1 = hevc->num_tile_rows_minus1;
- for (i = 0 ; i < 19 ; i++)
- context->desc.h265.pps->column_width_minus1[i] = hevc->column_width_minus1[i];
- for (i = 0 ; i < 21 ; i++)
- context->desc.h265.pps->row_height_minus1[i] = hevc->row_height_minus1[i];
- context->desc.h265.pps->loop_filter_across_tiles_enabled_flag =
- hevc->pic_fields.bits.loop_filter_across_tiles_enabled_flag;
- }
- context->desc.h265.pps->pps_loop_filter_across_slices_enabled_flag =
- hevc->pic_fields.bits.pps_loop_filter_across_slices_enabled_flag;
- context->desc.h265.pps->deblocking_filter_override_enabled_flag =
- hevc->slice_parsing_fields.bits.deblocking_filter_override_enabled_flag;
- context->desc.h265.pps->pps_deblocking_filter_disabled_flag =
- hevc->slice_parsing_fields.bits.pps_disable_deblocking_filter_flag;
- context->desc.h265.pps->pps_beta_offset_div2 = hevc->pps_beta_offset_div2;
- context->desc.h265.pps->pps_tc_offset_div2 = hevc->pps_tc_offset_div2;
- context->desc.h265.pps->lists_modification_present_flag =
- hevc->slice_parsing_fields.bits.lists_modification_present_flag;
- context->desc.h265.pps->log2_parallel_merge_level_minus2 =
- hevc->log2_parallel_merge_level_minus2;
- context->desc.h265.pps->slice_segment_header_extension_present_flag =
- hevc->slice_parsing_fields.bits.slice_segment_header_extension_present_flag;
-
- context->desc.h265.IDRPicFlag = hevc->slice_parsing_fields.bits.IdrPicFlag;
- context->desc.h265.RAPPicFlag = hevc->slice_parsing_fields.bits.RapPicFlag;
-
- context->desc.h265.CurrPicOrderCntVal = hevc->CurrPic.pic_order_cnt;
-
- for (i = 0 ; i < 8 ; i++) {
- context->desc.h265.RefPicSetStCurrBefore[i] = 0xFF;
- context->desc.h265.RefPicSetStCurrAfter[i] = 0xFF;
- context->desc.h265.RefPicSetLtCurr[i] = 0xFF;
- }
- context->desc.h265.NumPocStCurrBefore = 0;
- context->desc.h265.NumPocStCurrAfter = 0;
- context->desc.h265.NumPocLtCurr = 0;
- unsigned int iBefore = 0;
- unsigned int iAfter = 0;
- unsigned int iCurr = 0;
- for (i = 0 ; i < 15 ; i++) {
- context->desc.h265.PicOrderCntVal[i] = hevc->ReferenceFrames[i].pic_order_cnt;
-
- unsigned int index = hevc->ReferenceFrames[i].picture_id & 0x7F;
-
- if (index == 0x7F)
- continue;
-
- vlVaGetReferenceFrame(drv, hevc->ReferenceFrames[i].picture_id, &context->desc.h265.ref[i]);
-
- if ((hevc->ReferenceFrames[i].flags & VA_PICTURE_HEVC_RPS_ST_CURR_BEFORE) && (iBefore < 8)) {
- context->desc.h265.RefPicSetStCurrBefore[iBefore++] = i;
- context->desc.h265.NumPocStCurrBefore++;
- }
- if ((hevc->ReferenceFrames[i].flags & VA_PICTURE_HEVC_RPS_ST_CURR_AFTER) && (iAfter < 8)) {
- context->desc.h265.RefPicSetStCurrAfter[iAfter++] = i;
- context->desc.h265.NumPocStCurrAfter++;
- }
- if ((hevc->ReferenceFrames[i].flags & VA_PICTURE_HEVC_RPS_LT_CURR) && (iCurr < 8)) {
- context->desc.h265.RefPicSetLtCurr[iCurr++] = i;
- context->desc.h265.NumPocLtCurr++;
- }
- }
+ vlVaHandlePictureParameterBufferHEVC(drv, context, buf);
break;
default:
@@ -268,8 +118,6 @@ handlePictureParameterBuffer(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *
static void
handleIQMatrixBuffer(vlVaContext *context, vlVaBuffer *buf)
{
- VAIQMatrixBufferHEVC *h265;
-
switch (u_reduce_video_profile(context->decoder->profile)) {
case PIPE_VIDEO_FORMAT_MPEG12:
vlVaHandleIQMatrixBufferMPEG12(context, buf);
@@ -283,14 +131,7 @@ handleIQMatrixBuffer(vlVaContext *context, vlVaBuffer *buf)
vlVaHandleIQMatrixBufferMPEG4(context, buf);
case PIPE_VIDEO_FORMAT_HEVC:
- assert(buf->size >= sizeof(VAIQMatrixBufferH264) && buf->num_elements == 1);
- h265 = buf->data;
- memcpy(&context->desc.h265.pps->sps->ScalingList4x4, h265->ScalingList4x4, 6 * 16);
- memcpy(&context->desc.h265.pps->sps->ScalingList8x8, h265->ScalingList8x8, 6 * 64);
- memcpy(&context->desc.h265.pps->sps->ScalingList16x16, h265->ScalingList16x16, 6 * 64);
- memcpy(&context->desc.h265.pps->sps->ScalingList32x32, h265->ScalingList32x32, 2 * 64);
- memcpy(&context->desc.h265.pps->sps->ScalingListDCCoeff16x16, h265->ScalingListDC16x16, 6);
- memcpy(&context->desc.h265.pps->sps->ScalingListDCCoeff32x32, h265->ScalingListDC32x32, 2);
+ vlVaHandleIQMatrixBufferHEVC(context, buf);
break;
default:
@@ -301,8 +142,6 @@ handleIQMatrixBuffer(vlVaContext *context, vlVaBuffer *buf)
static void
handleSliceParameterBuffer(vlVaContext *context, vlVaBuffer *buf)
{
- VASliceParameterBufferHEVC *h265;
-
switch (u_reduce_video_profile(context->decoder->profile)) {
case PIPE_VIDEO_FORMAT_MPEG4_AVC:
vlVaHandleSliceParameterBufferH264(context, buf);
@@ -313,14 +152,9 @@ handleSliceParameterBuffer(vlVaContext *context, vlVaBuffer *buf)
break;
case PIPE_VIDEO_FORMAT_HEVC:
- assert(buf->size >= sizeof(VASliceParameterBufferHEVC) && buf->num_elements == 1);
- h265 = buf->data;
- for (int i = 0 ; i < 2 ; i++) {
- for (int j = 0 ; j < 15 ; j++)
- context->desc.h265.RefPicList[i][j] = h265->RefPicList[i][j];
- }
- context->desc.h265.UseRefPicList = true;
+ vlVaHandleSliceParameterBufferHEVC(context, buf);
break;
+
default:
break;
}
diff --git a/src/gallium/state_trackers/va/picture_hevc.c b/src/gallium/state_trackers/va/picture_hevc.c
new file mode 100644
index 0000000..25dad89
--- /dev/null
+++ b/src/gallium/state_trackers/va/picture_hevc.c
@@ -0,0 +1,159 @@
+/**************************************************************************
+ *
+ * Copyright 2014 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+#include "va_private.h"
+
+void vlVaHandlePictureParameterBufferHEVC(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *buf)
+{
+ VAPictureParameterBufferHEVC *hevc = buf->data;
+ unsigned i;
+
+ assert(buf->size >= sizeof(VAPictureParameterBufferHEVC) && buf->num_elements == 1);
+ context->desc.h265.pps->sps->chroma_format_idc = hevc->pic_fields.bits.chroma_format_idc;
+ context->desc.h265.pps->sps->separate_colour_plane_flag =
+ hevc->pic_fields.bits.separate_colour_plane_flag;
+ context->desc.h265.pps->sps->pic_width_in_luma_samples = hevc->pic_width_in_luma_samples;
+ context->desc.h265.pps->sps->pic_height_in_luma_samples = hevc->pic_height_in_luma_samples;
+ context->desc.h265.pps->sps->bit_depth_luma_minus8 = hevc->bit_depth_luma_minus8;
+ context->desc.h265.pps->sps->bit_depth_chroma_minus8 = hevc->bit_depth_chroma_minus8;
+ context->desc.h265.pps->sps->log2_max_pic_order_cnt_lsb_minus4 =
+ hevc->log2_max_pic_order_cnt_lsb_minus4;
+ context->desc.h265.pps->sps->sps_max_dec_pic_buffering_minus1 =
+ hevc->sps_max_dec_pic_buffering_minus1;
+ context->desc.h265.pps->sps->log2_min_luma_coding_block_size_minus3 =
+ hevc->log2_min_luma_coding_block_size_minus3;
+ context->desc.h265.pps->sps->log2_diff_max_min_luma_coding_block_size =
+ hevc->log2_diff_max_min_luma_coding_block_size;
+ context->desc.h265.pps->sps->log2_min_transform_block_size_minus2 =
+ hevc->log2_min_transform_block_size_minus2;
+ context->desc.h265.pps->sps->log2_diff_max_min_transform_block_size =
+ hevc->log2_diff_max_min_transform_block_size;
+ context->desc.h265.pps->sps->max_transform_hierarchy_depth_inter =
+ hevc->max_transform_hierarchy_depth_inter;
+ context->desc.h265.pps->sps->max_transform_hierarchy_depth_intra =
+ hevc->max_transform_hierarchy_depth_intra;
+ context->desc.h265.pps->sps->scaling_list_enabled_flag =
+ hevc->pic_fields.bits.scaling_list_enabled_flag;
+ context->desc.h265.pps->sps->amp_enabled_flag = hevc->pic_fields.bits.amp_enabled_flag;
+ context->desc.h265.pps->sps->sample_adaptive_offset_enabled_flag =
+ hevc->slice_parsing_fields.bits.sample_adaptive_offset_enabled_flag;
+ context->desc.h265.pps->sps->pcm_enabled_flag = hevc->pic_fields.bits.pcm_enabled_flag;
+ if (hevc->pic_fields.bits.pcm_enabled_flag == 1) {
+ context->desc.h265.pps->sps->pcm_sample_bit_depth_luma_minus1 =
+ hevc->pcm_sample_bit_depth_luma_minus1;
+ context->desc.h265.pps->sps->pcm_sample_bit_depth_chroma_minus1 =
+ hevc->pcm_sample_bit_depth_chroma_minus1;
+ context->desc.h265.pps->sps->log2_min_pcm_luma_coding_block_size_minus3 =
+ hevc->log2_min_pcm_luma_coding_block_size_minus3;
+ context->desc.h265.pps->sps->log2_diff_max_min_pcm_luma_coding_block_size =
+ hevc->log2_diff_max_min_pcm_luma_coding_block_size;
+ context->desc.h265.pps->sps->pcm_loop_filter_disabled_flag =
+ hevc->pic_fields.bits.pcm_loop_filter_disabled_flag;
+ }
+ context->desc.h265.pps->sps->num_short_term_ref_pic_sets = hevc->num_short_term_ref_pic_sets;
+ context->desc.h265.pps->sps->long_term_ref_pics_present_flag =
+ hevc->slice_parsing_fields.bits.long_term_ref_pics_present_flag;
+ context->desc.h265.pps->sps->num_long_term_ref_pics_sps = hevc->num_long_term_ref_pic_sps;
+ context->desc.h265.pps->sps->sps_temporal_mvp_enabled_flag =
+ hevc->slice_parsing_fields.bits.sps_temporal_mvp_enabled_flag;
+ context->desc.h265.pps->sps->strong_intra_smoothing_enabled_flag =
+ hevc->pic_fields.bits.strong_intra_smoothing_enabled_flag;
+
+ context->desc.h265.pps->dependent_slice_segments_enabled_flag =
+ hevc->slice_parsing_fields.bits.dependent_slice_segments_enabled_flag;
+ context->desc.h265.pps->output_flag_present_flag =
+ hevc->slice_parsing_fields.bits.output_flag_present_flag;
+ context->desc.h265.pps->num_extra_slice_header_bits = hevc->num_extra_slice_header_bits;
+ context->desc.h265.pps->sign_data_hiding_enabled_flag =
+ hevc->pic_fields.bits.sign_data_hiding_enabled_flag;
+ context->desc.h265.pps->cabac_init_present_flag =
+ hevc->slice_parsing_fields.bits.cabac_init_present_flag;
+ context->desc.h265.pps->num_ref_idx_l0_default_active_minus1 =
+ hevc->num_ref_idx_l0_default_active_minus1;
+ context->desc.h265.pps->num_ref_idx_l1_default_active_minus1 =
+ hevc->num_ref_idx_l1_default_active_minus1;
+ context->desc.h265.pps->init_qp_minus26 = hevc->init_qp_minus26;
+ context->desc.h265.pps->constrained_intra_pred_flag =
+ hevc->pic_fields.bits.constrained_intra_pred_flag;
+ context->desc.h265.pps->transform_skip_enabled_flag =
+ hevc->pic_fields.bits.transform_skip_enabled_flag;
+ context->desc.h265.pps->cu_qp_delta_enabled_flag =
+ hevc->pic_fields.bits.cu_qp_delta_enabled_flag;
+ context->desc.h265.pps->diff_cu_qp_delta_depth = hevc->diff_cu_qp_delta_depth;
+ context->desc.h265.pps->pps_cb_qp_offset = hevc->pps_cb_qp_offset;
+ context->desc.h265.pps->pps_cr_qp_offset = hevc->pps_cr_qp_offset;
+ context->desc.h265.pps->pps_slice_chroma_qp_offsets_present_flag =
+ hevc->slice_parsing_fields.bits.pps_slice_chroma_qp_offsets_present_flag;
+ context->desc.h265.pps->weighted_pred_flag = hevc->pic_fields.bits.weighted_pred_flag;
+ context->desc.h265.pps->weighted_bipred_flag = hevc->pic_fields.bits.weighted_bipred_flag;
+ context->desc.h265.pps->transquant_bypass_enabled_flag =
+ hevc->pic_fields.bits.transquant_bypass_enabled_flag;
+ context->desc.h265.pps->tiles_enabled_flag = hevc->pic_fields.bits.tiles_enabled_flag;
+ context->desc.h265.pps->entropy_coding_sync_enabled_flag =
+ hevc->pic_fields.bits.entropy_coding_sync_enabled_flag;
+ if (hevc->pic_fields.bits.tiles_enabled_flag == 1) {
+ context->desc.h265.pps->num_tile_columns_minus1 = hevc->num_tile_columns_minus1;
+ context->desc.h265.pps->num_tile_rows_minus1 = hevc->num_tile_rows_minus1;
+ for (i = 0 ; i < 19 ; i++)
+ context->desc.h265.pps->column_width_minus1[i] = hevc->column_width_minus1[i];
+ for (i = 0 ; i < 21 ; i++)
+ context->desc.h265.pps->row_height_minus1[i] = hevc->row_height_minus1[i];
+ context->desc.h265.pps->loop_filter_across_tiles_enabled_flag =
+ hevc->pic_fields.bits.loop_filter_across_tiles_enabled_flag;
+ }
+ context->desc.h265.pps->pps_loop_filter_across_slices_enabled_flag =
+ hevc->pic_fields.bits.pps_loop_filter_across_slices_enabled_flag;
+ context->desc.h265.pps->deblocking_filter_override_enabled_flag =
+ hevc->slice_parsing_fields.bits.deblocking_filter_override_enabled_flag;
+ context->desc.h265.pps->pps_deblocking_filter_disabled_flag =
+ hevc->slice_parsing_fields.bits.pps_disable_deblocking_filter_flag;
+}
+
+void vlVaHandleIQMatrixBufferHEVC(vlVaContext *context, vlVaBuffer *buf)
+{
+ VAIQMatrixBufferHEVC *h265 = buf->data;
+
+ assert(buf->size >= sizeof(VAIQMatrixBufferH264) && buf->num_elements == 1);
+ memcpy(&context->desc.h265.pps->sps->ScalingList4x4, h265->ScalingList4x4, 6 * 16);
+ memcpy(&context->desc.h265.pps->sps->ScalingList8x8, h265->ScalingList8x8, 6 * 64);
+ memcpy(&context->desc.h265.pps->sps->ScalingList16x16, h265->ScalingList16x16, 6 * 64);
+ memcpy(&context->desc.h265.pps->sps->ScalingList32x32, h265->ScalingList32x32, 2 * 64);
+ memcpy(&context->desc.h265.pps->sps->ScalingListDCCoeff16x16, h265->ScalingListDC16x16, 6);
+ memcpy(&context->desc.h265.pps->sps->ScalingListDCCoeff32x32, h265->ScalingListDC32x32, 2);
+}
+
+void vlVaHandleSliceParameterBufferHEVC(vlVaContext *context, vlVaBuffer *buf)
+{
+ VASliceParameterBufferHEVC *h265 = buf->data;
+
+ assert(buf->size >= sizeof(VASliceParameterBufferHEVC) && buf->num_elements == 1);
+ for (int i = 0 ; i < 2 ; i++) {
+ for (int j = 0 ; j < 15 ; j++)
+ context->desc.h265.RefPicList[i][j] = h265->RefPicList[i][j];
+ }
+ context->desc.h265.UseRefPicList = true;
+}
diff --git a/src/gallium/state_trackers/va/va_private.h b/src/gallium/state_trackers/va/va_private.h
index 6fb687b..2ce215d 100644
--- a/src/gallium/state_trackers/va/va_private.h
+++ b/src/gallium/state_trackers/va/va_private.h
@@ -354,5 +354,8 @@ void vlVaHandlePictureParameterBufferMPEG4(vlVaDriver *drv, vlVaContext *context
void vlVaHandleIQMatrixBufferMPEG4(vlVaContext *context, vlVaBuffer *buf);
void vlVaHandleSliceParameterBufferMPEG4(vlVaContext *context, vlVaBuffer *buf);
void vlVaDecoderFixMPEG4Startcode(vlVaContext *context);
+void vlVaHandlePictureParameterBufferHEVC(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *buf);
+void vlVaHandleIQMatrixBufferHEVC(vlVaContext *context, vlVaBuffer *buf);
+void vlVaHandleSliceParameterBufferHEVC(vlVaContext *context, vlVaBuffer *buf);
#endif //VA_PRIVATE_H
--
2.5.0
More information about the mesa-dev
mailing list