Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
2e5af443
Commit
2e5af443
authored
8 years ago
by
Nicolas George
Browse files
Options
Downloads
Patches
Plain Diff
lavfi: pass min explicitly to samples_ready().
parent
e7e4c8df
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavfilter/avfilter.c
+4
-4
4 additions, 4 deletions
libavfilter/avfilter.c
with
4 additions
and
4 deletions
libavfilter/avfilter.c
+
4
−
4
View file @
2e5af443
...
...
@@ -1178,10 +1178,10 @@ error:
return
AVERROR_PATCHWELCOME
;
}
static
int
samples_ready
(
AVFilterLink
*
link
)
static
int
samples_ready
(
AVFilterLink
*
link
,
unsigned
min
)
{
return
ff_framequeue_queued_frames
(
&
link
->
fifo
)
&&
(
ff_framequeue_queued_samples
(
&
link
->
fifo
)
>=
link
->
min_samples
||
(
ff_framequeue_queued_samples
(
&
link
->
fifo
)
>=
min
||
link
->
status_in
);
}
...
...
@@ -1194,7 +1194,7 @@ static int take_samples(AVFilterLink *link, unsigned min, unsigned max,
/* Note: this function relies on no format changes and must only be
called with enough samples. */
av_assert1
(
samples_ready
(
link
));
av_assert1
(
samples_ready
(
link
,
link
->
min_samples
));
frame0
=
frame
=
ff_framequeue_peek
(
&
link
->
fifo
,
0
);
if
(
frame
->
nb_samples
>=
min
&&
frame
->
nb_samples
<
max
)
{
*
rframe
=
ff_framequeue_take
(
&
link
->
fifo
);
...
...
@@ -1321,7 +1321,7 @@ static int ff_filter_activate_default(AVFilterContext *filter)
unsigned
i
;
for
(
i
=
0
;
i
<
filter
->
nb_inputs
;
i
++
)
{
if
(
samples_ready
(
filter
->
inputs
[
i
]))
{
if
(
samples_ready
(
filter
->
inputs
[
i
]
,
filter
->
inputs
[
i
]
->
min_samples
))
{
return
ff_filter_frame_to_filter
(
filter
->
inputs
[
i
]);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment