[FFmpeg-devel] [PATCH] dxva2_hevc: unbreak compilation after recent sps/pps changes
James Almer
jamrial at gmail.com
Mon Jul 13 03:37:00 CEST 2015
Signed-off-by: James Almer <jamrial at gmail.com>
---
It compiles, but i can't test it.
libavcodec/dxva2_hevc.c | 152 ++++++++++++++++++++++++------------------------
1 file changed, 76 insertions(+), 76 deletions(-)
diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c
index 5f5134b..2c961a4 100644
--- a/libavcodec/dxva2_hevc.c
+++ b/libavcodec/dxva2_hevc.c
@@ -61,98 +61,98 @@ static void fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext *
memset(pp, 0, sizeof(*pp));
- pp->PicWidthInMinCbsY = h->sps->min_cb_width;
- pp->PicHeightInMinCbsY = h->sps->min_cb_height;
-
- pp->wFormatAndSequenceInfoFlags = (h->sps->chroma_format_idc << 0) |
- (h->sps->separate_colour_plane_flag << 2) |
- ((h->sps->bit_depth - 8) << 3) |
- ((h->sps->bit_depth - 8) << 6) |
- ((h->sps->log2_max_poc_lsb - 4) << 9) |
- (0 << 13) |
- (0 << 14) |
- (0 << 15);
+ pp->PicWidthInMinCbsY = h->ps.sps->min_cb_width;
+ pp->PicHeightInMinCbsY = h->ps.sps->min_cb_height;
+
+ pp->wFormatAndSequenceInfoFlags = (h->ps.sps->chroma_format_idc << 0) |
+ (h->ps.sps->separate_colour_plane_flag << 2) |
+ ((h->ps.sps->bit_depth - 8) << 3) |
+ ((h->ps.sps->bit_depth - 8) << 6) |
+ ((h->ps.sps->log2_max_poc_lsb - 4) << 9) |
+ (0 << 13) |
+ (0 << 14) |
+ (0 << 15);
fill_picture_entry(&pp->CurrPic, ff_dxva2_get_surface_index(avctx, ctx, current_picture->frame), 0);
- pp->sps_max_dec_pic_buffering_minus1 = h->sps->temporal_layer[h->sps->max_sub_layers - 1].max_dec_pic_buffering - 1;
- pp->log2_min_luma_coding_block_size_minus3 = h->sps->log2_min_cb_size - 3;
- pp->log2_diff_max_min_luma_coding_block_size = h->sps->log2_diff_max_min_coding_block_size;
- pp->log2_min_transform_block_size_minus2 = h->sps->log2_min_tb_size - 2;
- pp->log2_diff_max_min_transform_block_size = h->sps->log2_max_trafo_size - h->sps->log2_min_tb_size;
- pp->max_transform_hierarchy_depth_inter = h->sps->max_transform_hierarchy_depth_inter;
- pp->max_transform_hierarchy_depth_intra = h->sps->max_transform_hierarchy_depth_intra;
- pp->num_short_term_ref_pic_sets = h->sps->nb_st_rps;
- pp->num_long_term_ref_pics_sps = h->sps->num_long_term_ref_pics_sps;
+ pp->sps_max_dec_pic_buffering_minus1 = h->ps.sps->temporal_layer[h->ps.sps->max_sub_layers - 1].max_dec_pic_buffering - 1;
+ pp->log2_min_luma_coding_block_size_minus3 = h->ps.sps->log2_min_cb_size - 3;
+ pp->log2_diff_max_min_luma_coding_block_size = h->ps.sps->log2_diff_max_min_coding_block_size;
+ pp->log2_min_transform_block_size_minus2 = h->ps.sps->log2_min_tb_size - 2;
+ pp->log2_diff_max_min_transform_block_size = h->ps.sps->log2_max_trafo_size - h->ps.sps->log2_min_tb_size;
+ pp->max_transform_hierarchy_depth_inter = h->ps.sps->max_transform_hierarchy_depth_inter;
+ pp->max_transform_hierarchy_depth_intra = h->ps.sps->max_transform_hierarchy_depth_intra;
+ pp->num_short_term_ref_pic_sets = h->ps.sps->nb_st_rps;
+ pp->num_long_term_ref_pics_sps = h->ps.sps->num_long_term_ref_pics_sps;
- pp->num_ref_idx_l0_default_active_minus1 = h->pps->num_ref_idx_l0_default_active - 1;
- pp->num_ref_idx_l1_default_active_minus1 = h->pps->num_ref_idx_l1_default_active - 1;
- pp->init_qp_minus26 = h->pps->pic_init_qp_minus26;
+ pp->num_ref_idx_l0_default_active_minus1 = h->ps.pps->num_ref_idx_l0_default_active - 1;
+ pp->num_ref_idx_l1_default_active_minus1 = h->ps.pps->num_ref_idx_l1_default_active - 1;
+ pp->init_qp_minus26 = h->ps.pps->pic_init_qp_minus26;
if (h->sh.short_term_ref_pic_set_sps_flag == 0 && h->sh.short_term_rps) {
pp->ucNumDeltaPocsOfRefRpsIdx = h->sh.short_term_rps->num_delta_pocs;
pp->wNumBitsForShortTermRPSInSlice = h->sh.short_term_ref_pic_set_size;
}
- pp->dwCodingParamToolFlags = (h->sps->scaling_list_enable_flag << 0) |
- (h->sps->amp_enabled_flag << 1) |
- (h->sps->sao_enabled << 2) |
- (h->sps->pcm_enabled_flag << 3) |
- ((h->sps->pcm_enabled_flag ? (h->sps->pcm.bit_depth - 1) : 0) << 4) |
- ((h->sps->pcm_enabled_flag ? (h->sps->pcm.bit_depth_chroma - 1) : 0) << 8) |
- ((h->sps->pcm_enabled_flag ? (h->sps->pcm.log2_min_pcm_cb_size - 3) : 0) << 12) |
- ((h->sps->pcm_enabled_flag ? (h->sps->pcm.log2_max_pcm_cb_size - h->sps->pcm.log2_min_pcm_cb_size) : 0) << 14) |
- (h->sps->pcm.loop_filter_disable_flag << 16) |
- (h->sps->long_term_ref_pics_present_flag << 17) |
- (h->sps->sps_temporal_mvp_enabled_flag << 18) |
- (h->sps->sps_strong_intra_smoothing_enable_flag << 19) |
- (h->pps->dependent_slice_segments_enabled_flag << 20) |
- (h->pps->output_flag_present_flag << 21) |
- (h->pps->num_extra_slice_header_bits << 22) |
- (h->pps->sign_data_hiding_flag << 25) |
- (h->pps->cabac_init_present_flag << 26) |
- (0 << 27);
-
- pp->dwCodingSettingPicturePropertyFlags = (h->pps->constrained_intra_pred_flag << 0) |
- (h->pps->transform_skip_enabled_flag << 1) |
- (h->pps->cu_qp_delta_enabled_flag << 2) |
- (h->pps->pic_slice_level_chroma_qp_offsets_present_flag << 3) |
- (h->pps->weighted_pred_flag << 4) |
- (h->pps->weighted_bipred_flag << 5) |
- (h->pps->transquant_bypass_enable_flag << 6) |
- (h->pps->tiles_enabled_flag << 7) |
- (h->pps->entropy_coding_sync_enabled_flag << 8) |
- (h->pps->uniform_spacing_flag << 9) |
- ((h->pps->tiles_enabled_flag ? h->pps->loop_filter_across_tiles_enabled_flag : 0) << 10) |
- (h->pps->seq_loop_filter_across_slices_enabled_flag << 11) |
- (h->pps->deblocking_filter_override_enabled_flag << 12) |
- (h->pps->disable_dbf << 13) |
- (h->pps->lists_modification_present_flag << 14) |
- (h->pps->slice_header_extension_present_flag << 15) |
+ pp->dwCodingParamToolFlags = (h->ps.sps->scaling_list_enable_flag << 0) |
+ (h->ps.sps->amp_enabled_flag << 1) |
+ (h->ps.sps->sao_enabled << 2) |
+ (h->ps.sps->pcm_enabled_flag << 3) |
+ ((h->ps.sps->pcm_enabled_flag ? (h->ps.sps->pcm.bit_depth - 1) : 0) << 4) |
+ ((h->ps.sps->pcm_enabled_flag ? (h->ps.sps->pcm.bit_depth_chroma - 1) : 0) << 8) |
+ ((h->ps.sps->pcm_enabled_flag ? (h->ps.sps->pcm.log2_min_pcm_cb_size - 3) : 0) << 12) |
+ ((h->ps.sps->pcm_enabled_flag ? (h->ps.sps->pcm.log2_max_pcm_cb_size - h->ps.sps->pcm.log2_min_pcm_cb_size) : 0) << 14) |
+ (h->ps.sps->pcm.loop_filter_disable_flag << 16) |
+ (h->ps.sps->long_term_ref_pics_present_flag << 17) |
+ (h->ps.sps->sps_temporal_mvp_enabled_flag << 18) |
+ (h->ps.sps->sps_strong_intra_smoothing_enable_flag << 19) |
+ (h->ps.pps->dependent_slice_segments_enabled_flag << 20) |
+ (h->ps.pps->output_flag_present_flag << 21) |
+ (h->ps.pps->num_extra_slice_header_bits << 22) |
+ (h->ps.pps->sign_data_hiding_flag << 25) |
+ (h->ps.pps->cabac_init_present_flag << 26) |
+ (0 << 27);
+
+ pp->dwCodingSettingPicturePropertyFlags = (h->ps.pps->constrained_intra_pred_flag << 0) |
+ (h->ps.pps->transform_skip_enabled_flag << 1) |
+ (h->ps.pps->cu_qp_delta_enabled_flag << 2) |
+ (h->ps.pps->pic_slice_level_chroma_qp_offsets_present_flag << 3) |
+ (h->ps.pps->weighted_pred_flag << 4) |
+ (h->ps.pps->weighted_bipred_flag << 5) |
+ (h->ps.pps->transquant_bypass_enable_flag << 6) |
+ (h->ps.pps->tiles_enabled_flag << 7) |
+ (h->ps.pps->entropy_coding_sync_enabled_flag << 8) |
+ (h->ps.pps->uniform_spacing_flag << 9) |
+ ((h->ps.pps->tiles_enabled_flag ? h->ps.pps->loop_filter_across_tiles_enabled_flag : 0) << 10) |
+ (h->ps.pps->seq_loop_filter_across_slices_enabled_flag << 11) |
+ (h->ps.pps->deblocking_filter_override_enabled_flag << 12) |
+ (h->ps.pps->disable_dbf << 13) |
+ (h->ps.pps->lists_modification_present_flag << 14) |
+ (h->ps.pps->slice_header_extension_present_flag << 15) |
(IS_IRAP(h) << 16) |
(IS_IDR(h) << 17) |
/* IntraPicFlag */
(IS_IRAP(h) << 18) |
(0 << 19);
- pp->pps_cb_qp_offset = h->pps->cb_qp_offset;
- pp->pps_cr_qp_offset = h->pps->cr_qp_offset;
- if (h->pps->tiles_enabled_flag) {
- pp->num_tile_columns_minus1 = h->pps->num_tile_columns - 1;
- pp->num_tile_rows_minus1 = h->pps->num_tile_rows - 1;
-
- if (!h->pps->uniform_spacing_flag) {
- for (i = 0; i < h->pps->num_tile_columns; i++)
- pp->column_width_minus1[i] = h->pps->column_width[i] - 1;
-
- for (i = 0; i < h->pps->num_tile_rows; i++)
- pp->row_height_minus1[i] = h->pps->row_height[i] - 1;
+ pp->pps_cb_qp_offset = h->ps.pps->cb_qp_offset;
+ pp->pps_cr_qp_offset = h->ps.pps->cr_qp_offset;
+ if (h->ps.pps->tiles_enabled_flag) {
+ pp->num_tile_columns_minus1 = h->ps.pps->num_tile_columns - 1;
+ pp->num_tile_rows_minus1 = h->ps.pps->num_tile_rows - 1;
+
+ if (!h->ps.pps->uniform_spacing_flag) {
+ for (i = 0; i < h->ps.pps->num_tile_columns; i++)
+ pp->column_width_minus1[i] = h->ps.pps->column_width[i] - 1;
+
+ for (i = 0; i < h->ps.pps->num_tile_rows; i++)
+ pp->row_height_minus1[i] = h->ps.pps->row_height[i] - 1;
}
}
- pp->diff_cu_qp_delta_depth = h->pps->diff_cu_qp_delta_depth;
- pp->pps_beta_offset_div2 = h->pps->beta_offset / 2;
- pp->pps_tc_offset_div2 = h->pps->tc_offset / 2;
- pp->log2_parallel_merge_level_minus2 = h->pps->log2_parallel_merge_level - 2;
+ pp->diff_cu_qp_delta_depth = h->ps.pps->diff_cu_qp_delta_depth;
+ pp->pps_beta_offset_div2 = h->ps.pps->beta_offset / 2;
+ pp->pps_tc_offset_div2 = h->ps.pps->tc_offset / 2;
+ pp->log2_parallel_merge_level_minus2 = h->ps.pps->log2_parallel_merge_level - 2;
pp->CurrPicOrderCntVal = h->poc;
// fill RefPicList from the DPB
@@ -197,8 +197,8 @@ static void fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext *
static void fill_scaling_lists(AVDXVAContext *ctx, const HEVCContext *h, DXVA_Qmatrix_HEVC *qm)
{
unsigned i, j, pos;
- const ScalingList *sl = h->pps->scaling_list_data_present_flag ?
- &h->pps->scaling_list : &h->sps->scaling_list;
+ const ScalingList *sl = h->ps.pps->scaling_list_data_present_flag ?
+ &h->ps.pps->scaling_list : &h->ps.sps->scaling_list;
memset(qm, 0, sizeof(*qm));
for (i = 0; i < 6; i++) {
--
2.4.5
More information about the ffmpeg-devel
mailing list