From 2a0fc55995b7a3fea828b2e245c369d76c5a0b62 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 18 Sep 2015 20:22:05 +0000 Subject: [PATCH] avfilter: add rubberband wrapper Signed-off-by: Paul B Mahol --- Changelog | 1 + LICENSE.md | 1 + configure | 5 + libavfilter/Makefile | 1 + libavfilter/af_rubberband.c | 236 ++++++++++++++++++++++++++++++++++++ libavfilter/allfilters.c | 1 + libavfilter/version.h | 2 +- 7 files changed, 246 insertions(+), 1 deletion(-) create mode 100644 libavfilter/af_rubberband.c diff --git a/Changelog b/Changelog index 62d3a7a53c..c2fd10f6f8 100644 --- a/Changelog +++ b/Changelog @@ -8,6 +8,7 @@ version : - alimiter filter - stereowiden filter - stereotools filter +- rubberband filter version 2.8: diff --git a/LICENSE.md b/LICENSE.md index 1a6e3b36db..4c4a84534a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -85,6 +85,7 @@ compatible libraries The following libraries are under GPL: - frei0r - libcdio +- librubberband - libutvideo - libvidstab - libx264 diff --git a/configure b/configure index 839c85db43..d2a25bb7a1 100755 --- a/configure +++ b/configure @@ -236,6 +236,7 @@ External library support: --enable-libopenjpeg enable JPEG 2000 de/encoding via OpenJPEG [no] --enable-libopus enable Opus de/encoding via libopus [no] --enable-libpulse enable Pulseaudio input via libpulse [no] + --enable-librubberband enable rubberband needed for rubberband filter [no] --enable-libquvi enable quvi input via libquvi [no] --enable-librtmp enable RTMP[E] support via librtmp [no] --enable-libschroedinger enable Dirac de/encoding via libschroedinger [no] @@ -1405,6 +1406,7 @@ EXTERNAL_LIBRARY_LIST=" libpulse libquvi librtmp + librubberband libschroedinger libshine libsmbclient @@ -2789,6 +2791,7 @@ pullup_filter_deps="gpl" removelogo_filter_deps="avcodec avformat swscale" repeatfields_filter_deps="gpl" resample_filter_deps="avresample" +rubberband_filter_deps="librubberband" sab_filter_deps="gpl swscale" scale_filter_deps="swscale" scale2ref_filter_deps="swscale" @@ -4661,6 +4664,7 @@ die_license_disabled_gpl() { die_license_disabled gpl frei0r die_license_disabled gpl libcdio +die_license_disabled gpl librubberband die_license_disabled gpl libsmbclient die_license_disabled gpl libutvideo die_license_disabled gpl libvidstab @@ -5271,6 +5275,7 @@ enabled libopus && require_pkg_config opus opus_multistream.h opus_mul enabled libpulse && require_pkg_config libpulse pulse/pulseaudio.h pa_context_new enabled libquvi && require_pkg_config libquvi quvi/quvi.h quvi_init enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket +enabled librubberband && require_pkg_config rubberband rubberband/rubberband-c.h rubberband_new enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init enabled libshine && require_pkg_config shine shine/layer3.h shine_encode_buffer enabled libsmbclient && { use_pkg_config smbclient libsmbclient.h smbc_init || diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 05effd6f3f..4bbe972950 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -77,6 +77,7 @@ OBJS-$(CONFIG_LOWPASS_FILTER) += af_biquads.o OBJS-$(CONFIG_PAN_FILTER) += af_pan.o OBJS-$(CONFIG_REPLAYGAIN_FILTER) += af_replaygain.o OBJS-$(CONFIG_RESAMPLE_FILTER) += af_resample.o +OBJS-$(CONFIG_RUBBERBAND_FILTER) += af_rubberband.o OBJS-$(CONFIG_SIDECHAINCOMPRESS_FILTER) += af_sidechaincompress.o OBJS-$(CONFIG_SILENCEDETECT_FILTER) += af_silencedetect.o OBJS-$(CONFIG_SILENCEREMOVE_FILTER) += af_silenceremove.o diff --git a/libavfilter/af_rubberband.c b/libavfilter/af_rubberband.c new file mode 100644 index 0000000000..60e8d3c642 --- /dev/null +++ b/libavfilter/af_rubberband.c @@ -0,0 +1,236 @@ +/* + * 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 + */ + +#include + +#include "libavutil/channel_layout.h" +#include "libavutil/common.h" +#include "libavutil/opt.h" + +#include "audio.h" +#include "avfilter.h" +#include "formats.h" +#include "internal.h" + +typedef struct RubberBandContext { + const AVClass *class; + RubberBandState rbs; + + double tempo, pitch; + int transients, detector, phase, window, + smoothing, formant, opitch, channels; + int64_t nb_samples_out; + int64_t nb_samples_in; + int flushed; +} RubberBandContext; + +#define OFFSET(x) offsetof(RubberBandContext, x) +#define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM + +static const AVOption rubberband_options[] = { + { "tempo", "set tempo scale factor", OFFSET(tempo), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.01, 100, A }, + { "pitch", "set pitch scale factor", OFFSET(pitch), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.01, 100, A }, + { "transients", "set transients", OFFSET(transients), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, A, "transients" }, + { "crisp", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionTransientsCrisp}, 0, 0, A, "transients" }, + { "mixed", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionTransientsMixed}, 0, 0, A, "transients" }, + { "smooth", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionTransientsSmooth}, 0, 0, A, "transients" }, + { "detector", "set detector", OFFSET(detector), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, A, "detector" }, + { "compound", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionDetectorCompound}, 0, 0, A, "detector" }, + { "percussive", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionDetectorPercussive}, 0, 0, A, "detector" }, + { "soft", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionDetectorSoft}, 0, 0, A, "detector" }, + { "phase", "set phase", OFFSET(phase), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, A, "phase" }, + { "laminar", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionPhaseLaminar}, 0, 0, A, "phase" }, + { "independent", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionPhaseIndependent}, 0, 0, A, "phase" }, + { "window", "set window", OFFSET(window), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, A, "window" }, + { "standard", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionWindowStandard}, 0, 0, A, "window" }, + { "short", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionWindowShort}, 0, 0, A, "window" }, + { "long", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionWindowLong}, 0, 0, A, "window" }, + { "smoothing", "set smoothing", OFFSET(smoothing), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, A, "smoothing" }, + { "off", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionSmoothingOff}, 0, 0, A, "smoothing" }, + { "on", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionSmoothingOn}, 0, 0, A, "smoothing" }, + { "formant", "set formant", OFFSET(formant), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, A, "formant" }, + { "shifted", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionFormantShifted}, 0, 0, A, "formant" }, + { "preserved", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionFormantPreserved}, 0, 0, A, "formant" }, + { "pitch", "set pitch", OFFSET(opitch), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, A, "pitch" }, + { "quality", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionPitchHighQuality}, 0, 0, A, "pitch" }, + { "speed", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionPitchHighSpeed}, 0, 0, A, "pitch" }, + { "consistency", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionPitchHighConsistency}, 0, 0, A, "pitch" }, + { "channels", "set channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, A, "channels" }, + { "apart", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionChannelsApart}, 0, 0, A, "channels" }, + { "together", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionChannelsTogether}, 0, 0, A, "channels" }, + { NULL }, +}; + +AVFILTER_DEFINE_CLASS(rubberband); + +static av_cold void uninit(AVFilterContext *ctx) +{ + RubberBandContext *s = ctx->priv; + + if (s->rbs) + rubberband_delete(s->rbs); +} + +static int query_formats(AVFilterContext *ctx) +{ + AVFilterFormats *formats = NULL; + AVFilterChannelLayouts *layouts = NULL; + static const enum AVSampleFormat sample_fmts[] = { + AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_NONE, + }; + int ret; + + layouts = ff_all_channel_counts(); + if (!layouts) + return AVERROR(ENOMEM); + ret = ff_set_common_channel_layouts(ctx, layouts); + if (ret < 0) + return ret; + + formats = ff_make_format_list(sample_fmts); + if (!formats) + return AVERROR(ENOMEM); + ret = ff_set_common_formats(ctx, formats); + if (ret < 0) + return ret; + + formats = ff_all_samplerates(); + if (!formats) + return AVERROR(ENOMEM); + return ff_set_common_samplerates(ctx, formats); +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + RubberBandContext *s = inlink->dst->priv; + AVFilterLink *outlink = inlink->dst->outputs[0]; + AVFrame *out; + int ret = 0, nb_samples; + + rubberband_process(s->rbs, (const float *const *)in->data, in->nb_samples, 0); + s->nb_samples_in += in->nb_samples; + + nb_samples = rubberband_available(s->rbs); + if (nb_samples > 0) { + out = ff_get_audio_buffer(inlink, nb_samples); + if (!out) { + av_frame_free(&in); + return AVERROR(ENOMEM); + } + out->pts = av_rescale_q(s->nb_samples_out, + (AVRational){ 1, outlink->sample_rate }, + outlink->time_base); + nb_samples = rubberband_retrieve(s->rbs, (float *const *)out->data, nb_samples); + out->nb_samples = nb_samples; + ret = ff_filter_frame(outlink, out); + s->nb_samples_out += nb_samples; + } + + av_frame_free(&in); + return ret; +} + +static int config_input(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + RubberBandContext *s = ctx->priv; + int opts = s->transients|s->detector|s->phase|s->window| + s->smoothing|s->formant|s->opitch|s->channels| + RubberBandOptionProcessRealTime; + + if (s->rbs) + rubberband_delete(s->rbs); + s->rbs = rubberband_new(inlink->sample_rate, inlink->channels, opts, 1. / s->tempo, s->pitch); + + inlink->partial_buf_size = + inlink->min_samples = + inlink->max_samples = rubberband_get_samples_required(s->rbs); + + return 0; +} + +static int request_frame(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + RubberBandContext *s = ctx->priv; + AVFilterLink *inlink = ctx->inputs[0]; + int ret = 0; + + ret = ff_request_frame(ctx->inputs[0]); + + if (ret == AVERROR_EOF && !s->flushed) { + AVFrame *out = ff_get_audio_buffer(inlink, 1); + int nb_samples; + + if (!out) + return AVERROR(ENOMEM); + + rubberband_process(s->rbs, (const float *const *)out->data, 1, 1); + av_frame_free(&out); + s->flushed = 1; + nb_samples = rubberband_available(s->rbs); + + if (nb_samples > 0) { + out = ff_get_audio_buffer(inlink, nb_samples); + if (!out) + return AVERROR(ENOMEM); + out->pts = av_rescale_q(s->nb_samples_out, + (AVRational){ 1, outlink->sample_rate }, + outlink->time_base); + nb_samples = rubberband_retrieve(s->rbs, (float *const *)out->data, nb_samples); + out->nb_samples = nb_samples; + ret = ff_filter_frame(outlink, out); + s->nb_samples_out += nb_samples; + } + av_log(ctx, AV_LOG_DEBUG, "nb_samples_in %"PRId64" nb_samples_out %"PRId64"\n", + s->nb_samples_in, s->nb_samples_out); + } + + return ret; +} + +static const AVFilterPad rubberband_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .config_props = config_input, + .filter_frame = filter_frame, + }, + { NULL } +}; + +static const AVFilterPad rubberband_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .request_frame = request_frame, + }, + { NULL } +}; + +AVFilter ff_af_rubberband = { + .name = "rubberband", + .description = NULL_IF_CONFIG_SMALL("Apply time-stretching and pitch-shifting."), + .query_formats = query_formats, + .priv_size = sizeof(RubberBandContext), + .priv_class = &rubberband_class, + .uninit = uninit, + .inputs = rubberband_inputs, + .outputs = rubberband_outputs, +}; diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index cab4564bd5..3b3a49f2d9 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -99,6 +99,7 @@ void avfilter_register_all(void) REGISTER_FILTER(PAN, pan, af); REGISTER_FILTER(REPLAYGAIN, replaygain, af); REGISTER_FILTER(RESAMPLE, resample, af); + REGISTER_FILTER(RUBBERBAND, rubberband, af); REGISTER_FILTER(SIDECHAINCOMPRESS, sidechaincompress, af); REGISTER_FILTER(SILENCEDETECT, silencedetect, af); REGISTER_FILTER(SILENCEREMOVE, silenceremove, af); diff --git a/libavfilter/version.h b/libavfilter/version.h index e918184f6a..9d44fd0a10 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 6 -#define LIBAVFILTER_VERSION_MINOR 5 +#define LIBAVFILTER_VERSION_MINOR 6 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \