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
8accddeb
Commit
8accddeb
authored
Feb 27, 2014
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vf_frei0r: adjust error messages
parent
5c9c305d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
vf_frei0r.c
libavfilter/vf_frei0r.c
+12
-12
No files found.
libavfilter/vf_frei0r.c
View file @
8accddeb
...
@@ -81,7 +81,7 @@ static void *load_sym(AVFilterContext *ctx, const char *sym_name)
...
@@ -81,7 +81,7 @@ static void *load_sym(AVFilterContext *ctx, const char *sym_name)
Frei0rContext
*
s
=
ctx
->
priv
;
Frei0rContext
*
s
=
ctx
->
priv
;
void
*
sym
=
dlsym
(
s
->
dl_handle
,
sym_name
);
void
*
sym
=
dlsym
(
s
->
dl_handle
,
sym_name
);
if
(
!
sym
)
if
(
!
sym
)
av_log
(
ctx
,
AV_LOG_ERROR
,
"Could not find symbol '%s' in loaded module
\n
"
,
sym_name
);
av_log
(
ctx
,
AV_LOG_ERROR
,
"Could not find symbol '%s' in loaded module
.
\n
"
,
sym_name
);
return
sym
;
return
sym
;
}
}
...
@@ -129,7 +129,7 @@ static int set_param(AVFilterContext *ctx, f0r_param_info_t info, int index, cha
...
@@ -129,7 +129,7 @@ static int set_param(AVFilterContext *ctx, f0r_param_info_t info, int index, cha
return
0
;
return
0
;
fail:
fail:
av_log
(
ctx
,
AV_LOG_ERROR
,
"Invalid value '%s' for parameter '%s'
\n
"
,
av_log
(
ctx
,
AV_LOG_ERROR
,
"Invalid value '%s' for parameter '%s'
.
\n
"
,
param
,
info
.
name
);
param
,
info
.
name
);
return
AVERROR
(
EINVAL
);
return
AVERROR
(
EINVAL
);
}
}
...
@@ -198,11 +198,11 @@ static int set_params(AVFilterContext *ctx, const char *params)
...
@@ -198,11 +198,11 @@ static int set_params(AVFilterContext *ctx, const char *params)
default:
/* F0R_PARAM_STRING */
default:
/* F0R_PARAM_STRING */
v
=
s
;
v
=
s
;
s
->
get_param_value
(
s
->
instance
,
v
,
i
);
s
->
get_param_value
(
s
->
instance
,
v
,
i
);
av_log
(
ctx
,
AV_LOG_DEBUG
,
"'%s'
\n
"
,
s
);
av_log
(
ctx
,
AV_LOG_DEBUG
,
"'%s'"
,
s
);
break
;
break
;
}
}
#endif
#endif
av_log
(
ctx
,
AV_LOG_VERBOSE
,
"
\n
"
);
av_log
(
ctx
,
AV_LOG_VERBOSE
,
"
.
\n
"
);
}
}
return
0
;
return
0
;
...
@@ -213,7 +213,7 @@ static void *load_path(AVFilterContext *ctx, const char *prefix, const char *nam
...
@@ -213,7 +213,7 @@ static void *load_path(AVFilterContext *ctx, const char *prefix, const char *nam
char
path
[
1024
];
char
path
[
1024
];
snprintf
(
path
,
sizeof
(
path
),
"%s%s%s"
,
prefix
,
name
,
SLIBSUF
);
snprintf
(
path
,
sizeof
(
path
),
"%s%s%s"
,
prefix
,
name
,
SLIBSUF
);
av_log
(
ctx
,
AV_LOG_DEBUG
,
"Looking for frei0r effect in '%s'
\n
"
,
path
);
av_log
(
ctx
,
AV_LOG_DEBUG
,
"Looking for frei0r effect in '%s'
.
\n
"
,
path
);
return
dlopen
(
path
,
RTLD_NOW
|
RTLD_LOCAL
);
return
dlopen
(
path
,
RTLD_NOW
|
RTLD_LOCAL
);
}
}
...
@@ -249,7 +249,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
...
@@ -249,7 +249,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
if
(
!
s
->
dl_handle
)
if
(
!
s
->
dl_handle
)
s
->
dl_handle
=
load_path
(
ctx
,
"/usr/lib/frei0r-1/"
,
dl_name
);
s
->
dl_handle
=
load_path
(
ctx
,
"/usr/lib/frei0r-1/"
,
dl_name
);
if
(
!
s
->
dl_handle
)
{
if
(
!
s
->
dl_handle
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Could not find module '%s'
\n
"
,
dl_name
);
av_log
(
ctx
,
AV_LOG_ERROR
,
"Could not find module '%s'
.
\n
"
,
dl_name
);
return
AVERROR
(
EINVAL
);
return
AVERROR
(
EINVAL
);
}
}
...
@@ -265,7 +265,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
...
@@ -265,7 +265,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
return
AVERROR
(
EINVAL
);
return
AVERROR
(
EINVAL
);
if
(
f0r_init
()
<
0
)
{
if
(
f0r_init
()
<
0
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Could not init the frei0r module"
);
av_log
(
ctx
,
AV_LOG_ERROR
,
"Could not init the frei0r module
.
\n
"
);
return
AVERROR
(
EINVAL
);
return
AVERROR
(
EINVAL
);
}
}
...
@@ -273,7 +273,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
...
@@ -273,7 +273,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
pi
=
&
s
->
plugin_info
;
pi
=
&
s
->
plugin_info
;
if
(
pi
->
plugin_type
!=
type
)
{
if
(
pi
->
plugin_type
!=
type
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
av_log
(
ctx
,
AV_LOG_ERROR
,
"Invalid type '%s' for th
e
plugin
\n
"
,
"Invalid type '%s' for th
is
plugin
\n
"
,
pi
->
plugin_type
==
F0R_PLUGIN_TYPE_FILTER
?
"filter"
:
pi
->
plugin_type
==
F0R_PLUGIN_TYPE_FILTER
?
"filter"
:
pi
->
plugin_type
==
F0R_PLUGIN_TYPE_SOURCE
?
"source"
:
pi
->
plugin_type
==
F0R_PLUGIN_TYPE_SOURCE
?
"source"
:
pi
->
plugin_type
==
F0R_PLUGIN_TYPE_MIXER2
?
"mixer2"
:
pi
->
plugin_type
==
F0R_PLUGIN_TYPE_MIXER2
?
"mixer2"
:
...
@@ -320,7 +320,7 @@ static int config_input_props(AVFilterLink *inlink)
...
@@ -320,7 +320,7 @@ static int config_input_props(AVFilterLink *inlink)
if
(
s
->
destruct
&&
s
->
instance
)
if
(
s
->
destruct
&&
s
->
instance
)
s
->
destruct
(
s
->
instance
);
s
->
destruct
(
s
->
instance
);
if
(
!
(
s
->
instance
=
s
->
construct
(
inlink
->
w
,
inlink
->
h
)))
{
if
(
!
(
s
->
instance
=
s
->
construct
(
inlink
->
w
,
inlink
->
h
)))
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Impossible to load frei0r instance"
);
av_log
(
ctx
,
AV_LOG_ERROR
,
"Impossible to load frei0r instance
.
\n
"
);
return
AVERROR
(
EINVAL
);
return
AVERROR
(
EINVAL
);
}
}
...
@@ -427,13 +427,13 @@ static av_cold int source_init(AVFilterContext *ctx)
...
@@ -427,13 +427,13 @@ static av_cold int source_init(AVFilterContext *ctx)
AVRational
frame_rate_q
;
AVRational
frame_rate_q
;
if
(
av_parse_video_size
(
&
s
->
w
,
&
s
->
h
,
s
->
size
)
<
0
)
{
if
(
av_parse_video_size
(
&
s
->
w
,
&
s
->
h
,
s
->
size
)
<
0
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Invalid frame size: '%s'
\n
"
,
s
->
size
);
av_log
(
ctx
,
AV_LOG_ERROR
,
"Invalid frame size: '%s'
.
\n
"
,
s
->
size
);
return
AVERROR
(
EINVAL
);
return
AVERROR
(
EINVAL
);
}
}
if
(
av_parse_video_rate
(
&
frame_rate_q
,
s
->
framerate
)
<
0
||
if
(
av_parse_video_rate
(
&
frame_rate_q
,
s
->
framerate
)
<
0
||
frame_rate_q
.
den
<=
0
||
frame_rate_q
.
num
<=
0
)
{
frame_rate_q
.
den
<=
0
||
frame_rate_q
.
num
<=
0
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Invalid frame rate: '%s'
\n
"
,
s
->
framerate
);
av_log
(
ctx
,
AV_LOG_ERROR
,
"Invalid frame rate: '%s'
.
\n
"
,
s
->
framerate
);
return
AVERROR
(
EINVAL
);
return
AVERROR
(
EINVAL
);
}
}
s
->
time_base
.
num
=
frame_rate_q
.
den
;
s
->
time_base
.
num
=
frame_rate_q
.
den
;
...
@@ -456,7 +456,7 @@ static int source_config_props(AVFilterLink *outlink)
...
@@ -456,7 +456,7 @@ static int source_config_props(AVFilterLink *outlink)
if
(
s
->
destruct
&&
s
->
instance
)
if
(
s
->
destruct
&&
s
->
instance
)
s
->
destruct
(
s
->
instance
);
s
->
destruct
(
s
->
instance
);
if
(
!
(
s
->
instance
=
s
->
construct
(
outlink
->
w
,
outlink
->
h
)))
{
if
(
!
(
s
->
instance
=
s
->
construct
(
outlink
->
w
,
outlink
->
h
)))
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Impossible to load frei0r instance"
);
av_log
(
ctx
,
AV_LOG_ERROR
,
"Impossible to load frei0r instance
.
\n
"
);
return
AVERROR
(
EINVAL
);
return
AVERROR
(
EINVAL
);
}
}
...
...
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