mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Don't swap back un-deblocked lines for intra prediction when
at slice boundaries for deblocking-type 2 content. This is needed for slice based threading only and doesn't do much good or bad otherwise. Patch by Andreas Oman %andreas A olebyn P nu% Original thread: date: Jun 18, 2007 1:21 PM subject: Re: [FFmpeg-devel] [PATCH] h264 parallelized, Originally committed as revision 9380 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
c0ad72a787
commit
b69378e295
@ -3024,8 +3024,18 @@ static inline void xchg_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_c
|
|||||||
MpegEncContext * const s = &h->s;
|
MpegEncContext * const s = &h->s;
|
||||||
int temp8, i;
|
int temp8, i;
|
||||||
uint64_t temp64;
|
uint64_t temp64;
|
||||||
int deblock_left = (s->mb_x > 0);
|
int deblock_left;
|
||||||
int deblock_top = (s->mb_y > 0);
|
int deblock_top;
|
||||||
|
int mb_xy;
|
||||||
|
|
||||||
|
if(h->deblocking_filter == 2) {
|
||||||
|
mb_xy = s->mb_x + s->mb_y*s->mb_stride;
|
||||||
|
deblock_left = h->slice_table[mb_xy] == h->slice_table[mb_xy - 1];
|
||||||
|
deblock_top = h->slice_table[mb_xy] == h->slice_table[h->top_mb_xy];
|
||||||
|
} else {
|
||||||
|
deblock_left = (s->mb_x > 0);
|
||||||
|
deblock_top = (s->mb_y > 0);
|
||||||
|
}
|
||||||
|
|
||||||
src_y -= linesize + 1;
|
src_y -= linesize + 1;
|
||||||
src_cb -= uvlinesize + 1;
|
src_cb -= uvlinesize + 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user