diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-23 20:02:11 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-23 20:02:11 -0300 |
| commit | dc39ccdc3b88e9ec3b4aa3581798c30660d94d07 (patch) | |
| tree | ea6dd9bc79af60d63fe0edd905158b3440db23d4 /libavcodec/vaapi_hevc.c | |
| parent | 0f4abbd4ee1c5b34068cb48ceab3515641d6e0fb (diff) | |
| parent | 0bfdcce4d42a6e654c00ea5f9237dc987626457f (diff) | |
Merge commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f'
* commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f':
hevc: move the SliceType enum to hevc.h
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/vaapi_hevc.c')
| -rw-r--r-- | libavcodec/vaapi_hevc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c index 6dd35db19e..69b8e478c6 100644 --- a/libavcodec/vaapi_hevc.c +++ b/libavcodec/vaapi_hevc.c @@ -297,9 +297,9 @@ static void fill_pred_weight_table(const HEVCContext *h, slice_param->delta_chroma_log2_weight_denom = 0; slice_param->luma_log2_weight_denom = 0; - if (sh->slice_type == I_SLICE || - (sh->slice_type == P_SLICE && !h->ps.pps->weighted_pred_flag) || - (sh->slice_type == B_SLICE && !h->ps.pps->weighted_bipred_flag)) + 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; @@ -317,7 +317,7 @@ static void fill_pred_weight_table(const HEVCContext *h, slice_param->ChromaOffsetL0[i][1] = sh->chroma_offset_l0[i][1]; } - if (sh->slice_type == B_SLICE) { + 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]; @@ -356,8 +356,8 @@ static int vaapi_hevc_decode_slice(AVCodecContext *avctx, const SliceHeader *sh = &h->sh; VAAPIDecodePictureHEVC *pic = h->ref->hwaccel_picture_private; - int nb_list = (sh->slice_type == B_SLICE) ? - 2 : (sh->slice_type == I_SLICE ? 0 : 1); + int nb_list = (sh->slice_type == HEVC_SLICE_B) ? + 2 : (sh->slice_type == HEVC_SLICE_I ? 0 : 1); int err, i, list_idx; @@ -387,7 +387,7 @@ static int vaapi_hevc_decode_slice(AVCodecContext *avctx, .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 == I_SLICE ? 0 : 5 - sh->max_num_merge_cand, + .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, |