@@ -45,6 +45,7 @@ version <next>:

 - SGI RLE 8-bit decoder

 - Silicon Graphics Motion Video Compressor 1 & 2 decoder

 - Silicon Graphics Movie demuxer

+- apad filter

 version 1.0:

@@ -409,6 +409,11 @@ stream ends. The default value is 2 seconds.

 Pass the audio source unchanged to the output.

+@section apad

+

+Pad the end of a audio stream with silence, this can be used together with

+-shortest to extend audio streams to the same length as the video stream.

+

 @section aresample

 Resample the input audio to the specified parameters. If none are specified

@@ -53,6 +53,7 @@ OBJS-$(CONFIG_AFORMAT_FILTER)                += af_aformat.o

 OBJS-$(CONFIG_AMERGE_FILTER)                 += af_amerge.o

 OBJS-$(CONFIG_AMIX_FILTER)                   += af_amix.o

 OBJS-$(CONFIG_ANULL_FILTER)                  += af_anull.o

+OBJS-$(CONFIG_APAD_FILTER)                   += af_apad.o

 OBJS-$(CONFIG_ARESAMPLE_FILTER)              += af_aresample.o

 OBJS-$(CONFIG_ASELECT_FILTER)                += f_select.o

 OBJS-$(CONFIG_ASENDCMD_FILTER)               += f_sendcmd.o

new file mode 100644

@@ -0,0 +1,116 @@

+/*

+ * Copyright (c) 2012 Michael Niedermayer

+ *

+ * 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 pad filter.

+ *

+ * Based on af_aresample.c

+ */

+

+#include "libavutil/avstring.h"

+#include "libavutil/channel_layout.h"

+#include "libavutil/opt.h"

+#include "libavutil/samplefmt.h"

+#include "libavutil/avassert.h"

+#include "avfilter.h"

+#include "audio.h"

+#include "internal.h"

+

+typedef struct {

+    int64_t next_pts;

+} APadContext;

+

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

+{

+    APadContext *apad = ctx->priv;

+

+    apad->next_pts = AV_NOPTS_VALUE;

+

+    return 0;

+}

+

+static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)

+{

+    AVFilterContext *ctx = inlink->dst;

+    APadContext *apad = ctx->priv;

+    apad->next_pts = frame->pts + av_rescale_q(frame->audio->nb_samples, (AVRational){1, inlink->sample_rate}, inlink->time_base);

+    return ff_filter_frame(ctx->outputs[0], frame);

+}

+

+static int request_frame(AVFilterLink *outlink)

+{

+    AVFilterContext *ctx = outlink->src;

+    APadContext *apad = ctx->priv;

+    int ret;

+

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

+

+    if (ret == AVERROR_EOF) {

+        int n_out = 4096;

+        AVFilterBufferRef *outsamplesref = ff_get_audio_buffer(outlink, AV_PERM_WRITE, n_out);

+        if (!outsamplesref)

+            return AVERROR(ENOMEM);

+

+        av_assert0(outsamplesref->audio->sample_rate == outlink->sample_rate);

+        av_assert0(outsamplesref->audio->nb_samples  == n_out);

+

+        av_samples_set_silence(outsamplesref->extended_data, 0,

+                               n_out,

+                               outsamplesref->audio->channels,

+                               outsamplesref->format);

+

+        outsamplesref->pts = apad->next_pts;

+        if (apad->next_pts != AV_NOPTS_VALUE)

+            apad->next_pts += av_rescale_q(n_out, (AVRational){1, outlink->sample_rate}, outlink->time_base);

+

+        return ff_filter_frame(outlink, outsamplesref);

+    }

+    return ret;

+}

+

+static const AVFilterPad apad_inputs[] = {

+    {

+        .name         = "default",

+        .type         = AVMEDIA_TYPE_AUDIO,

+        .filter_frame = filter_frame,

+        .min_perms    = AV_PERM_READ,

+    },

+    { NULL },

+};

+

+static const AVFilterPad apad_outputs[] = {

+    {

+        .name          = "default",

+        .request_frame = request_frame,

+        .type          = AVMEDIA_TYPE_AUDIO,

+    },

+    { NULL },

+};

+

+AVFilter avfilter_af_apad = {

+    .name          = "apad",

+    .description   = NULL_IF_CONFIG_SMALL("Pad audio with silence."),

+    .init          = init,

+    .priv_size     = sizeof(APadContext),

+    .inputs        = apad_inputs,

+    .outputs       = apad_outputs,

+};

@@ -45,6 +45,7 @@ void avfilter_register_all(void)

     REGISTER_FILTER (AMERGE,      amerge,      af);

     REGISTER_FILTER (AMIX,        amix,        af);

     REGISTER_FILTER (ANULL,       anull,       af);

+    REGISTER_FILTER (APAD,        apad,        af);

     REGISTER_FILTER (ARESAMPLE,   aresample,   af);

     REGISTER_FILTER (ASELECT,     aselect,     af);

     REGISTER_FILTER (ASENDCMD,    asendcmd,    af);

@@ -29,8 +29,8 @@

 #include "libavutil/avutil.h"

 #define LIBAVFILTER_VERSION_MAJOR  3

-#define LIBAVFILTER_VERSION_MINOR  27

-#define LIBAVFILTER_VERSION_MICRO 102

+#define LIBAVFILTER_VERSION_MINOR  28

+#define LIBAVFILTER_VERSION_MICRO 100

 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \

                                                LIBAVFILTER_VERSION_MINOR, \