comparison h264_loopfilter.c @ 10939:5660eac25fb4 libavcodec

Reenable ff_h264_filter_mb_fast() for all slices it supported before.
author michael
date Tue, 19 Jan 2010 16:43:57 +0000
parents b847f02d5b03
children ee944149442f
comparison
equal deleted inserted replaced
10938:2a50b786b888 10939:5660eac25fb4
318 int qp, qp0, qp1, qpc, qpc0, qpc1, qp_thresh; 318 int qp, qp0, qp1, qpc, qpc0, qpc1, qp_thresh;
319 319
320 mb_xy = h->mb_xy; 320 mb_xy = h->mb_xy;
321 321
322 if(mb_x==0 || mb_y==mb_y_firstrow || !s->dsp.h264_loop_filter_strength || h->pps.chroma_qp_diff || 322 if(mb_x==0 || mb_y==mb_y_firstrow || !s->dsp.h264_loop_filter_strength || h->pps.chroma_qp_diff ||
323 !(h->slice_type_nos == FF_I_TYPE ||
324 h->slice_type_nos == FF_P_TYPE ||
325 (s->flags2 & CODEC_FLAG2_FAST)) ||
326 (h->deblocking_filter == 2 && (h->slice_num != h->slice_table[h->top_mb_xy] || 323 (h->deblocking_filter == 2 && (h->slice_num != h->slice_table[h->top_mb_xy] ||
327 h->slice_num != h->slice_table[mb_xy - 1]))) { 324 h->slice_num != h->slice_table[mb_xy - 1]))) {
328 ff_h264_filter_mb(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize); 325 ff_h264_filter_mb(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize);
329 return; 326 return;
330 } 327 }