Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
8f66a2da
Commit
8f66a2da
authored
Mar 20, 2016
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vf_vectorscope: always flip output vertically
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
65efcaeb
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
28 additions
and
20 deletions
+28
-20
vf_vectorscope.c
libavfilter/vf_vectorscope.c
+10
-2
filter-vectorscope_color
tests/ref/fate/filter-vectorscope_color
+3
-3
filter-vectorscope_color2
tests/ref/fate/filter-vectorscope_color2
+3
-3
filter-vectorscope_color3
tests/ref/fate/filter-vectorscope_color3
+3
-3
filter-vectorscope_color4
tests/ref/fate/filter-vectorscope_color4
+3
-3
filter-vectorscope_gray
tests/ref/fate/filter-vectorscope_gray
+3
-3
filter-vectorscope_xy
tests/ref/fate/filter-vectorscope_xy
+3
-3
No files found.
libavfilter/vf_vectorscope.c
View file @
8f66a2da
...
@@ -911,7 +911,7 @@ static void draw_htext(AVFrame *out, int x, int y, float o1, float o2, const cha
...
@@ -911,7 +911,7 @@ static void draw_htext(AVFrame *out, int x, int y, float o1, float o2, const cha
int
v
=
color
[
plane
];
int
v
=
color
[
plane
];
uint8_t
*
p
=
out
->
data
[
plane
]
+
y
*
out
->
linesize
[
plane
]
+
(
x
+
i
*
8
);
uint8_t
*
p
=
out
->
data
[
plane
]
+
y
*
out
->
linesize
[
plane
]
+
(
x
+
i
*
8
);
for
(
char_y
=
0
;
char_y
<
font_height
;
char_y
++
)
{
for
(
char_y
=
font_height
-
1
;
char_y
>=
0
;
char_y
--
)
{
for
(
mask
=
0x80
;
mask
;
mask
>>=
1
)
{
for
(
mask
=
0x80
;
mask
;
mask
>>=
1
)
{
if
(
font
[
txt
[
i
]
*
font_height
+
char_y
]
&
mask
)
if
(
font
[
txt
[
i
]
*
font_height
+
char_y
]
&
mask
)
p
[
0
]
=
p
[
0
]
*
o2
+
v
*
o1
;
p
[
0
]
=
p
[
0
]
*
o2
+
v
*
o1
;
...
@@ -937,7 +937,7 @@ static void draw_htext16(AVFrame *out, int x, int y, float o1, float o2, const c
...
@@ -937,7 +937,7 @@ static void draw_htext16(AVFrame *out, int x, int y, float o1, float o2, const c
int
v
=
color
[
plane
];
int
v
=
color
[
plane
];
uint16_t
*
p
=
(
uint16_t
*
)(
out
->
data
[
plane
]
+
y
*
out
->
linesize
[
plane
])
+
(
x
+
i
*
8
);
uint16_t
*
p
=
(
uint16_t
*
)(
out
->
data
[
plane
]
+
y
*
out
->
linesize
[
plane
])
+
(
x
+
i
*
8
);
for
(
char_y
=
0
;
char_y
<
font_height
;
char_y
++
)
{
for
(
char_y
=
font_height
-
1
;
char_y
>=
0
;
char_y
--
)
{
for
(
mask
=
0x80
;
mask
;
mask
>>=
1
)
{
for
(
mask
=
0x80
;
mask
;
mask
>>=
1
)
{
if
(
font
[
txt
[
i
]
*
font_height
+
char_y
]
&
mask
)
if
(
font
[
txt
[
i
]
*
font_height
+
char_y
]
&
mask
)
p
[
0
]
=
p
[
0
]
*
o2
+
v
*
o1
;
p
[
0
]
=
p
[
0
]
*
o2
+
v
*
o1
;
...
@@ -1207,6 +1207,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
...
@@ -1207,6 +1207,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
VectorscopeContext
*
s
=
ctx
->
priv
;
VectorscopeContext
*
s
=
ctx
->
priv
;
AVFilterLink
*
outlink
=
ctx
->
outputs
[
0
];
AVFilterLink
*
outlink
=
ctx
->
outputs
[
0
];
AVFrame
*
out
;
AVFrame
*
out
;
int
plane
;
if
(
s
->
colorspace
)
{
if
(
s
->
colorspace
)
{
s
->
cs
=
(
s
->
depth
-
8
)
*
2
+
s
->
colorspace
-
1
;
s
->
cs
=
(
s
->
depth
-
8
)
*
2
+
s
->
colorspace
-
1
;
...
@@ -1232,6 +1233,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
...
@@ -1232,6 +1233,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
s
->
vectorscope
(
s
,
in
,
out
,
s
->
pd
);
s
->
vectorscope
(
s
,
in
,
out
,
s
->
pd
);
s
->
graticulef
(
s
,
out
,
s
->
x
,
s
->
y
,
s
->
pd
,
s
->
cs
);
s
->
graticulef
(
s
,
out
,
s
->
x
,
s
->
y
,
s
->
pd
,
s
->
cs
);
for
(
plane
=
0
;
plane
<
4
;
plane
++
)
{
if
(
out
->
data
[
plane
])
{
out
->
data
[
plane
]
+=
(
s
->
size
-
1
)
*
out
->
linesize
[
plane
];
out
->
linesize
[
plane
]
=
-
out
->
linesize
[
plane
];
}
}
av_frame_free
(
&
in
);
av_frame_free
(
&
in
);
return
ff_filter_frame
(
outlink
,
out
);
return
ff_filter_frame
(
outlink
,
out
);
}
}
...
...
tests/ref/fate/filter-vectorscope_color
View file @
8f66a2da
#tb 0: 1/25
#tb 0: 1/25
0, 0, 0, 1, 196608, 0x
1890
aa30
0, 0, 0, 1, 196608, 0x
f6e3
aa30
0, 1, 1, 1, 196608, 0x
a490
acf9
0, 1, 1, 1, 196608, 0x
5584
acf9
0, 2, 2, 1, 196608, 0x
404a
775d
0, 2, 2, 1, 196608, 0x
a862
775d
tests/ref/fate/filter-vectorscope_color2
View file @
8f66a2da
#tb 0: 1/25
#tb 0: 1/25
0, 0, 0, 1, 196608, 0x
9bfc
fae5
0, 0, 0, 1, 196608, 0x
5e62
fae5
0, 1, 1, 1, 196608, 0x
1ac6
fcbf
0, 1, 1, 1, 196608, 0x
4c27
fcbf
0, 2, 2, 1, 196608, 0x
31cb
1088
0, 2, 2, 1, 196608, 0x
b753
1088
tests/ref/fate/filter-vectorscope_color3
View file @
8f66a2da
#tb 0: 1/25
#tb 0: 1/25
0, 0, 0, 1, 196608, 0x
6e69
8770
0, 0, 0, 1, 196608, 0x
83df
8770
0, 1, 1, 1, 196608, 0x
374d
74a7
0, 1, 1, 1, 196608, 0x
a6a6
74a7
0, 2, 2, 1, 196608, 0x
3d81
7143
0, 2, 2, 1, 196608, 0x
1175
7143
tests/ref/fate/filter-vectorscope_color4
View file @
8f66a2da
#tb 0: 1/25
#tb 0: 1/25
0, 0, 0, 1, 196608, 0x
4d2e
53c4
0, 0, 0, 1, 196608, 0x
3269
53c4
0, 1, 1, 1, 196608, 0x
795
e1dcc
0, 1, 1, 1, 196608, 0x
870
e1dcc
0, 2, 2, 1, 196608, 0x
e426
8800
0, 2, 2, 1, 196608, 0x
87cb
8800
tests/ref/fate/filter-vectorscope_gray
View file @
8f66a2da
#tb 0: 1/25
#tb 0: 1/25
0, 0, 0, 1, 196608, 0x
8e41
71e2
0, 0, 0, 1, 196608, 0x
79ba
71e2
0, 1, 1, 1, 196608, 0x
f3d3
71e2
0, 1, 1, 1, 196608, 0x
9092
71e2
0, 2, 2, 1, 196608, 0x
b9cb
71e2
0, 2, 2, 1, 196608, 0x
1439
71e2
tests/ref/fate/filter-vectorscope_xy
View file @
8f66a2da
#tb 0: 1/25
#tb 0: 1/25
0, 0, 0, 1, 196608, 0xa
093
9af1
0, 0, 0, 1, 196608, 0xa
289
9af1
0, 1, 1, 1, 196608, 0x
4369
9af1
0, 1, 1, 1, 196608, 0x
2640
9af1
0, 2, 2, 1, 196608, 0x
69a1
9af1
0, 2, 2, 1, 196608, 0x
f520
9af1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment