mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-21 16:55:05 +02:00
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
This commit is contained in:
parent
a2085a7e9d
commit
61858a76f2
@ -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(h->deblocking_filter == 1 && h0->max_contexts > 1) {
|
||||||
if(s->avctx->flags2 & CODEC_FLAG2_FAST) {
|
if(s->avctx->flags2 & CODEC_FLAG2_FAST) {
|
||||||
/* Cheat slightly for speed:
|
/* 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 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)
|
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, ?);
|
slice_group_change_cycle= get_bits(&s->gb, ?);
|
||||||
|
Loading…
Reference in New Issue
Block a user