@@ -12,6 +12,8 @@ version next:

 - RTMPT protocol support

 - iLBC encoding/decoding via libilbc

 - Microsoft Screen 1 decoder

+- join audio filter

+- audio channel mapping filter

 - showwaves filter

 - LucasArts SMUSH playback support

@@ -4,7 +4,7 @@ since the last major version increase.

 The last version increases were:

 libavcodec:    2012-01-27

 libavdevice:   2011-04-18

-libavfilter:   2011-04-18

+libavfilter:   2012-06-22

 libavformat:   2012-01-27

 libavresample: 2012-04-24

 libpostproc:   2011-04-18

@@ -649,6 +649,76 @@ front_center.wav -map '[LFE]' lfe.wav -map '[SL]' side_left.wav -map '[SR]'

 side_right.wav

 @end example

+@section channelmap

+Remap input channels to new locations.

+

+This filter accepts the following named parameters:

+@table @option

+@item channel_layout

+Channel layout of the output stream.

+

+@item map

+Map channels from input to output. The argument is a comma-separated list of

+mappings, each in the @code{@var{in_channel}-@var{out_channel}} or

+@var{in_channel} form. @var{in_channel} can be either the name of the input

+channel (e.g. FL for front left) or its index in the input channel layout.

+@var{out_channel} is the name of the output channel or its index in the output

+channel layout. If @var{out_channel} is not given then it is implicitly an

+index, starting with zero and increasing by one for each mapping.

+@end table

+

+If no mapping is present, the filter will implicitly map input channels to

+output channels preserving index.

+

+For example, assuming a 5.1+downmix input MOV file

+@example

+ffmpeg -i in.mov -filter 'channelmap=map=DL-FL\,DR-FR' out.wav

+@end example

+will create an output WAV file tagged as stereo from the downmix channels of

+the input.

+

+To fix a 5.1 WAV improperly encoded in AAC's native channel order

+@example

+ffmpeg -i in.wav -filter 'channelmap=1\,2\,0\,5\,3\,4:channel_layout=5.1' out.wav

+@end example

+

+@section join

+Join multiple input streams into one multi-channel stream.

+

+The filter accepts the following named parameters:

+@table @option

+

+@item inputs

+Number of input streams. Defaults to 2.

+

+@item channel_layout

+Desired output channel layout. Defaults to stereo.

+

+@item map

+Map channels from inputs to output. The argument is a comma-separated list of

+mappings, each in the @code{@var{input_idx}.@var{in_channel}-@var{out_channel}}

+form. @var{input_idx} is the 0-based index of the input stream. @var{in_channel}

+can be either the name of the input channel (e.g. FR for front left) or its

+index in the specified input stream. @var{out_channel} is the name of the output

+channel.

+@end table

+

+The filter will attempt to guess the mappings when those are not specified

+explicitly. It does so by first trying to find an unused matching input channel

+and if that fails it picks the first unused input channel.

+

+E.g. to join 3 inputs (with properly set channel layouts)

+@example

+ffmpeg -i INPUT1 -i INPUT2 -i INPUT3 -filter_complex join=inputs=3 OUTPUT

+@end example

+

+To build a 5.1 output from 6 single-channel streams:

+@example

+ffmpeg -i fl -i fr -i fc -i sl -i sr -i lfe -filter_complex

+'join=inputs=6:channel_layout=5.1:map=0.0-FL\,1.0-FR\,2.0-FC\,3.0-SL\,4.0-SR\,5.0-LFE'

+out

+@end example

+

 @section resample

 Convert the audio sample format, sample rate and channel layout. This filter is

 not meant to be used directly.

@@ -29,6 +29,12 @@

 #include "libavcodec/cavsdsp.h"

 #include "dsputil_mmx.h"

+/* in/out: mma=mma+mmb, mmb=mmb-mma */

+#define SUMSUB_BA( a, b ) \

+    "paddw "#b", "#a" \n\t"\

+    "paddw "#b", "#b" \n\t"\

+    "psubw "#a", "#b" \n\t"

