Mercurial > libavcodec.hg
changeset 10896:f112b4d030fa libavcodec
Avoid wasting 4 cpu cycles per MB in redundantly calculating qp_thresh.
| author | michael |
|---|---|
| date | Sat, 16 Jan 2010 11:55:35 +0000 |
| parents | 1cebb3ea364b |
| children | d23f1c47fc09 |
| files | h264.c h264.h h264_loopfilter.c |
| diffstat | 3 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/h264.c Sat Jan 16 10:46:45 2010 +0000 +++ b/h264.c Sat Jan 16 11:55:35 2010 +0000 @@ -2110,6 +2110,7 @@ return 1; // deblocking switched inside frame } } + h->qp_thresh= 15 - h->slice_alpha_c0_offset - FFMAX3(0, h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1]); #if 0 //FMO if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5)
--- a/h264.h Sat Jan 16 10:46:45 2010 +0000 +++ b/h264.h Sat Jan 16 11:55:35 2010 +0000 @@ -273,6 +273,8 @@ int chroma_qp[2]; //QPc + int qp_thresh; ///< QP threshold to skip loopfilter + int prev_mb_skipped; int next_mb_skipped;
--- a/h264_loopfilter.c Sat Jan 16 10:46:45 2010 +0000 +++ b/h264_loopfilter.c Sat Jan 16 11:55:35 2010 +0000 @@ -654,7 +654,7 @@ //for sufficiently low qp, filtering wouldn't do anything //this is a conservative estimate: could also check beta_offset and more accurate chroma_qp if(!FRAME_MBAFF){ - int qp_thresh = 15 - h->slice_alpha_c0_offset - FFMAX3(0, h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1]); + int qp_thresh = h->qp_thresh; int qp = s->current_picture.qscale_table[mb_xy]; if(qp <= qp_thresh && (mb_x == 0 || ((qp + s->current_picture.qscale_table[mb_xy-1] + 1)>>1) <= qp_thresh)