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
e1f49712
Commit
e1f49712
authored
8 years ago
by
Matthieu Bouron
Committed by
Matthieu Bouron
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
lavfi: use an audio frame pool for each link of the filtergraph
parent
b1ed7957
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/audio.c
+36
-14
36 additions, 14 deletions
libavfilter/audio.c
with
36 additions
and
14 deletions
libavfilter/audio.c
+
36
−
14
View file @
e1f49712
...
@@ -27,6 +27,9 @@
...
@@ -27,6 +27,9 @@
#include
"avfilter.h"
#include
"avfilter.h"
#include
"internal.h"
#include
"internal.h"
#define BUFFER_ALIGN 0
AVFrame
*
ff_null_get_audio_buffer
(
AVFilterLink
*
link
,
int
nb_samples
)
AVFrame
*
ff_null_get_audio_buffer
(
AVFilterLink
*
link
,
int
nb_samples
)
{
{
return
ff_get_audio_buffer
(
link
->
dst
->
outputs
[
0
],
nb_samples
);
return
ff_get_audio_buffer
(
link
->
dst
->
outputs
[
0
],
nb_samples
);
...
@@ -34,29 +37,48 @@ AVFrame *ff_null_get_audio_buffer(AVFilterLink *link, int nb_samples)
...
@@ -34,29 +37,48 @@ AVFrame *ff_null_get_audio_buffer(AVFilterLink *link, int nb_samples)
AVFrame
*
ff_default_get_audio_buffer
(
AVFilterLink
*
link
,
int
nb_samples
)
AVFrame
*
ff_default_get_audio_buffer
(
AVFilterLink
*
link
,
int
nb_samples
)
{
{
AVFrame
*
frame
=
av_frame_alloc
()
;
AVFrame
*
frame
=
NULL
;
int
channels
=
link
->
channels
;
int
channels
=
link
->
channels
;
int
ret
;
av_assert0
(
channels
==
av_get_channel_layout_nb_channels
(
link
->
channel_layout
)
||
!
av_get_channel_layout_nb_channels
(
link
->
channel_layout
));
av_assert0
(
channels
==
av_get_channel_layout_nb_channels
(
link
->
channel_layout
)
||
!
av_get_channel_layout_nb_channels
(
link
->
channel_layout
));
if
(
!
link
->
frame_pool
)
{
link
->
frame_pool
=
ff_frame_pool_audio_init
(
av_buffer_allocz
,
channels
,
nb_samples
,
link
->
format
,
BUFFER_ALIGN
);
if
(
!
link
->
frame_pool
)
return
NULL
;
}
else
{
int
pool_channels
=
0
;
int
pool_nb_samples
=
0
;
int
pool_align
=
0
;
enum
AVSampleFormat
pool_format
=
AV_SAMPLE_FMT_NONE
;
if
(
ff_frame_pool_get_audio_config
(
link
->
frame_pool
,
&
pool_channels
,
&
pool_nb_samples
,
&
pool_format
,
&
pool_align
)
<
0
)
{
return
NULL
;
}
if
(
pool_channels
!=
channels
||
pool_nb_samples
<
nb_samples
||
pool_format
!=
link
->
format
||
pool_align
!=
BUFFER_ALIGN
)
{
ff_frame_pool_uninit
((
FFFramePool
**
)
&
link
->
frame_pool
);
link
->
frame_pool
=
ff_frame_pool_audio_init
(
av_buffer_allocz
,
channels
,
nb_samples
,
link
->
format
,
BUFFER_ALIGN
);
if
(
!
link
->
frame_pool
)
return
NULL
;
}
}
frame
=
ff_frame_pool_get
(
link
->
frame_pool
);
if
(
!
frame
)
if
(
!
frame
)
return
NULL
;
return
NULL
;
frame
->
nb_samples
=
nb_samples
;
frame
->
nb_samples
=
nb_samples
;
frame
->
format
=
link
->
format
;
av_frame_set_channels
(
frame
,
link
->
channels
);
frame
->
channel_layout
=
link
->
channel_layout
;
frame
->
channel_layout
=
link
->
channel_layout
;
frame
->
sample_rate
=
link
->
sample_rate
;
frame
->
sample_rate
=
link
->
sample_rate
;
ret
=
av_frame_get_buffer
(
frame
,
0
);
if
(
ret
<
0
)
{
av_frame_free
(
&
frame
);
return
NULL
;
}
av_samples_set_silence
(
frame
->
extended_data
,
0
,
nb_samples
,
channels
,
link
->
format
);
av_samples_set_silence
(
frame
->
extended_data
,
0
,
nb_samples
,
channels
,
link
->
format
);
return
frame
;
return
frame
;
}
}
...
...
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