+

 /*****************************************************************************

  *

  * inverse transform

@@ -631,6 +631,34 @@ static void add_hfyu_median_prediction_cmov(uint8_t *dst, const uint8_t *top,

 }

 #endif

+static inline void transpose4x4(uint8_t *dst, uint8_t *src, x86_reg dst_stride, x86_reg src_stride){

+    __asm__ volatile( //FIXME could save 1 instruction if done as 8x4 ...

+        "movd  (%1), %%mm0              \n\t"

+        "add   %3, %1                   \n\t"

+        "movd  (%1), %%mm1              \n\t"

+        "movd  (%1,%3,1), %%mm2         \n\t"

+        "movd  (%1,%3,2), %%mm3         \n\t"

+        "punpcklbw %%mm1, %%mm0         \n\t"

+        "punpcklbw %%mm3, %%mm2         \n\t"

+        "movq %%mm0, %%mm1              \n\t"

+        "punpcklwd %%mm2, %%mm0         \n\t"

+        "punpckhwd %%mm2, %%mm1         \n\t"

+        "movd  %%mm0, (%0)              \n\t"

+        "add   %2, %0                   \n\t"

+        "punpckhdq %%mm0, %%mm0         \n\t"

+        "movd  %%mm0, (%0)              \n\t"

+        "movd  %%mm1, (%0,%2,1)         \n\t"

+        "punpckhdq %%mm1, %%mm1         \n\t"

+        "movd  %%mm1, (%0,%2,2)         \n\t"

+

+        :  "+&r" (dst),

+           "+&r" (src)

+        :  "r" (dst_stride),

+           "r" (src_stride)

+        :  "memory"

+    );

+}

+

 #define H263_LOOP_FILTER                        \

     "pxor      %%mm7, %%mm7             \n\t"   \

     "movq         %0, %%mm0             \n\t"   \

@@ -2902,7 +2930,8 @@ static void dsputil_init_3dnow(DSPContext *c, AVCodecContext *avctx,

     c->vorbis_inverse_coupling = vorbis_inverse_coupling_3dnow;

 #if HAVE_7REGS

-    c->add_hfyu_median_prediction = add_hfyu_median_prediction_cmov;

+    if (mm_flags & AV_CPU_FLAG_CMOV)

+        c->add_hfyu_median_prediction = add_hfyu_median_prediction_cmov;

 #endif

 }

@@ -66,24 +66,6 @@ extern const xmm_reg  ff_pb_FE;

 extern const double ff_pd_1[2];

 extern const double ff_pd_2[2];

-#define LOAD4(stride,in,a,b,c,d)\

-    "movq 0*"#stride"+"#in", "#a"\n\t"\

-    "movq 1*"#stride"+"#in", "#b"\n\t"\

-    "movq 2*"#stride"+"#in", "#c"\n\t"\

-    "movq 3*"#stride"+"#in", "#d"\n\t"

-

-#define STORE4(stride,out,a,b,c,d)\

-    "movq "#a", 0*"#stride"+"#out"\n\t"\

-    "movq "#b", 1*"#stride"+"#out"\n\t"\

-    "movq "#c", 2*"#stride"+"#out"\n\t"\

-    "movq "#d", 3*"#stride"+"#out"\n\t"

-

-/* in/out: mma=mma+mmb, mmb=mmb-mma */

-#define SUMSUB_BA( a, b ) \

-    "paddw "#b", "#a" \n\t"\

-    "paddw "#b", "#b" \n\t"\

-    "psubw "#a", "#b" \n\t"

-

 #define SBUTTERFLY(a,b,t,n,m)\

     "mov" #m " " #a ", " #t "         \n\t" /* abcd */\

     "punpckl" #n " " #b ", " #a "     \n\t" /* aebf */\

@@ -95,90 +77,6 @@ extern const double ff_pd_2[2];

     SBUTTERFLY(a,c,d,dq,q) /* a=aeim d=bfjn */\

     SBUTTERFLY(t,b,c,dq,q) /* t=cgko c=dhlp */

-static inline void transpose4x4(uint8_t *dst, uint8_t *src, x86_reg dst_stride, x86_reg src_stride){

-    __asm__ volatile( //FIXME could save 1 instruction if done as 8x4 ...

-        "movd  (%1), %%mm0              \n\t"

-        "add   %3, %1                   \n\t"

-        "movd  (%1), %%mm1              \n\t"

-        "movd  (%1,%3,1), %%mm2         \n\t"

-        "movd  (%1,%3,2), %%mm3         \n\t"

-        "punpcklbw %%mm1, %%mm0         \n\t"

-        "punpcklbw %%mm3, %%mm2         \n\t"

-        "movq %%mm0, %%mm1              \n\t"

-        "punpcklwd %%mm2, %%mm0         \n\t"

-        "punpckhwd %%mm2, %%mm1         \n\t"

-        "movd  %%mm0, (%0)              \n\t"

-        "add   %2, %0                   \n\t"

-        "punpckhdq %%mm0, %%mm0         \n\t"

-        "movd  %%mm0, (%0)              \n\t"

-        "movd  %%mm1, (%0,%2,1)         \n\t"

-        "punpckhdq %%mm1, %%mm1         \n\t"

-        "movd  %%mm1, (%0,%2,2)         \n\t"

-

-        :  "+&r" (dst),

-           "+&r" (src)

-        :  "r" (dst_stride),

-           "r" (src_stride)

-        :  "memory"

-    );

-}

