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
b570f24d
Commit
b570f24d
authored
Mar 31, 2013
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/af_asetnsamples: simplify request_frame loop.
parent
9566ba91
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
af_asetnsamples.c
libavfilter/af_asetnsamples.c
+2
-8
No files found.
libavfilter/af_asetnsamples.c
View file @
b570f24d
...
...
@@ -38,7 +38,6 @@ typedef struct {
int
nb_out_samples
;
///< how many samples to output
AVAudioFifo
*
fifo
;
///< samples are queued here
int64_t
next_out_pts
;
int
req_fullfilled
;
int
pad
;
}
ASNSContext
;
...
...
@@ -86,6 +85,7 @@ static int config_props_output(AVFilterLink *outlink)
asns
->
fifo
=
av_audio_fifo_alloc
(
outlink
->
format
,
nb_channels
,
asns
->
nb_out_samples
);
if
(
!
asns
->
fifo
)
return
AVERROR
(
ENOMEM
);
outlink
->
flags
|=
FF_LINK_FLAG_REQUEST_LOOP
;
return
0
;
}
...
...
@@ -128,7 +128,6 @@ static int push_samples(AVFilterLink *outlink)
ret
=
ff_filter_frame
(
outlink
,
outsamples
);
if
(
ret
<
0
)
return
ret
;
asns
->
req_fullfilled
=
1
;
return
nb_out_samples
;
}
...
...
@@ -161,15 +160,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
static
int
request_frame
(
AVFilterLink
*
outlink
)
{
ASNSContext
*
asns
=
outlink
->
src
->
priv
;
AVFilterLink
*
inlink
=
outlink
->
src
->
inputs
[
0
];
int
ret
;
asns
->
req_fullfilled
=
0
;
do
{
ret
=
ff_request_frame
(
inlink
);
}
while
(
!
asns
->
req_fullfilled
&&
ret
>=
0
);
ret
=
ff_request_frame
(
inlink
);
if
(
ret
==
AVERROR_EOF
)
{
ret
=
push_samples
(
outlink
);
return
ret
<
0
?
ret
:
ret
>
0
?
0
:
AVERROR_EOF
;
...
...
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