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
c8625e5c
Commit
c8625e5c
authored
Nov 03, 2018
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/af_afade: do not use framequeue directly
parent
4b82b710
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
8 deletions
+5
-8
af_afade.c
libavfilter/af_afade.c
+5
-8
No files found.
libavfilter/af_afade.c
View file @
c8625e5c
...
...
@@ -23,9 +23,6 @@
* fade audio filter
*/
#define FF_INTERNAL_FIELDS 1
#include "framequeue.h"
#include "libavutil/audio_fifo.h"
#include "libavutil/opt.h"
#include "audio.h"
...
...
@@ -472,8 +469,8 @@ static int activate(AVFilterContext *ctx)
return
ff_filter_frame
(
outlink
,
in
);
}
if
(
ff_
framequeue_queued_samples
(
&
ctx
->
inputs
[
0
]
->
fifo
)
>
s
->
nb_samples
)
{
nb_samples
=
ff_
framequeue_queued_samples
(
&
ctx
->
inputs
[
0
]
->
fifo
)
-
s
->
nb_samples
;
if
(
ff_
inlink_queued_samples
(
ctx
->
inputs
[
0
]
)
>
s
->
nb_samples
)
{
nb_samples
=
ff_
inlink_queued_samples
(
ctx
->
inputs
[
0
]
)
-
s
->
nb_samples
;
if
(
nb_samples
>
0
)
{
ret
=
ff_inlink_consume_samples
(
ctx
->
inputs
[
0
],
nb_samples
,
nb_samples
,
&
in
);
if
(
ret
<
0
)
{
...
...
@@ -484,7 +481,7 @@ static int activate(AVFilterContext *ctx)
s
->
pts
+=
av_rescale_q
(
in
->
nb_samples
,
(
AVRational
){
1
,
outlink
->
sample_rate
},
outlink
->
time_base
);
return
ff_filter_frame
(
outlink
,
in
);
}
else
if
(
ff_
framequeue_queued_samples
(
&
ctx
->
inputs
[
1
]
->
fifo
)
>=
s
->
nb_samples
)
{
}
else
if
(
ff_
inlink_queued_samples
(
ctx
->
inputs
[
1
]
)
>=
s
->
nb_samples
)
{
if
(
s
->
overlap
)
{
out
=
ff_get_audio_buffer
(
outlink
,
s
->
nb_samples
);
if
(
!
out
)
...
...
@@ -554,10 +551,10 @@ static int activate(AVFilterContext *ctx)
return
ff_filter_frame
(
outlink
,
out
);
}
}
else
if
(
ff_outlink_frame_wanted
(
ctx
->
outputs
[
0
]))
{
if
(
!
s
->
cf0_eof
&&
ctx
->
inputs
[
0
]
->
status_in
)
{
if
(
!
s
->
cf0_eof
&&
ff_outlink_get_status
(
ctx
->
inputs
[
0
])
)
{
s
->
cf0_eof
=
1
;
}
if
(
ctx
->
inputs
[
1
]
->
status_in
)
{
if
(
ff_outlink_get_status
(
ctx
->
inputs
[
1
])
)
{
ff_outlink_set_status
(
ctx
->
outputs
[
0
],
AVERROR_EOF
,
AV_NOPTS_VALUE
);
return
0
;
}
...
...
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