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
4982130d
Commit
4982130d
authored
Oct 02, 2015
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/af_aresample: remove looping on request_frame().
parent
1bc873ac
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
af_aresample.c
libavfilter/af_aresample.c
+1
-6
No files found.
libavfilter/af_aresample.c
View file @
4982130d
...
@@ -40,7 +40,6 @@ typedef struct {
...
@@ -40,7 +40,6 @@ typedef struct {
double
ratio
;
double
ratio
;
struct
SwrContext
*
swr
;
struct
SwrContext
*
swr
;
int64_t
next_pts
;
int64_t
next_pts
;
int
req_fullfilled
;
int
more_data
;
int
more_data
;
}
AResampleContext
;
}
AResampleContext
;
...
@@ -231,7 +230,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamplesref)
...
@@ -231,7 +230,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamplesref)
outsamplesref
->
nb_samples
=
n_out
;
outsamplesref
->
nb_samples
=
n_out
;
ret
=
ff_filter_frame
(
outlink
,
outsamplesref
);
ret
=
ff_filter_frame
(
outlink
,
outsamplesref
);
aresample
->
req_fullfilled
=
1
;
av_frame_free
(
&
insamplesref
);
av_frame_free
(
&
insamplesref
);
return
ret
;
return
ret
;
}
}
...
@@ -284,10 +282,7 @@ static int request_frame(AVFilterLink *outlink)
...
@@ -284,10 +282,7 @@ static int request_frame(AVFilterLink *outlink)
aresample
->
more_data
=
0
;
aresample
->
more_data
=
0
;
// Second request more data from the input
// Second request more data from the input
aresample
->
req_fullfilled
=
0
;
do
{
ret
=
ff_request_frame
(
ctx
->
inputs
[
0
]);
ret
=
ff_request_frame
(
ctx
->
inputs
[
0
]);
}
while
(
!
aresample
->
req_fullfilled
&&
ret
>=
0
);
// Third if we hit the end flush
// Third if we hit the end flush
if
(
ret
==
AVERROR_EOF
)
{
if
(
ret
==
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