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
4962edf8
Commit
4962edf8
authored
Nov 06, 2011
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi: add amerge audio filter.
parent
e90a69e9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
325 additions
and
1 deletion
+325
-1
Changelog
Changelog
+1
-0
filters.texi
doc/filters.texi
+33
-0
Makefile
libavfilter/Makefile
+1
-0
af_amerge.c
libavfilter/af_amerge.c
+288
-0
allfilters.c
libavfilter/allfilters.c
+1
-0
avfilter.h
libavfilter/avfilter.h
+1
-1
No files found.
Changelog
View file @
4962edf8
...
...
@@ -13,6 +13,7 @@ version next:
- asplit audio filter
- tinterlace video filter
- astreamsync audio filter
- amerge audio filter
version 0.9:
...
...
doc/filters.texi
View file @
4962edf8
...
...
@@ -156,6 +156,39 @@ aformat=u8\\,s16:mono:packed
aformat=s16:mono\\,stereo:all
@end example
@section amerge
Merge two audio streams into a single multi-channel stream.
This filter does not need any argument.
If the channel layouts of the inputs are disjoint, and therefore compatible,
the channel layout of the output will be set accordingly and the channels
will be reordered as necessary. If the channel layouts of the inputs are not
disjoint, the output will have all the channels of the first input then all
the channels of the second input, in that order, and the channel layout of
the output will be the default value corresponding to the total number of
channels.
For example, if the first input is in 2.1 (FL+FR+LF) and the second input
is FC+BL+BR, then the output will be in 5.1, with the channels in the
following order: a1, a2, b1, a3, b2, b3 (a1 is the first channel of the
first input, b1 is the first channel of the second input).
On the other hand, if both input are in stereo, the output channels will be
in the default order: a1, a2, b1, b2, and the channel layout will be
arbitrarily set to 4.0, which may or may not be the expected value.
Both inputs must have the same sample rate, format and packing.
If inputs do not have the same duration, the output will stop with the
shortest.
Example: merge two mono files into a stereo stream:
@example
amovie=left.wav [l] ; amovie=right.mp3 [r] ; [l] [r] amerge
@end example
@section anull
Pass the audio source unchanged to the output.
...
...
libavfilter/Makefile
View file @
4962edf8
...
...
@@ -26,6 +26,7 @@ OBJS-$(CONFIG_AVCODEC) += avcodec.o
OBJS-$(CONFIG_ACONVERT_FILTER)
+=
af_aconvert.o
OBJS-$(CONFIG_AFORMAT_FILTER)
+=
af_aformat.o
OBJS-$(CONFIG_AMERGE_FILTER)
+=
af_amerge.o
OBJS-$(CONFIG_ANULL_FILTER)
+=
af_anull.o
OBJS-$(CONFIG_ARESAMPLE_FILTER)
+=
af_aresample.o
OBJS-$(CONFIG_ASHOWINFO_FILTER)
+=
af_ashowinfo.o
...
...
libavfilter/af_amerge.c
0 → 100644
View file @
4962edf8
This diff is collapsed.
Click to expand it.
libavfilter/allfilters.c
View file @
4962edf8
...
...
@@ -36,6 +36,7 @@ void avfilter_register_all(void)
REGISTER_FILTER
(
ACONVERT
,
aconvert
,
af
);
REGISTER_FILTER
(
AFORMAT
,
aformat
,
af
);
REGISTER_FILTER
(
AMERGE
,
amerge
,
af
);
REGISTER_FILTER
(
ANULL
,
anull
,
af
);
REGISTER_FILTER
(
ARESAMPLE
,
aresample
,
af
);
REGISTER_FILTER
(
ASHOWINFO
,
ashowinfo
,
af
);
...
...
libavfilter/avfilter.h
View file @
4962edf8
...
...
@@ -30,7 +30,7 @@
#include "libavcodec/avcodec.h"
#define LIBAVFILTER_VERSION_MAJOR 2
#define LIBAVFILTER_VERSION_MINOR 5
6
#define LIBAVFILTER_VERSION_MINOR 5
7
#define LIBAVFILTER_VERSION_MICRO 100
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
...
...
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