comparison vaapi_h264.c @ 10979:776dba50775c libavcodec

Move +52 from the loop filter to the alpha/beta offsets in the context. This should fix a segfault, also it might be faster on systems where the +52 wasnt free.
author michael
date Sat, 23 Jan 2010 18:05:30 +0000
parents 46a247e54d6e
children f5ebc14d90f0
comparison
equal deleted inserted replaced
10978:8754b8361dc9 10979:776dba50775c
315 slice_param->num_ref_idx_l0_active_minus1 = h->list_count > 0 ? h->ref_count[0] - 1 : 0; 315 slice_param->num_ref_idx_l0_active_minus1 = h->list_count > 0 ? h->ref_count[0] - 1 : 0;
316 slice_param->num_ref_idx_l1_active_minus1 = h->list_count > 1 ? h->ref_count[1] - 1 : 0; 316 slice_param->num_ref_idx_l1_active_minus1 = h->list_count > 1 ? h->ref_count[1] - 1 : 0;
317 slice_param->cabac_init_idc = h->cabac_init_idc; 317 slice_param->cabac_init_idc = h->cabac_init_idc;
318 slice_param->slice_qp_delta = s->qscale - h->pps.init_qp; 318 slice_param->slice_qp_delta = s->qscale - h->pps.init_qp;
319 slice_param->disable_deblocking_filter_idc = h->deblocking_filter < 2 ? !h->deblocking_filter : h->deblocking_filter; 319 slice_param->disable_deblocking_filter_idc = h->deblocking_filter < 2 ? !h->deblocking_filter : h->deblocking_filter;
320 slice_param->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2; 320 slice_param->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2 - 26;
321 slice_param->slice_beta_offset_div2 = h->slice_beta_offset / 2; 321 slice_param->slice_beta_offset_div2 = h->slice_beta_offset / 2 - 26;
322 slice_param->luma_log2_weight_denom = h->luma_log2_weight_denom; 322 slice_param->luma_log2_weight_denom = h->luma_log2_weight_denom;
323 slice_param->chroma_log2_weight_denom = h->chroma_log2_weight_denom; 323 slice_param->chroma_log2_weight_denom = h->chroma_log2_weight_denom;
324 324
325 fill_vaapi_RefPicList(slice_param->RefPicList0, h->ref_list[0], h->list_count > 0 ? h->ref_count[0] : 0); 325 fill_vaapi_RefPicList(slice_param->RefPicList0, h->ref_list[0], h->list_count > 0 ? h->ref_count[0] : 0);
326 fill_vaapi_RefPicList(slice_param->RefPicList1, h->ref_list[1], h->list_count > 1 ? h->ref_count[1] : 0); 326 fill_vaapi_RefPicList(slice_param->RefPicList1, h->ref_list[1], h->list_count > 1 ? h->ref_count[1] : 0);