-

-// e,f,g,h can be memory

-// out: a,d,t,c

-#define TRANSPOSE8x4(a,b,c,d,e,f,g,h,t)\

-    "punpcklbw " #e ", " #a " \n\t" /* a0 e0 a1 e1 a2 e2 a3 e3 */\

-    "punpcklbw " #f ", " #b " \n\t" /* b0 f0 b1 f1 b2 f2 b3 f3 */\

-    "punpcklbw " #g ", " #c " \n\t" /* c0 g0 c1 g1 c2 g2 d3 g3 */\

-    "punpcklbw " #h ", " #d " \n\t" /* d0 h0 d1 h1 d2 h2 d3 h3 */\

-    SBUTTERFLY(a, b, t, bw, q)   /* a= a0 b0 e0 f0 a1 b1 e1 f1 */\

-                                 /* t= a2 b2 e2 f2 a3 b3 e3 f3 */\

-    SBUTTERFLY(c, d, b, bw, q)   /* c= c0 d0 g0 h0 c1 d1 g1 h1 */\

-                                 /* b= c2 d2 g2 h2 c3 d3 g3 h3 */\

-    SBUTTERFLY(a, c, d, wd, q)   /* a= a0 b0 c0 d0 e0 f0 g0 h0 */\

-                                 /* d= a1 b1 c1 d1 e1 f1 g1 h1 */\

-    SBUTTERFLY(t, b, c, wd, q)   /* t= a2 b2 c2 d2 e2 f2 g2 h2 */\

-                                 /* c= a3 b3 c3 d3 e3 f3 g3 h3 */

-

-#if ARCH_X86_64

-// permutes 01234567 -> 05736421

-#define TRANSPOSE8(a,b,c,d,e,f,g,h,t)\

-    SBUTTERFLY(a,b,%%xmm8,wd,dqa)\

-    SBUTTERFLY(c,d,b,wd,dqa)\

-    SBUTTERFLY(e,f,d,wd,dqa)\

-    SBUTTERFLY(g,h,f,wd,dqa)\

-    SBUTTERFLY(a,c,h,dq,dqa)\

-    SBUTTERFLY(%%xmm8,b,c,dq,dqa)\

-    SBUTTERFLY(e,g,b,dq,dqa)\

-    SBUTTERFLY(d,f,g,dq,dqa)\

-    SBUTTERFLY(a,e,f,qdq,dqa)\

-    SBUTTERFLY(%%xmm8,d,e,qdq,dqa)\

-    SBUTTERFLY(h,b,d,qdq,dqa)\

-    SBUTTERFLY(c,g,b,qdq,dqa)\

-    "movdqa %%xmm8, "#g"              \n\t"

-#else

-#define TRANSPOSE8(a,b,c,d,e,f,g,h,t)\

-    "movdqa "#h", "#t"                \n\t"\

-    SBUTTERFLY(a,b,h,wd,dqa)\

-    "movdqa "#h", 16"#t"              \n\t"\

-    "movdqa "#t", "#h"                \n\t"\

-    SBUTTERFLY(c,d,b,wd,dqa)\

-    SBUTTERFLY(e,f,d,wd,dqa)\

-    SBUTTERFLY(g,h,f,wd,dqa)\

-    SBUTTERFLY(a,c,h,dq,dqa)\

-    "movdqa "#h", "#t"                \n\t"\

-    "movdqa 16"#t", "#h"              \n\t"\

-    SBUTTERFLY(h,b,c,dq,dqa)\

-    SBUTTERFLY(e,g,b,dq,dqa)\

-    SBUTTERFLY(d,f,g,dq,dqa)\

-    SBUTTERFLY(a,e,f,qdq,dqa)\

-    SBUTTERFLY(h,d,e,qdq,dqa)\

-    "movdqa "#h", 16"#t"              \n\t"\

-    "movdqa "#t", "#h"                \n\t"\

-    SBUTTERFLY(h,b,d,qdq,dqa)\

-    SBUTTERFLY(c,g,b,qdq,dqa)\

