Skip to content

F
ffmpeg
Commit 55c87214 authored by Paul B Mahol's avatar Paul B Mahol
Browse files
Options

avfilter/vf_vectorscope: process alpha at end 

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent 80974559
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 24 deletions
libavfilter/vf_vectorscope.c
View file @ 55c87214
...@@ -435,8 +435,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int ...@@ -435,8 +435,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
continue; continue;
dpd[pos] = FFMIN(dpd[pos] + intensity, max); dpd[pos] = FFMIN(dpd[pos] + intensity, max);
if (dst[3])
dst[3][pos] = max;
} }
} }
} else { } else {
...@@ -456,8 +454,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int ...@@ -456,8 +454,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
dst[0][pos] = FFMIN(dst[0][pos] + intensity, max); dst[0][pos] = FFMIN(dst[0][pos] + intensity, max);
dst[1][pos] = FFMIN(dst[1][pos] + intensity, max); dst[1][pos] = FFMIN(dst[1][pos] + intensity, max);
dst[2][pos] = FFMIN(dst[2][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 ...@@ -481,8 +477,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
dpd[pos] = FFABS(mid - x) + FFABS(mid - y); dpd[pos] = FFABS(mid - x) + FFABS(mid - y);
dpx[pos] = x; dpx[pos] = x;
dpy[pos] = y; dpy[pos] = y;
if (dst[3])
dst[3][pos] = max;
} }
} }
} else { } else {
...@@ -503,8 +497,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int ...@@ -503,8 +497,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
dpd[pos] = FFMIN(x + y, max); dpd[pos] = FFMIN(x + y, max);
dpx[pos] = x; dpx[pos] = x;
dpy[pos] = y; dpy[pos] = y;
if (dst[3])
dst[3][pos] = max;
} }
} }
} }
...@@ -526,8 +518,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int ...@@ -526,8 +518,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
dpd[pos] = FFMIN(max, dpd[pos] + intensity); dpd[pos] = FFMIN(max, dpd[pos] + intensity);
dpx[pos] = x; dpx[pos] = x;
dpy[pos] = y; dpy[pos] = y;
if (dst[3])
dst[3][pos] = max;
} }
} }
break; break;
...@@ -548,8 +538,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int ...@@ -548,8 +538,6 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
dpd[pos] = FFMAX(z, dpd[pos]); dpd[pos] = FFMAX(z, dpd[pos]);
dpx[pos] = x; dpx[pos] = x;
dpy[pos] = y; dpy[pos] = y;
if (dst[3])
dst[3][pos] = max;
} }
} }
break; break;
...@@ -559,6 +547,17 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int ...@@ -559,6 +547,17 @@ static void vectorscope16(VectorscopeContext *s, AVFrame *in, AVFrame *out, int
envelope16(s, out); 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) { if (s->mode == COLOR) {
for (i = 0; i < out->height; i++) { for (i = 0; i < out->height; i++) {
for (j = 0; j < out->width; j++) { for (j = 0; j < out->width; j++) {
...@@ -630,8 +629,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p ...@@ -630,8 +629,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p
continue; continue;
dpd[pos] = FFMIN(dpd[pos] + intensity, 255); dpd[pos] = FFMIN(dpd[pos] + intensity, 255);
if (dst[3])
dst[3][pos] = 255;
} }
} }
} else { } else {
...@@ -651,8 +648,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p ...@@ -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[0][pos] = FFMIN(dst[0][pos] + intensity, 255);
dst[1][pos] = FFMIN(dst[1][pos] + intensity, 255); dst[1][pos] = FFMIN(dst[1][pos] + intensity, 255);
dst[2][pos] = FFMIN(dst[2][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 ...@@ -676,8 +671,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p
dpd[pos] = FFABS(128 - x) + FFABS(128 - y); dpd[pos] = FFABS(128 - x) + FFABS(128 - y);
dpx[pos] = x; dpx[pos] = x;
dpy[pos] = y; dpy[pos] = y;
if (dst[3])
dst[3][pos] = 255;
} }
} }
} else { } else {
...@@ -698,8 +691,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p ...@@ -698,8 +691,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p
dpd[pos] = FFMIN(x + y, 255); dpd[pos] = FFMIN(x + y, 255);
dpx[pos] = x; dpx[pos] = x;
dpy[pos] = y; 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 ...@@ -721,8 +712,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p
dpd[pos] = FFMIN(255, dpd[pos] + intensity); dpd[pos] = FFMIN(255, dpd[pos] + intensity);
dpx[pos] = x; dpx[pos] = x;
dpy[pos] = y; dpy[pos] = y;
if (dst[3])
dst[3][pos] = 255;
} }
} }
break; break;
...@@ -743,8 +732,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p ...@@ -743,8 +732,6 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p
dpd[pos] = FFMAX(z, dpd[pos]); dpd[pos] = FFMAX(z, dpd[pos]);
dpx[pos] = x; dpx[pos] = x;
dpy[pos] = y; dpy[pos] = y;
if (dst[3])
dst[3][pos] = 255;
} }
} }
break; break;
...@@ -754,6 +741,17 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p ...@@ -754,6 +741,17 @@ static void vectorscope8(VectorscopeContext *s, AVFrame *in, AVFrame *out, int p
envelope(s, out); 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) { if (s->mode == COLOR) {
for (i = 0; i < out->height; i++) { for (i = 0; i < out->height; i++) {
for (j = 0; j < out->width; j++) { for (j = 0; j < out->width; j++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment