Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_vectorscope: process alpha at end

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
pull/187/head
Paul B Mahol 9 years ago
parent 8097455929
commit 55c872146d
1 changed files with 22 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      libavfilter/vf_vectorscope.c

46
libavfilter/vf_vectorscope.c
Unescape View File

@ -435,8 +435,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
continue;
dpd[pos] = FFMIN(dpd[pos] + intensity, max);
if (dst[3])
dst[3][pos] = max;
}
}
} else {
@ -456,8 +454,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
dst[0][pos] = FFMIN(dst[0][pos] + intensity, max);
dst[1][pos] = FFMIN(dst[1][pos] + intensity, max);
dst[2][pos] = FFMIN(dst[2][pos] + intensity, max);
if (dst[3])
dst[3][pos] = max;
}
}
}
@ -481,8 +477,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
dpd[pos] = FFABS(mid - x) + FFABS(mid - y);
dpx[pos] = x;
dpy[pos] = y;
if (dst[3])
dst[3][pos] = max;
}
}
} else {
@ -503,8 +497,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
dpd[pos] = FFMIN(x + y, max);
dpx[pos] = x;
dpy[pos] = y;
if (dst[3])
dst[3][pos] = max;
}
}
}
@ -526,8 +518,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
dpd[pos] = FFMIN(max, dpd[pos] + intensity);
dpx[pos] = x;
dpy[pos] = y;
if (dst[3])
dst[3][pos] = max;
}
}
break;
@ -548,8 +538,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
dpd[pos] = FFMAX(z, dpd[pos]);
dpx[pos] = x;
dpy[pos] = y;
if (dst[3])
dst[3][pos] = max;
}
}
break;
@ -559,6 +547,17 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
envelope16(s, out);
if (dst[3]) {
for (i = 0; i < out->height; i++) {
for (j = 0; j < out->width; j++) {
int pos = i * dlinesize + j;
if (dpd[pos])
dst[3][pos] = max;
}
}
}
if (s->mode == COLOR) {
for (i = 0; i < out->height; i++) {
for (j = 0; j < out->width; j++) {
@ -630,8 +629,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p
continue;
dpd[pos] = FFMIN(dpd[pos] + intensity, 255);
if (dst[3])
dst[3][pos] = 255;
}
}
} else {
@ -651,8 +648,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p
dst[0][pos] = FFMIN(dst[0][pos] + intensity, 255);
dst[1][pos] = FFMIN(dst[1][pos] + intensity, 255);
dst[2][pos] = FFMIN(dst[2][pos] + intensity, 255);
if (dst[3])
dst[3][pos] = 255;
}
}
}
@ -676,8 +671,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p
dpd[pos] = FFABS(128 - x) + FFABS(128 - y);
dpx[pos] = x;
dpy[pos] = y;
if (dst[3])
dst[3][pos] = 255;
}
}
} else {
@ -698,8 +691,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p
dpd[pos] = FFMIN(x + y, 255);
dpx[pos] = x;
dpy[pos] = y;
if (dst[3])
dst[3][pos] = 255;
}
}
}
@ -721,8 +712,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p
dpd[pos] = FFMIN(255, dpd[pos] + intensity);
dpx[pos] = x;
dpy[pos] = y;
if (dst[3])
dst[3][pos] = 255;
}
}
break;
@ -743,8 +732,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p
dpd[pos] = FFMAX(z, dpd[pos]);
dpx[pos] = x;
dpy[pos] = y;
if (dst[3])
dst[3][pos] = 255;
}
}
break;
@ -754,6 +741,17 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p
envelope(s, out);
if (dst[3]) {
for (i = 0; i < out->height; i++) {
for (j = 0; j < out->width; j++) {
int pos = i * dlinesize + j;
if (dpd[pos])
dst[3][pos] = 255;
}
}
}
if (s->mode == COLOR) {
for (i = 0; i < out->height; i++) {
for (j = 0; j < out->width; j++) {

Write Preview
Loading…
Cancel
Save