-    "movdqa 16"#t", "#g"              \n\t"

-#endif

-

 #define MOVQ_WONE(regd) \

     __asm__ volatile ( \

     "pcmpeqd %%" #regd ", %%" #regd " \n\t" \

@@ -362,7 +362,7 @@ void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, const int chrom

             c->h264_idct_add8       = ff_h264_idct_add8_8_mmx;

         c->h264_idct_add16intra     = ff_h264_idct_add16intra_8_mmx;

         if (mm_flags & AV_CPU_FLAG_CMOV)

-            c->h264_luma_dc_dequant_idct= ff_h264_luma_dc_dequant_idct_mmx;

+            c->h264_luma_dc_dequant_idct = ff_h264_luma_dc_dequant_idct_mmx;

         if (mm_flags & AV_CPU_FLAG_MMX2) {

             c->h264_idct_dc_add    = ff_h264_idct_dc_add_8_mmx2;

@@ -59,8 +59,10 @@ OBJS-$(CONFIG_ASPLIT_FILTER)                 += split.o

 OBJS-$(CONFIG_ASTREAMSYNC_FILTER)            += af_astreamsync.o

 OBJS-$(CONFIG_ASYNCTS_FILTER)                += af_asyncts.o

 OBJS-$(CONFIG_ATEMPO_FILTER)                 += af_atempo.o

+OBJS-$(CONFIG_CHANNELMAP_FILTER)             += af_channelmap.o

 OBJS-$(CONFIG_CHANNELSPLIT_FILTER)           += af_channelsplit.o

 OBJS-$(CONFIG_EARWAX_FILTER)                 += af_earwax.o

+OBJS-$(CONFIG_JOIN_FILTER)                   += af_join.o

 OBJS-$(CONFIG_PAN_FILTER)                    += af_pan.o

 OBJS-$(CONFIG_RESAMPLE_FILTER)               += af_resample.o

 OBJS-$(CONFIG_SILENCEDETECT_FILTER)          += af_silencedetect.o

@@ -75,14 +75,14 @@ static int query_formats(AVFilterContext *ctx)

     AVFilterLink *outlink = ctx->outputs[0];

     AVFilterChannelLayouts *layouts;

-    ff_formats_ref(avfilter_make_all_formats(AVMEDIA_TYPE_AUDIO),

+    ff_formats_ref(ff_all_formats(AVMEDIA_TYPE_AUDIO),

                          &inlink->out_formats);

     if (aconvert->out_sample_fmt != AV_SAMPLE_FMT_NONE) {

         formats = NULL;

         ff_add_format(&formats, aconvert->out_sample_fmt);

         ff_formats_ref(formats, &outlink->in_formats);

     } else

-        ff_formats_ref(avfilter_make_all_formats(AVMEDIA_TYPE_AUDIO),

+        ff_formats_ref(ff_all_formats(AVMEDIA_TYPE_AUDIO),

                              &outlink->in_formats);

     ff_channel_layouts_ref(ff_all_channel_layouts(),

@@ -134,8 +134,7 @@ AVFilter avfilter_af_aformat = {

     .priv_size     = sizeof(AFormatContext),

     .inputs        = (AVFilterPad[]) {{ .name            = "default",

-                                        .type            = AVMEDIA_TYPE_AUDIO,

-                                        .filter_samples  = ff_null_filter_samples },

+                                        .type            = AVMEDIA_TYPE_AUDIO, },

                                       { .name = NULL}},

     .outputs       = (AVFilterPad[]) {{ .name            = "default",

                                         .type            = AVMEDIA_TYPE_AUDIO},

@@ -169,7 +169,7 @@ static int request_frame(AVFilterLink *outlink)

     for (i = 0; i < am->nb_inputs; i++)

         if (!am->in[i].nb_samples)

-            if ((ret = avfilter_request_frame(ctx->inputs[i])) < 0)

+            if ((ret = ff_request_frame(ctx->inputs[i])) < 0)

                 return ret;

     return 0;

 }

@@ -34,8 +34,7 @@ AVFilter avfilter_af_anull = {

     .inputs    = (const AVFilterPad[]) {{ .name       = "default",

                                     .type             = AVMEDIA_TYPE_AUDIO,

-                                    .get_audio_buffer = ff_null_get_audio_buffer,

-                                    .filter_samples   = ff_null_filter_samples },

+                                    .get_audio_buffer = ff_null_get_audio_buffer, },

                                   { .name = NULL}},

     .outputs   = (const AVFilterPad[]) {{ .name       = "default",

@@ -112,7 +112,7 @@ static int query_formats(AVFilterContext *ctx)

     if(out_format != AV_SAMPLE_FMT_NONE) {

         out_formats = ff_make_format_list((int[]){ out_format, -1 });

     } else

-        out_formats = avfilter_make_all_formats(AVMEDIA_TYPE_AUDIO);

+        out_formats = ff_all_formats(AVMEDIA_TYPE_AUDIO);

     ff_formats_ref(out_formats, &outlink->in_formats);

     if(out_layout) {

@@ -211,7 +211,7 @@ static int request_frame(AVFilterLink *outlink)

     aresample->req_fullfilled = 0;

     do{

-        ret = avfilter_request_frame(ctx->inputs[0]);

+        ret = ff_request_frame(ctx->inputs[0]);

     }while(!aresample->req_fullfilled && ret>=0);

     if (ret == AVERROR_EOF) {

@@ -164,7 +164,7 @@ static int request_frame(AVFilterLink *outlink)

     asns->req_fullfilled = 0;

     do {

-        ret = avfilter_request_frame(inlink);

+        ret = ff_request_frame(inlink);

     } while (!asns->req_fullfilled && ret >= 0);

     if (ret == AVERROR_EOF)

@@ -157,7 +157,7 @@ static int request_frame(AVFilterLink *outlink)

             send_next(ctx);

         } else {

             as->eof |= 1 << as->next_out;

-            avfilter_request_frame(ctx->inputs[as->next_out]);

+            ff_request_frame(ctx->inputs[as->next_out]);

             if (as->eof & (1 << as->next_out))

                 as->next_out = !as->next_out;

         }

@@ -1083,7 +1083,7 @@ static int request_frame(AVFilterLink *outlink)

     atempo->request_fulfilled = 0;

     do {

-        ret = avfilter_request_frame(ctx->inputs[0]);

+        ret = ff_request_frame(ctx->inputs[0]);

     }

     while (!atempo->request_fulfilled && ret >= 0);

new file mode 100644

@@ -0,0 +1,402 @@

+/*

+ * Copyright (c) 2012 Google, Inc.

+ *

+ * This file is part of FFmpeg.

+ *

+ * FFmpeg is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

+ *

+ * FFmpeg is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with FFmpeg; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+ */

+

+/**

+ * @file

+ * audio channel mapping filter

+ */

+

+#include <ctype.h>

+

+#include "libavutil/audioconvert.h"

+#include "libavutil/avstring.h"

+#include "libavutil/mathematics.h"

+#include "libavutil/opt.h"

+#include "libavutil/samplefmt.h"

+

+#include "audio.h"

+#include "avfilter.h"

+#include "formats.h"

+#include "internal.h"

+

+struct ChannelMap {

+    uint64_t in_channel;

+    uint64_t out_channel;

+    int in_channel_idx;

+    int out_channel_idx;

+};

+

+enum MappingMode {

+    MAP_NONE,

+    MAP_ONE_INT,

+    MAP_ONE_STR,

+    MAP_PAIR_INT_INT,

+    MAP_PAIR_INT_STR,

+    MAP_PAIR_STR_INT,

+    MAP_PAIR_STR_STR

+};

+

+#define MAX_CH 64

+typedef struct ChannelMapContext {

+    const AVClass *class;

+    AVFilterChannelLayouts *channel_layouts;

+    char *mapping_str;

+    char *channel_layout_str;

+    uint64_t output_layout;

+    struct ChannelMap map[MAX_CH];

+    int nch;

+    enum MappingMode mode;

+} ChannelMapContext;

+

+#define OFFSET(x) offsetof(ChannelMapContext, x)

+#define A AV_OPT_FLAG_AUDIO_PARAM

+static const AVOption options[] = {

+    { "map", "A comma-separated list of input channel numbers in output order.",

+          OFFSET(mapping_str),        AV_OPT_TYPE_STRING, .flags = A },

+    { "channel_layout", "Output channel layout.",

+          OFFSET(channel_layout_str), AV_OPT_TYPE_STRING, .flags = A },

+    { NULL },

+};

+

+static const AVClass channelmap_class = {

+    .class_name = "channel map filter",

+    .item_name  = av_default_item_name,

+    .option     = options,

+    .version    = LIBAVUTIL_VERSION_INT,

+};

+

+static char* split(char *message, char delim) {

+    char *next = strchr(message, delim);

+    if (next)

+      *next++ = '\0';

+    return next;

+}

+

+static int get_channel_idx(char **map, int *ch, char delim, int max_ch)

+{

+    char *next = split(*map, delim);

+    int len;

+    int n = 0;

+    if (!next && delim == '-')

+        return AVERROR(EINVAL);

+    len = strlen(*map);

+    sscanf(*map, "%d%n", ch, &n);

+    if (n != len)

+        return AVERROR(EINVAL);

+    if (*ch < 0 || *ch > max_ch)

+        return AVERROR(EINVAL);

+    *map = next;

+    return 0;

+}

+

+static int get_channel(char **map, uint64_t *ch, char delim)

+{

+    char *next = split(*map, delim);

+    if (!next && delim == '-')

+        return AVERROR(EINVAL);

+    *ch = av_get_channel_layout(*map);

+    if (av_get_channel_layout_nb_channels(*ch) != 1)

+        return AVERROR(EINVAL);

+    *map = next;

+    return 0;

+}

+

+static av_cold int channelmap_init(AVFilterContext *ctx, const char *args,

+                                   void *opaque)

+{

+    ChannelMapContext *s = ctx->priv;

+    int ret;

+    char *mapping;

+    enum mode;

+    int map_entries = 0;

+    char buf[256];

+    enum MappingMode mode;

+    uint64_t out_ch_mask = 0;

+    int i;

+

+    if (!args) {

+        av_log(ctx, AV_LOG_ERROR, "No parameters supplied.\n");

+        return AVERROR(EINVAL);

+    }

+

+    s->class = &channelmap_class;

+    av_opt_set_defaults(s);

+

+    if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {

+        av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);

+        return ret;

+    }

+

+    mapping = s->mapping_str;

+

+    if (!mapping) {

+        mode = MAP_NONE;

+    } else {

+        char *dash = strchr(mapping, '-');

+        if (!dash) {  // short mapping

+            if (isdigit(*mapping))

+                mode = MAP_ONE_INT;

+            else

+                mode = MAP_ONE_STR;

+        } else if (isdigit(*mapping)) {

+            if (isdigit(*(dash+1)))

+                mode = MAP_PAIR_INT_INT;

+            else

+                mode = MAP_PAIR_INT_STR;

+        } else {

+            if (isdigit(*(dash+1)))

+                mode = MAP_PAIR_STR_INT;

+            else

+                mode = MAP_PAIR_STR_STR;

+        }

+    }

+

+    if (mode != MAP_NONE) {

+        char *comma = mapping;

+        map_entries = 1;

+        while ((comma = strchr(comma, ','))) {

+            if (*++comma)  // Allow trailing comma

+                map_entries++;

+        }

+    }

+

+    if (map_entries > MAX_CH) {

+        av_log(ctx, AV_LOG_ERROR, "Too many channels mapped: '%d'.\n", map_entries);

+        ret = AVERROR(EINVAL);

+        goto fail;

+    }

+

+    for (i = 0; i < map_entries; i++) {

+        int in_ch_idx = -1, out_ch_idx = -1;

+        uint64_t in_ch = 0, out_ch = 0;

+        static const char err[] = "Failed to parse channel map\n";

+        switch (mode) {

+        case MAP_ONE_INT:

+            if (get_channel_idx(&mapping, &in_ch_idx, ',', MAX_CH) < 0) {

+                ret = AVERROR(EINVAL);

+                av_log(ctx, AV_LOG_ERROR, err);

+                goto fail;

+            }

+            s->map[i].in_channel_idx  = in_ch_idx;

+            s->map[i].out_channel_idx = i;

+            break;

+        case MAP_ONE_STR:

+            if (!get_channel(&mapping, &in_ch, ',')) {

+                av_log(ctx, AV_LOG_ERROR, err);

+                ret = AVERROR(EINVAL);

+                goto fail;

+            }

+            s->map[i].in_channel      = in_ch;

+            s->map[i].out_channel_idx = i;

+            break;

+        case MAP_PAIR_INT_INT:

+            if (get_channel_idx(&mapping, &in_ch_idx, '-', MAX_CH) < 0 ||

+                get_channel_idx(&mapping, &out_ch_idx, ',', MAX_CH) < 0) {

+                av_log(ctx, AV_LOG_ERROR, err);

+                ret = AVERROR(EINVAL);

+                goto fail;

+            }

+            s->map[i].in_channel_idx  = in_ch_idx;

+            s->map[i].out_channel_idx = out_ch_idx;

+            break;

+        case MAP_PAIR_INT_STR:

+            if (get_channel_idx(&mapping, &in_ch_idx, '-', MAX_CH) < 0 ||

+                get_channel(&mapping, &out_ch, ',') < 0 ||

+                out_ch & out_ch_mask) {

+                av_log(ctx, AV_LOG_ERROR, err);

+                ret = AVERROR(EINVAL);

+                goto fail;

+            }

+            s->map[i].in_channel_idx  = in_ch_idx;

+            s->map[i].out_channel     = out_ch;

+            out_ch_mask |= out_ch;

+            break;

+        case MAP_PAIR_STR_INT:

+            if (get_channel(&mapping, &in_ch, '-') < 0 ||

+                get_channel_idx(&mapping, &out_ch_idx, ',', MAX_CH) < 0) {

+                av_log(ctx, AV_LOG_ERROR, err);

+                ret = AVERROR(EINVAL);

+                goto fail;

+            }

+            s->map[i].in_channel      = in_ch;

+            s->map[i].out_channel_idx = out_ch_idx;

+            break;

+        case MAP_PAIR_STR_STR:

+            if (get_channel(&mapping, &in_ch, '-') < 0 ||

+                get_channel(&mapping, &out_ch, ',') < 0 ||

+                out_ch & out_ch_mask) {

+                av_log(ctx, AV_LOG_ERROR, err);

+                ret = AVERROR(EINVAL);

+                goto fail;

+            }

+            s->map[i].in_channel = in_ch;

+            s->map[i].out_channel = out_ch;

+            out_ch_mask |= out_ch;

+            break;

+        }

+    }

+    s->mode          = mode;

+    s->nch           = map_entries;

+    s->output_layout = out_ch_mask ? out_ch_mask :

+                       av_get_default_channel_layout(map_entries);

+

+    if (s->channel_layout_str) {

+        uint64_t fmt;

+        if ((fmt = av_get_channel_layout(s->channel_layout_str)) == 0) {

+            av_log(ctx, AV_LOG_ERROR, "Error parsing channel layout: '%s'.\n",

+                   s->channel_layout_str);

+            ret = AVERROR(EINVAL);

+            goto fail;

+        }

+        if (mode == MAP_NONE) {

+            int i;

+            s->nch = av_get_channel_layout_nb_channels(fmt);

+            for (i = 0; i < s->nch; i++) {

+                s->map[i].in_channel_idx  = i;

+                s->map[i].out_channel_idx = i;

+            }

+        } else if (out_ch_mask && out_ch_mask != fmt) {

+            av_get_channel_layout_string(buf, sizeof(buf), 0, out_ch_mask);

+            av_log(ctx, AV_LOG_ERROR,

+                   "Output channel layout '%s' does not match the list of channel mapped: '%s'.\n",

+                   s->channel_layout_str, buf);

+            ret = AVERROR(EINVAL);

+            goto fail;

+        } else if (s->nch != av_get_channel_layout_nb_channels(fmt)) {

+            av_log(ctx, AV_LOG_ERROR,

+                   "Output channel layout %s does not match the number of channels mapped %d.\n",

+                   s->channel_layout_str, s->nch);

+            ret = AVERROR(EINVAL);

+            goto fail;

+        }

+        s->output_layout = fmt;

+    }

+    ff_add_channel_layout(&s->channel_layouts, s->output_layout);

+

+    if (mode == MAP_PAIR_INT_STR || mode == MAP_PAIR_STR_STR) {

+        for (i = 0; i < s->nch; i++) {

+            s->map[i].out_channel_idx = av_get_channel_layout_channel_index(

+                s->output_layout, s->map[i].out_channel);

+        }

+    }

+

+fail:

+    av_opt_free(s);

+    return ret;

+}

+

+static int channelmap_query_formats(AVFilterContext *ctx)

+{

+    ChannelMapContext *s = ctx->priv;

+

+    ff_set_common_formats(ctx, ff_planar_sample_fmts());

+    ff_set_common_samplerates(ctx, ff_all_samplerates());

+    ff_channel_layouts_ref(ff_all_channel_layouts(), &ctx->inputs[0]->out_channel_layouts);

+    ff_channel_layouts_ref(s->channel_layouts,       &ctx->outputs[0]->in_channel_layouts);

+

+    return 0;

+}

+

+static void channelmap_filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf)

+{

+    AVFilterContext  *ctx = inlink->dst;

+    AVFilterLink *outlink = ctx->outputs[0];

+    const ChannelMapContext *s = ctx->priv;

+    const int nch_in = av_get_channel_layout_nb_channels(inlink->channel_layout);

+    const int nch_out = s->nch;

+    int ch;

+    uint8_t *source_planes[MAX_CH];

+

+    memcpy(source_planes, buf->extended_data,

+           nch_in * sizeof(source_planes[0]));

+

+    if (nch_out > nch_in) {

+        if (nch_out > FF_ARRAY_ELEMS(buf->data)) {

+            uint8_t **new_extended_data =

+                av_mallocz(nch_out * sizeof(*buf->extended_data));

+            if (!new_extended_data)

+                return;

+            if (buf->extended_data == buf->data) {

+                buf->extended_data = new_extended_data;

+            } else {

+                buf->extended_data = new_extended_data;

+                av_free(buf->extended_data);

+            }

+        } else if (buf->extended_data != buf->data) {

+            av_free(buf->extended_data);

+            buf->extended_data = buf->data;

+        }

+    }

+

+    for (ch = 0; ch < nch_out; ch++) {

+        buf->extended_data[s->map[ch].out_channel_idx] =

+            source_planes[s->map[ch].in_channel_idx];

+    }

+

+    if (buf->data != buf->extended_data)

+        memcpy(buf->data, buf->extended_data,

+           FFMIN(FF_ARRAY_ELEMS(buf->data), nch_out) * sizeof(buf->data[0]));

+

+    ff_filter_samples(outlink, buf);

+}

+

+static int channelmap_config_input(AVFilterLink *inlink)

+{

+    AVFilterContext *ctx = inlink->dst;

+    ChannelMapContext *s = ctx->priv;

+    int i, err = 0;

+    const char *channel_name;

+    char layout_name[256];

+

+    if (s->mode == MAP_PAIR_STR_INT || s->mode == MAP_PAIR_STR_STR) {

+        for (i = 0; i < s->nch; i++) {

+            s->map[i].in_channel_idx = av_get_channel_layout_channel_index(

+                inlink->channel_layout, s->map[i].in_channel);

+            if (s->map[i].in_channel_idx < 0) {

+                channel_name = av_get_channel_name(s->map[i].in_channel);

+                av_get_channel_layout_string(layout_name, sizeof(layout_name),

+                                             0, inlink->channel_layout);

+                av_log(ctx, AV_LOG_ERROR,

+                       "input channel '%s' not available from input layout '%s'\n",

+                       channel_name, layout_name);

+                err = AVERROR(EINVAL);

+            }

+        }

+    }

+

+    return err;

+}

+

+AVFilter avfilter_af_channelmap = {

+    .name          = "channelmap",

+    .description   = NULL_IF_CONFIG_SMALL("Remap audio channels."),

+    .init          = channelmap_init,

+    .query_formats = channelmap_query_formats,

+    .priv_size     = sizeof(ChannelMapContext),

+

+    .inputs        = (AVFilterPad[]) {{ .name            = "default",

+                                        .type            = AVMEDIA_TYPE_AUDIO,

+                                        .filter_samples  = channelmap_filter_samples,

+                                        .config_props    = channelmap_config_input },

+                                      { .name = NULL }},

+    .outputs       = (AVFilterPad[]) {{ .name            = "default",

+                                        .type            = AVMEDIA_TYPE_AUDIO },

+                                      { .name = NULL }},

+};

new file mode 100644

@@ -0,0 +1,500 @@

+/*

+ *

+ * This file is part of Libav.

+ *

+ * Libav is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

+ *

+ * Libav is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with Libav; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+ */

+

+/**

+ * @file

+ * Audio join filter

+ *

+ * Join multiple audio inputs as different channels in

+ * a single output

+ */

+

+#include "libavutil/audioconvert.h"

+#include "libavutil/avassert.h"

+#include "libavutil/opt.h"

+

+#include "audio.h"

+#include "avfilter.h"

+#include "formats.h"

+#include "internal.h"

+

+typedef struct ChannelMap {

+    int input;                ///< input stream index

+    int       in_channel_idx; ///< index of in_channel in the input stream data

+    uint64_t  in_channel;     ///< layout describing the input channel

+    uint64_t out_channel;     ///< layout describing the output channel

+} ChannelMap;

+

+typedef struct JoinContext {

+    const AVClass *class;

+

+    int inputs;

+    char *map;

+    char    *channel_layout_str;

+    uint64_t channel_layout;

+

+    int      nb_channels;

+    ChannelMap *channels;

+

+    /**

+     * Temporary storage for input frames, until we get one on each input.

+     */

+    AVFilterBufferRef **input_frames;