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
09fd1b18
Commit
09fd1b18
authored
Nov 21, 2019
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vsrc_testsrc: simplify color filter commands parsing
parent
94c0b273
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
15 deletions
+9
-15
vsrc_testsrc.c
libavfilter/vsrc_testsrc.c
+9
-15
No files found.
libavfilter/vsrc_testsrc.c
View file @
09fd1b18
...
...
@@ -83,6 +83,7 @@ typedef struct TestSourceContext {
#define OFFSET(x) offsetof(TestSourceContext, x)
#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
#define FLAGSR AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM
#define SIZE_OPTIONS \
{ "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "320x240"}, 0, 0, FLAGS },\
...
...
@@ -181,8 +182,8 @@ static int request_frame(AVFilterLink *outlink)
#if CONFIG_COLOR_FILTER
static
const
AVOption
color_options
[]
=
{
{
"color"
,
"set color"
,
OFFSET
(
color_rgba
),
AV_OPT_TYPE_COLOR
,
{.
str
=
"black"
},
CHAR_MIN
,
CHAR_MAX
,
FLAGS
},
{
"c"
,
"set color"
,
OFFSET
(
color_rgba
),
AV_OPT_TYPE_COLOR
,
{.
str
=
"black"
},
CHAR_MIN
,
CHAR_MAX
,
FLAGS
},
{
"color"
,
"set color"
,
OFFSET
(
color_rgba
),
AV_OPT_TYPE_COLOR
,
{.
str
=
"black"
},
CHAR_MIN
,
CHAR_MAX
,
FLAGS
R
},
{
"c"
,
"set color"
,
OFFSET
(
color_rgba
),
AV_OPT_TYPE_COLOR
,
{.
str
=
"black"
},
CHAR_MIN
,
CHAR_MAX
,
FLAGS
R
},
COMMON_OPTIONS
{
NULL
}
};
...
...
@@ -236,20 +237,13 @@ static int color_process_command(AVFilterContext *ctx, const char *cmd, const ch
TestSourceContext
*
test
=
ctx
->
priv
;
int
ret
;
if
(
!
strcmp
(
cmd
,
"color"
)
||
!
strcmp
(
cmd
,
"c"
))
{
uint8_t
color_rgba
[
4
];
ret
=
av_parse_color
(
color_rgba
,
args
,
-
1
,
ctx
);
if
(
ret
<
0
)
return
ret
;
memcpy
(
test
->
color_rgba
,
color_rgba
,
sizeof
(
color_rgba
));
ff_draw_color
(
&
test
->
draw
,
&
test
->
color
,
test
->
color_rgba
);
test
->
draw_once_reset
=
1
;
return
0
;
}
ret
=
ff_filter_process_command
(
ctx
,
cmd
,
args
,
res
,
res_len
,
flags
);
if
(
ret
<
0
)
return
ret
;
return
AVERROR
(
ENOSYS
);
ff_draw_color
(
&
test
->
draw
,
&
test
->
color
,
test
->
color_rgba
);
test
->
draw_once_reset
=
1
;
return
0
;
}
static
const
AVFilterPad
color_outputs
[]
=
{
...
...
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