Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
ea645e90
Commit
ea645e90
authored
Dec 26, 2012
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/buffersrc: accept unknown channel layouts.
parent
19506af7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
1 deletion
+31
-1
filters.texi
doc/filters.texi
+5
-0
buffersrc.c
libavfilter/buffersrc.c
+26
-1
No files found.
doc/filters.texi
View file @
ea645e90
...
...
@@ -1060,6 +1060,11 @@ Either a channel layout name from channel_layout_map in
@file{libavutil/channel_layout.c} or its corresponding integer representation
from the AV_CH_LAYOUT_* macros in @file{libavutil/channel_layout.h}
@item channels
The number of channels of the incoming audio buffers.
If both @var{channels} and @var{channel_layout} are specified, then they
must be consistent.
@end table
For example:
...
...
libavfilter/buffersrc.c
View file @
ea645e90
...
...
@@ -55,6 +55,7 @@ typedef struct {
int
sample_rate
;
enum
AVSampleFormat
sample_fmt
;
char
*
sample_fmt_str
;
int
channels
;
uint64_t
channel_layout
;
char
*
channel_layout_str
;
...
...
@@ -240,6 +241,7 @@ static const AVOption abuffer_options[] = {
{
"time_base"
,
NULL
,
OFFSET
(
time_base
),
AV_OPT_TYPE_RATIONAL
,
{
.
dbl
=
0
},
0
,
INT_MAX
,
FLAGS
},
{
"sample_rate"
,
NULL
,
OFFSET
(
sample_rate
),
AV_OPT_TYPE_INT
,
{
.
i64
=
0
},
0
,
INT_MAX
,
FLAGS
},
{
"sample_fmt"
,
NULL
,
OFFSET
(
sample_fmt_str
),
AV_OPT_TYPE_STRING
,
.
flags
=
FLAGS
},
{
"channels"
,
NULL
,
OFFSET
(
channels
),
AV_OPT_TYPE_INT
,
{
.
i64
=
0
},
0
,
INT_MAX
,
FLAGS
},
{
"channel_layout"
,
NULL
,
OFFSET
(
channel_layout_str
),
AV_OPT_TYPE_STRING
,
.
flags
=
FLAGS
},
{
NULL
},
};
...
...
@@ -265,6 +267,9 @@ static av_cold int init_audio(AVFilterContext *ctx, const char *args)
goto
fail
;
}
if
(
s
->
channel_layout_str
)
{
int
n
;
/* TODO reindent */
s
->
channel_layout
=
av_get_channel_layout
(
s
->
channel_layout_str
);
if
(
!
s
->
channel_layout
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Invalid channel layout '%s'
\n
"
,
...
...
@@ -272,6 +277,24 @@ static av_cold int init_audio(AVFilterContext *ctx, const char *args)
ret
=
AVERROR
(
EINVAL
);
goto
fail
;
}
n
=
av_get_channel_layout_nb_channels
(
s
->
channel_layout
);
if
(
s
->
channels
)
{
if
(
n
!=
s
->
channels
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Mismatching channel count %d and layout '%s' "
"(%d channels)
\n
"
,
s
->
channels
,
s
->
channel_layout_str
,
n
);
ret
=
AVERROR
(
EINVAL
);
goto
fail
;
}
}
s
->
channels
=
n
;
}
else
if
(
!
s
->
channels
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Neither number of channels nor "
"channel layout specified
\n
"
);
ret
=
AVERROR
(
EINVAL
);
goto
fail
;
}
if
(
!
(
s
->
fifo
=
av_fifo_alloc
(
sizeof
(
AVFilterBufferRef
*
))))
{
ret
=
AVERROR
(
ENOMEM
);
...
...
@@ -324,7 +347,9 @@ static int query_formats(AVFilterContext *ctx)
ff_add_format
(
&
samplerates
,
c
->
sample_rate
);
ff_set_common_samplerates
(
ctx
,
samplerates
);
ff_add_channel_layout
(
&
channel_layouts
,
c
->
channel_layout
);
ff_add_channel_layout
(
&
channel_layouts
,
c
->
channel_layout
?
c
->
channel_layout
:
FF_COUNT2LAYOUT
(
c
->
channels
));
ff_set_common_channel_layouts
(
ctx
,
channel_layouts
);
break
;
default:
...
...
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