Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Apr 2014 16:11:57 +0000 (18:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Apr 2014 16:25:15 +0000 (18:25 +0200)
* qatar/master:
  vf_settb: rename to settb

Conflicts:
libavfilter/Makefile
libavfilter/f_settb.c
libavfilter/settb.c
libavfilter/vf_settb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/Makefile
libavfilter/settb.c

@@@ -43,48 -21,17 +43,48 @@@ OBJS = allfilters.
         drawutils.o                                                      \
         fifo.o                                                           \
         formats.o                                                        \
 +       graphdump.o                                                      \
         graphparser.o                                                    \
 +       opencl_allkernels.o                                              \
 +       transform.o                                                      \
         video.o                                                          \
  
 +
 +OBJS-$(CONFIG_AVCODEC)                       += avcodec.o
 +
 +OBJS-$(CONFIG_ACONVERT_FILTER)               += af_aconvert.o
 +OBJS-$(CONFIG_ADELAY_FILTER)                 += af_adelay.o
 +OBJS-$(CONFIG_AECHO_FILTER)                  += af_aecho.o
 +OBJS-$(CONFIG_AEVAL_FILTER)                  += aeval.o
 +OBJS-$(CONFIG_AFADE_FILTER)                  += af_afade.o
  OBJS-$(CONFIG_AFORMAT_FILTER)                += af_aformat.o
 +OBJS-$(CONFIG_AINTERLEAVE_FILTER)            += f_interleave.o
 +OBJS-$(CONFIG_ALLPASS_FILTER)                += af_biquads.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_APERMS_FILTER)                 += f_perms.o
 +OBJS-$(CONFIG_APHASER_FILTER)                += af_aphaser.o
 +OBJS-$(CONFIG_ARESAMPLE_FILTER)              += af_aresample.o
 +OBJS-$(CONFIG_ASELECT_FILTER)                += f_select.o
 +OBJS-$(CONFIG_ASENDCMD_FILTER)               += f_sendcmd.o
 +OBJS-$(CONFIG_ASETNSAMPLES_FILTER)           += af_asetnsamples.o
  OBJS-$(CONFIG_ASETPTS_FILTER)                += setpts.o
- OBJS-$(CONFIG_ASETTB_FILTER)                 += f_settb.o
 +OBJS-$(CONFIG_ASETRATE_FILTER)               += af_asetrate.o
++OBJS-$(CONFIG_ASETTB_FILTER)                 += settb.o
  OBJS-$(CONFIG_ASHOWINFO_FILTER)              += af_ashowinfo.o
  OBJS-$(CONFIG_ASPLIT_FILTER)                 += split.o
 +OBJS-$(CONFIG_ASTATS_FILTER)                 += af_astats.o
 +OBJS-$(CONFIG_ASTREAMSYNC_FILTER)            += af_astreamsync.o
  OBJS-$(CONFIG_ASYNCTS_FILTER)                += af_asyncts.o
 +OBJS-$(CONFIG_ATEMPO_FILTER)                 += af_atempo.o
  OBJS-$(CONFIG_ATRIM_FILTER)                  += trim.o
 +OBJS-$(CONFIG_AZMQ_FILTER)                   += f_zmq.o
 +OBJS-$(CONFIG_BANDPASS_FILTER)               += af_biquads.o
 +OBJS-$(CONFIG_BANDREJECT_FILTER)             += af_biquads.o
 +OBJS-$(CONFIG_BASS_FILTER)                   += af_biquads.o
 +OBJS-$(CONFIG_BIQUAD_FILTER)                 += af_biquads.o
  OBJS-$(CONFIG_CHANNELMAP_FILTER)             += af_channelmap.o
  OBJS-$(CONFIG_CHANNELSPLIT_FILTER)           += af_channelsplit.o
  OBJS-$(CONFIG_COMPAND_FILTER)                += af_compand.o
