diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-16 11:55:35 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-16 11:55:35 +0000 |
| commit | 2e36c931f0e8d9fe812badd4dee90fdd352c05be (patch) | |
| tree | c6c0e6656c3df4dc7dbd42b5601a85eacf2e5370 | |
| parent | 3e906f4cfb15738b4c0cb56bad64531620af4818 (diff) | |
| download | ffmpeg-2e36c931f0e8d9fe812badd4dee90fdd352c05be.tar.gz | |
Avoid wasting 4 cpu cycles per MB in redundantly calculating qp_thresh.
Originally committed as revision 21243 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264.h | 2 | ||||
| -rw-r--r-- | libavcodec/h264_loopfilter.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 60564978cd..3cec4182ec 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2110,6 +2110,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ 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) diff --git a/libavcodec/h264.h b/libavcodec/h264.h index eb5cecc87e..6d18af431a 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -273,6 +273,8 @@ typedef struct H264Context{ int chroma_qp[2]; //QPc + int qp_thresh; ///< QP threshold to skip loopfilter + int prev_mb_skipped; int next_mb_skipped; diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index 08c9723e9c..7d462e18cd 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -654,7 +654,7 @@ void ff_h264_filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint //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) |