virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Change yadif to not use out of picture lines.

Browse Source 
Fixes issue2272.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Michael Niedermayer 2011-02-18 19:10:33 +01:00 committed by Anton Khirnov
parent 4e3945fd28
commit 233ed6b314
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavfilter/vf_yadif.c
View File

@ -50,42 +50,42 @@ typedef struct {
AVFilterBufferRef *out; AVFilterBufferRef *out;
void (*filter_line)(uint8_t *dst, void (*filter_line)(uint8_t *dst,
uint8_t *prev, uint8_t *cur, uint8_t *next, uint8_t *prev, uint8_t *cur, uint8_t *next,
int w, int refs, int parity, int mode); int w, int prefs, int mrefs, int parity, int mode);
} YADIFContext; } YADIFContext;
static void filter_line_c(uint8_t *dst, static void filter_line_c(uint8_t *dst,
uint8_t *prev, uint8_t *cur, uint8_t *next, uint8_t *prev, uint8_t *cur, uint8_t *next,
int w, int refs, int parity, int mode) int w, int prefs, int mrefs, int parity, int mode)
{ {
int x; int x;
uint8_t *prev2 = parity ? prev : cur ; uint8_t *prev2 = parity ? prev : cur ;
uint8_t *next2 = parity ? cur : next; uint8_t *next2 = parity ? cur : next;
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
int c = cur[-refs]; int c = cur[mrefs];
int d = (prev2[0] + next2[0])>>1; int d = (prev2[0] + next2[0])>>1;
int e = cur[+refs]; int e = cur[prefs];
int temporal_diff0 = FFABS(prev2[0] - next2[0]); int temporal_diff0 = FFABS(prev2[0] - next2[0]);
int temporal_diff1 =(FFABS(prev[-refs] - c) + FFABS(prev[+refs] - e) )>>1; int temporal_diff1 =(FFABS(prev[mrefs] - c) + FFABS(prev[prefs] - e) )>>1;
int temporal_diff2 =(FFABS(next[-refs] - c) + FFABS(next[+refs] - e) )>>1; int temporal_diff2 =(FFABS(next[mrefs] - c) + FFABS(next[prefs] - e) )>>1;
int diff = FFMAX3(temporal_diff0>>1, temporal_diff1, temporal_diff2); int diff = FFMAX3(temporal_diff0>>1, temporal_diff1, temporal_diff2);
int spatial_pred = (c+e)>>1; int spatial_pred = (c+e)>>1;
int spatial_score = FFABS(cur[-refs-1] - cur[+refs-1]) + FFABS(c-e) int spatial_score = FFABS(cur[mrefs-1] - cur[prefs-1]) + FFABS(c-e)
+ FFABS(cur[-refs+1] - cur[+refs+1]) - 1; + FFABS(cur[mrefs+1] - cur[prefs+1]) - 1;
#define CHECK(j)\ #define CHECK(j)\
{ int score = FFABS(cur[-refs-1+(j)] - cur[+refs-1-(j)])\ { int score = FFABS(cur[mrefs-1+(j)] - cur[prefs-1-(j)])\
+ FFABS(cur[-refs +(j)] - cur[+refs -(j)])\ + FFABS(cur[mrefs +(j)] - cur[prefs -(j)])\
+ FFABS(cur[-refs+1+(j)] - cur[+refs+1-(j)]);\ + FFABS(cur[mrefs+1+(j)] - cur[prefs+1-(j)]);\
if (score < spatial_score) {\ if (score < spatial_score) {\
spatial_score= score;\ spatial_score= score;\
spatial_pred= (cur[-refs +(j)] + cur[+refs -(j)])>>1;\ spatial_pred= (cur[mrefs +(j)] + cur[prefs -(j)])>>1;\
CHECK(-1) CHECK(-2) }} }} CHECK(-1) CHECK(-2) }} }}
CHECK( 1) CHECK( 2) }} }} CHECK( 1) CHECK( 2) }} }}
if (mode < 2) { if (mode < 2) {
int b = (prev2[-2*refs] + next2[-2*refs])>>1; int b = (prev2[2*mrefs] + next2[2*mrefs])>>1;
int f = (prev2[+2*refs] + next2[+2*refs])>>1; int f = (prev2[2*prefs] + next2[2*prefs])>>1;
#if 0 #if 0
int a = cur[-3*refs]; int a = cur[-3*refs];
int g = cur[+3*refs]; int g = cur[+3*refs];
@ -133,7 +133,8 @@ static void filter(AVFilterContext *ctx, AVFilterBufferRef *dstpic,
uint8_t *cur = &yadif->cur ->data[i][y*refs]; uint8_t *cur = &yadif->cur ->data[i][y*refs];
uint8_t *next = &yadif->next->data[i][y*refs]; uint8_t *next = &yadif->next->data[i][y*refs];
uint8_t *dst = &dstpic->data[i][y*dstpic->linesize[i]]; uint8_t *dst = &dstpic->data[i][y*dstpic->linesize[i]];
yadif->filter_line(dst, prev, cur, next, w, refs, parity ^ tff, yadif->mode); int mode = y==1 || y+2==h ? 2 : yadif->mode;
yadif->filter_line(dst, prev, cur, next, w, y+1<h ? refs : -refs, y ? -refs : refs, parity ^ tff, mode);
} else { } else {
memcpy(&dstpic->data[i][y*dstpic->linesize[i]], memcpy(&dstpic->data[i][y*dstpic->linesize[i]],
&yadif->cur->data[i][y*refs], w); &yadif->cur->data[i][y*refs], w);

6
libavfilter/x86/yadif_template.c
View File

@ -105,7 +105,7 @@
void RENAME(ff_yadif_filter_line)(uint8_t *dst, void RENAME(ff_yadif_filter_line)(uint8_t *dst,
uint8_t *prev, uint8_t *cur, uint8_t *next, uint8_t *prev, uint8_t *cur, uint8_t *next,
int w, int refs, int parity, int mode) int w, int prefs, int mrefs, int parity, int mode)
{ {
DECLARE_ALIGNED(16, uint8_t, tmp0[16]); DECLARE_ALIGNED(16, uint8_t, tmp0[16]);
DECLARE_ALIGNED(16, uint8_t, tmp1[16]); DECLARE_ALIGNED(16, uint8_t, tmp1[16]);
@ -226,8 +226,8 @@ void RENAME(ff_yadif_filter_line)(uint8_t *dst,
:[prev] "r"(prev),\ :[prev] "r"(prev),\
[cur] "r"(cur),\ [cur] "r"(cur),\
[next] "r"(next),\ [next] "r"(next),\
[prefs]"r"((x86_reg)refs),\ [prefs]"r"((x86_reg)prefs),\
[mrefs]"r"((x86_reg)-refs),\ [mrefs]"r"((x86_reg)mrefs),\
[mode] "g"(mode)\ [mode] "g"(mode)\
);\ );\
__asm__ volatile(MOV" "MM"1, %0" :"=m"(*dst));\ __asm__ volatile(MOV" "MM"1, %0" :"=m"(*dst));\

6
libavfilter/yadif.h
View File

@ -23,14 +23,14 @@
void ff_yadif_filter_line_mmx(uint8_t *dst, void ff_yadif_filter_line_mmx(uint8_t *dst,
uint8_t *prev, uint8_t *cur, uint8_t *next, uint8_t *prev, uint8_t *cur, uint8_t *next,
int w, int refs, int parity, int mode); int w, int prefs, int mrefs, int parity, int mode);
void ff_yadif_filter_line_sse2(uint8_t *dst, void ff_yadif_filter_line_sse2(uint8_t *dst,
uint8_t *prev, uint8_t *cur, uint8_t *next, uint8_t *prev, uint8_t *cur, uint8_t *next,
int w, int refs, int parity, int mode); int w, int prefs, int mrefs, int parity, int mode);
void ff_yadif_filter_line_ssse3(uint8_t *dst, void ff_yadif_filter_line_ssse3(uint8_t *dst,
uint8_t *prev, uint8_t *cur, uint8_t *next, uint8_t *prev, uint8_t *cur, uint8_t *next,
int w, int refs, int parity, int mode); int w, int prefs, int mrefs, int parity, int mode);
#endif /* AVFILTER_YADIF_H */ #endif /* AVFILTER_YADIF_H */