@@@ -162,51 -64,22 +162,51 @@@ OBJS-$(CONFIG_LUT3D_FILTER
  OBJS-$(CONFIG_LUT_FILTER)                    += vf_lut.o
  OBJS-$(CONFIG_LUTRGB_FILTER)                 += vf_lut.o
  OBJS-$(CONFIG_LUTYUV_FILTER)                 += vf_lut.o
 +OBJS-$(CONFIG_MCDEINT_FILTER)                += vf_mcdeint.o
 +OBJS-$(CONFIG_MERGEPLANES_FILTER)            += vf_mergeplanes.o framesync.o
 +OBJS-$(CONFIG_MP_FILTER)                     += vf_mp.o
 +OBJS-$(CONFIG_MPDECIMATE_FILTER)             += vf_mpdecimate.o
  OBJS-$(CONFIG_NEGATE_FILTER)                 += vf_lut.o
  OBJS-$(CONFIG_NOFORMAT_FILTER)               += vf_format.o
 +OBJS-$(CONFIG_NOISE_FILTER)                  += vf_noise.o
  OBJS-$(CONFIG_NULL_FILTER)                   += vf_null.o
  OBJS-$(CONFIG_OCV_FILTER)                    += vf_libopencv.o
 -OBJS-$(CONFIG_OVERLAY_FILTER)                += vf_overlay.o
 +OBJS-$(CONFIG_OPENCL)                        += deshake_opencl.o unsharp_opencl.o
 +OBJS-$(CONFIG_OVERLAY_FILTER)                += vf_overlay.o dualinput.o framesync.o
 +OBJS-$(CONFIG_OWDENOISE_FILTER)              += vf_owdenoise.o
  OBJS-$(CONFIG_PAD_FILTER)                    += vf_pad.o
 +OBJS-$(CONFIG_PERMS_FILTER)                  += f_perms.o
 +OBJS-$(CONFIG_PERSPECTIVE_FILTER)            += vf_perspective.o
 +OBJS-$(CONFIG_PHASE_FILTER)                  += vf_phase.o
  OBJS-$(CONFIG_PIXDESCTEST_FILTER)            += vf_pixdesctest.o
 +OBJS-$(CONFIG_PP_FILTER)                     += vf_pp.o
 +OBJS-$(CONFIG_PSNR_FILTER)                   += vf_psnr.o dualinput.o framesync.o
 +OBJS-$(CONFIG_PULLUP_FILTER)                 += vf_pullup.o
 +OBJS-$(CONFIG_REMOVELOGO_FILTER)             += bbox.o lswsutils.o lavfutils.o vf_removelogo.o
 +OBJS-$(CONFIG_ROTATE_FILTER)                 += vf_rotate.o
 +OBJS-$(CONFIG_SEPARATEFIELDS_FILTER)         += vf_separatefields.o
 +OBJS-$(CONFIG_SAB_FILTER)                    += vf_sab.o
  OBJS-$(CONFIG_SCALE_FILTER)                  += vf_scale.o
 -OBJS-$(CONFIG_SELECT_FILTER)                 += vf_select.o
 +OBJS-$(CONFIG_SELECT_FILTER)                 += f_select.o
 +OBJS-$(CONFIG_SENDCMD_FILTER)                += f_sendcmd.o
  OBJS-$(CONFIG_SETDAR_FILTER)                 += vf_aspect.o
 +OBJS-$(CONFIG_SETFIELD_FILTER)               += vf_setfield.o
  OBJS-$(CONFIG_SETPTS_FILTER)                 += setpts.o
  OBJS-$(CONFIG_SETSAR_FILTER)                 += vf_aspect.o
- OBJS-$(CONFIG_SETTB_FILTER)                  += f_settb.o
+ OBJS-$(CONFIG_SETTB_FILTER)                  += settb.o
  OBJS-$(CONFIG_SHOWINFO_FILTER)               += vf_showinfo.o
  OBJS-$(CONFIG_SHUFFLEPLANES_FILTER)          += vf_shuffleplanes.o
 +OBJS-$(CONFIG_SMARTBLUR_FILTER)              += vf_smartblur.o
  OBJS-$(CONFIG_SPLIT_FILTER)                  += split.o
 +OBJS-$(CONFIG_SPP_FILTER)                    += vf_spp.o
 +OBJS-$(CONFIG_STEREO3D_FILTER)               += vf_stereo3d.o
 +OBJS-$(CONFIG_SUBTITLES_FILTER)              += vf_subtitles.o
 +OBJS-$(CONFIG_SUPER2XSAI_FILTER)             += vf_super2xsai.o
 +OBJS-$(CONFIG_SWAPUV_FILTER)                 += vf_swapuv.o
 +OBJS-$(CONFIG_TELECINE_FILTER)               += vf_telecine.o
 +OBJS-$(CONFIG_THUMBNAIL_FILTER)              += vf_thumbnail.o
 +OBJS-$(CONFIG_TILE_FILTER)                   += vf_tile.o
 +OBJS-$(CONFIG_TINTERLACE_FILTER)             += vf_tinterlace.o
  OBJS-$(CONFIG_TRANSPOSE_FILTER)              += vf_transpose.o
  OBJS-$(CONFIG_TRIM_FILTER)                   += trim.o
  OBJS-$(CONFIG_UNSHARP_FILTER)                += vf_unsharp.o
index 0000000,87b60a7..d511c14
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,161 +1,187 @@@
 - * This file is part of Libav.
+ /*
+  * Copyright (c) 2010 Stefano Sabatini
+  *
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * 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
 -    "E",
 -    "PHI",
 -    "PI",
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ /**
+  * @file
+  * Set timebase for the output link.
+  */
+ #include <inttypes.h>
+ #include <stdio.h>
+ #include "libavutil/avstring.h"
+ #include "libavutil/eval.h"
+ #include "libavutil/internal.h"
+ #include "libavutil/mathematics.h"
+ #include "libavutil/opt.h"
+ #include "libavutil/rational.h"
+ #include "avfilter.h"
+ #include "internal.h"
++#include "audio.h"
+ #include "video.h"
+ static const char *const var_names[] = {
 -    VAR_E,
 -    VAR_PHI,
 -    VAR_PI,
+     "AVTB",   /* default timebase 1/AV_TIME_BASE */
+     "intb",   /* input timebase */
++    "sr",     /* sample rate */
+     NULL
+ };
+ enum var_name {
 -    settb->var_values[VAR_E]    = M_E;
 -    settb->var_values[VAR_PHI]  = M_PHI;
 -    settb->var_values[VAR_PI]   = M_PI;
+     VAR_AVTB,
+     VAR_INTB,
++    VAR_SR,
+     VAR_VARS_NB
+ };
+ typedef struct {
+     const AVClass *class;
+     char *tb_expr;
+     double var_values[VAR_VARS_NB];
+ } SetTBContext;
++#define OFFSET(x) offsetof(SetTBContext, x)
++#define DEFINE_OPTIONS(filt_name, filt_type)                                               \
++static const AVOption filt_name##_options[] = {                                            \
++    { "expr", "set expression determining the output timebase", OFFSET(tb_expr), AV_OPT_TYPE_STRING, {.str="intb"}, \
++           .flags=AV_OPT_FLAG_##filt_type##_PARAM|AV_OPT_FLAG_FILTERING_PARAM },           \
++    { "tb",   "set expression determining the output timebase", OFFSET(tb_expr), AV_OPT_TYPE_STRING, {.str="intb"}, \
++           .flags=AV_OPT_FLAG_##filt_type##_PARAM|AV_OPT_FLAG_FILTERING_PARAM },           \
++    { NULL }                                                                               \
++}
++
+ static int config_output_props(AVFilterLink *outlink)
+ {
+     AVFilterContext *ctx = outlink->src;
+     SetTBContext *settb = ctx->priv;
+     AVFilterLink *inlink = ctx->inputs[0];
+     AVRational time_base;
+     int ret;
+     double res;
 -#define OFFSET(x) offsetof(SetTBContext, x)
 -#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
 -static const AVOption options[] = {
 -    { "expr", "Expression determining the output timebase", OFFSET(tb_expr), AV_OPT_TYPE_STRING, { .str = "intb" }, .flags = FLAGS },
 -    { NULL },
 -};
+     settb->var_values[VAR_AVTB] = av_q2d(AV_TIME_BASE_Q);
+     settb->var_values[VAR_INTB] = av_q2d(inlink->time_base);
++    settb->var_values[VAR_SR]   = inlink->sample_rate;
+     outlink->w = inlink->w;
+     outlink->h = inlink->h;
+     if ((ret = av_expr_parse_and_eval(&res, settb->tb_expr, var_names, settb->var_values,
+                                       NULL, NULL, NULL, NULL, NULL, 0, NULL)) < 0) {
+         av_log(ctx, AV_LOG_ERROR, "Invalid expression '%s' for timebase.\n", settb->tb_expr);
+         return ret;
+     }
+     time_base = av_d2q(res, INT_MAX);
+     if (time_base.num <= 0 || time_base.den <= 0) {
+         av_log(ctx, AV_LOG_ERROR,
+                "Invalid non-positive values for the timebase num:%d or den:%d.\n",
+                time_base.num, time_base.den);
+         return AVERROR(EINVAL);
+     }
+     outlink->time_base = time_base;
+     av_log(outlink->src, AV_LOG_VERBOSE, "tb:%d/%d -> tb:%d/%d\n",
+            inlink ->time_base.num, inlink ->time_base.den,
+            outlink->time_base.num, outlink->time_base.den);
+     return 0;
+ }
+ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
+ {
+     AVFilterContext *ctx = inlink->dst;
+     AVFilterLink *outlink = ctx->outputs[0];
+     if (av_cmp_q(inlink->time_base, outlink->time_base)) {
+         int64_t orig_pts = frame->pts;
+         frame->pts = av_rescale_q(frame->pts, inlink->time_base, outlink->time_base);
+         av_log(ctx, AV_LOG_DEBUG, "tb:%d/%d pts:%"PRId64" -> tb:%d/%d pts:%"PRId64"\n",
+                inlink ->time_base.num, inlink ->time_base.den, orig_pts,
+                outlink->time_base.num, outlink->time_base.den, frame->pts);
+     }
+     return ff_filter_frame(outlink, frame);
+ }
 -static const AVClass settb_class = {
 -    .class_name = "settb",
 -    .item_name  = av_default_item_name,
 -    .option     = options,
 -    .version    = LIBAVUTIL_VERSION_INT,
 -};
++#if CONFIG_SETTB_FILTER
 -        .name             = "default",
 -        .type             = AVMEDIA_TYPE_VIDEO,
 -        .get_video_buffer = ff_null_get_video_buffer,
 -        .filter_frame     = filter_frame,
++DEFINE_OPTIONS(settb, VIDEO);
++AVFILTER_DEFINE_CLASS(settb);
+ static const AVFilterPad avfilter_vf_settb_inputs[] = {
+     {
 -    .name      = "settb",
 -    .description = NULL_IF_CONFIG_SMALL("Set timebase for the output link."),
++        .name         = "default",
++        .type         = AVMEDIA_TYPE_VIDEO,
++        .filter_frame = filter_frame,
+     },
+     { NULL }
+ };
+ static const AVFilterPad avfilter_vf_settb_outputs[] = {
+     {
+         .name         = "default",
+         .type         = AVMEDIA_TYPE_VIDEO,
+         .config_props = config_output_props,
+     },
+     { NULL }
+ };
+ AVFilter ff_vf_settb = {
 -    .priv_size = sizeof(SetTBContext),
 -    .priv_class = &settb_class,
++    .name        = "settb",
++    .description = NULL_IF_CONFIG_SMALL("Set timebase for the video output link."),
++    .priv_size   = sizeof(SetTBContext),
++    .priv_class  = &settb_class,
++    .inputs      = avfilter_vf_settb_inputs,
++    .outputs     = avfilter_vf_settb_outputs,
++};
++#endif
++
++#if CONFIG_ASETTB_FILTER
++
++DEFINE_OPTIONS(asettb, AUDIO);
++AVFILTER_DEFINE_CLASS(asettb);
 -    .inputs    = avfilter_vf_settb_inputs,
++static const AVFilterPad avfilter_af_asettb_inputs[] = {
++    {
++        .name         = "default",
++        .type         = AVMEDIA_TYPE_AUDIO,
++        .filter_frame = filter_frame,
++    },
++    { NULL }
++};
 -    .outputs   = avfilter_vf_settb_outputs,
++static const AVFilterPad avfilter_af_asettb_outputs[] = {
++    {
++        .name         = "default",
++        .type         = AVMEDIA_TYPE_AUDIO,
++        .config_props = config_output_props,
++    },
++    { NULL }
++};
++AVFilter ff_af_asettb = {
++    .name        = "asettb",
++    .description = NULL_IF_CONFIG_SMALL("Set timebase for the audio output link."),
++    .priv_size   = sizeof(SetTBContext),
++    .inputs      = avfilter_af_asettb_inputs,
++    .outputs     = avfilter_af_asettb_outputs,
++    .priv_class  = &asettb_class,
+ };
++#endif