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
aa97223f
Commit
aa97223f
authored
Nov 18, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/af_amix: Use avpriv_float_dsp_alloc()
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
06d27428
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
af_amix.c
libavfilter/af_amix.c
+6
-3
No files found.
libavfilter/af_amix.c
View file @
aa97223f
...
...
@@ -155,7 +155,7 @@ static int frame_list_add_frame(FrameList *frame_list, int nb_samples, int64_t p
typedef
struct
MixContext
{
const
AVClass
*
class
;
/**< class for AVOptions */
AVFloatDSPContext
fdsp
;
AVFloatDSPContext
*
fdsp
;
int
nb_inputs
;
/**< number of inputs */
int
active_inputs
;
/**< number of input currently active */
...
...
@@ -298,7 +298,7 @@ static int output_frame(AVFilterLink *outlink, int nb_samples)
plane_size
=
FFALIGN
(
plane_size
,
16
);
for
(
p
=
0
;
p
<
planes
;
p
++
)
{
s
->
fdsp
.
vector_fmac_scalar
((
float
*
)
out_buf
->
extended_data
[
p
],
s
->
fdsp
->
vector_fmac_scalar
((
float
*
)
out_buf
->
extended_data
[
p
],
(
float
*
)
in_buf
->
extended_data
[
p
],
s
->
input_scale
[
i
],
plane_size
);
}
...
...
@@ -501,7 +501,9 @@ static av_cold int init(AVFilterContext *ctx)
ff_insert_inpad
(
ctx
,
i
,
&
pad
);
}
avpriv_float_dsp_init
(
&
s
->
fdsp
,
0
);
s
->
fdsp
=
avpriv_float_dsp_alloc
(
0
);
if
(
!
s
->
fdsp
)
return
AVERROR
(
ENOMEM
);
return
0
;
}
...
...
@@ -520,6 +522,7 @@ static av_cold void uninit(AVFilterContext *ctx)
av_freep
(
&
s
->
frame_list
);
av_freep
(
&
s
->
input_state
);
av_freep
(
&
s
->
input_scale
);
av_freep
(
&
s
->
fdsp
);
for
(
i
=
0
;
i
<
ctx
->
nb_inputs
;
i
++
)
av_freep
(
&
ctx
->
input_pads
[
i
].
name
);
...
...
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