diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2007-09-22 10:28:22 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2007-09-22 10:28:22 +0000 |
| commit | 61858a76f29ba41f9aabc2940b9efafd4d407e69 (patch) | |
| tree | f09b9997e300ee107eddb5daf631d57c6aa025d1 /libavcodec | |
| parent | a2085a7e9d83d99aca58bfb385f6db1afa5673dd (diff) | |
| download | ffmpeg-61858a76f29ba41f9aabc2940b9efafd4d407e69.tar.gz | |
Apply skip_loop_filter before checking if we can parallelize with the selected
loop filter
Originally committed as revision 10549 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 5961acae0b..90338fc18f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3814,6 +3814,12 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ } } + if( s->avctx->skip_loop_filter >= AVDISCARD_ALL + ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type != I_TYPE) + ||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR && h->slice_type == B_TYPE) + ||(s->avctx->skip_loop_filter >= AVDISCARD_NONREF && h->nal_ref_idc == 0)) + h->deblocking_filter= 0; + if(h->deblocking_filter == 1 && h0->max_contexts > 1) { if(s->avctx->flags2 & CODEC_FLAG2_FAST) { /* Cheat slightly for speed: @@ -3830,12 +3836,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ } } - if( s->avctx->skip_loop_filter >= AVDISCARD_ALL - ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type != I_TYPE) - ||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR && h->slice_type == B_TYPE) - ||(s->avctx->skip_loop_filter >= AVDISCARD_NONREF && h->nal_ref_idc == 0)) - h->deblocking_filter= 0; - #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) slice_group_change_cycle= get_bits(&s->gb, ?); |