* commit '7e350379f87e7f74420b4813170fe808e2313911':
  lavfi: switch to AVFrame.
Conflicts:
	doc/filters.texi
	libavfilter/af_ashowinfo.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersink.c
	libavfilter/buffersrc.c
	libavfilter/buffersrc.h
	libavfilter/f_select.c
	libavfilter/f_setpts.c
	libavfilter/fifo.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/version.h
	libavfilter/vf_aspect.c
	libavfilter/vf_bbox.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_fps.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_gradfun.c
	libavfilter/vf_hqdn3d.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_transpose.c
	libavfilter/vf_vflip.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavfilter/yadif.h
Following are notes about the merge authorship and various technical details.
Michael Niedermayer:
  * Main merge operation, notably avfilter.c and video.c
  * Switch to AVFrame:
    - afade
    - anullsrc
    - apad
    - aresample
    - blackframe
    - deshake
    - idet
    - il
    - mandelbrot
    - mptestsrc
    - noise
    - setfield
    - smartblur
    - tinterlace
  * various merge changes and fixes in:
    - ashowinfo
    - blackdetect
    - field
    - fps
    - select
    - testsrc
    - yadif
Nicolas George:
  * Switch to AVFrame:
    - make rawdec work with refcounted frames. Adapted from commit
      759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov.
      Also, fix the use of || instead of | in a flags check.
    - make buffer sink and src, audio and video work all together
Clément Bœsch:
  * Switch to AVFrame:
    - aevalsrc
    - alphaextract
    - blend
    - cellauto
    - colormatrix
    - concat
    - earwax
    - ebur128
    - edgedetect
    - geq
    - histeq
    - histogram
    - hue
    - kerndeint
    - life
    - movie
    - mp (with the help of Michael)
    - overlay
    - pad
    - pan
    - pp
    - pp
    - removelogo
    - sendcmd
    - showspectrum
    - showwaves
    - silencedetect
    - stereo3d
    - subtitles
    - super2xsai
    - swapuv
    - thumbnail
    - tile
Hendrik Leppkes:
  * Switch to AVFrame:
    - aconvert
    - amerge
    - asetnsamples
    - atempo
    - biquads
Matthieu Bouron:
  * Switch to AVFrame
    - alphamerge
    - decimate
    - volumedetect
Stefano Sabatini:
  * Switch to AVFrame:
    - astreamsync
    - flite
    - framestep
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
	
			
		
			
				
	
	
		
			231 lines
		
	
	
		
			6.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			231 lines
		
	
	
		
			6.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (c) 2002 A'rpi
 | 
						|
 * This file is part of FFmpeg.
 | 
						|
 *
 | 
						|
 * FFmpeg is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License as published by
 | 
						|
 * the Free Software Foundation; either version 2 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 General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU 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
 | 
						|
 * border detection filter
 | 
						|
 * Ported from MPlayer libmpcodecs/vf_cropdetect.c.
 | 
						|
 */
 | 
						|
 | 
						|
#include <stdio.h>
 | 
						|
 | 
						|
#include "libavutil/imgutils.h"
 | 
						|
#include "libavutil/internal.h"
 | 
						|
#include "avfilter.h"
 | 
						|
#include "formats.h"
 | 
						|
#include "internal.h"
 | 
						|
#include "video.h"
 | 
						|
 | 
						|
typedef struct {
 | 
						|
    int x1, y1, x2, y2;
 | 
						|
    int limit;
 | 
						|
    int round;
 | 
						|
    int reset_count;
 | 
						|
    int frame_nb;
 | 
						|
    int max_pixsteps[4];
 | 
						|
} CropDetectContext;
 | 
						|
 | 
						|
static int query_formats(AVFilterContext *ctx)
 | 
						|
{
 | 
						|
    static const enum AVPixelFormat pix_fmts[] = {
 | 
						|
        AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P,
 | 
						|
        AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVJ422P,
 | 
						|
        AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P,
 | 
						|
        AV_PIX_FMT_YUV411P, AV_PIX_FMT_GRAY8,
 | 
						|
        AV_PIX_FMT_NV12,    AV_PIX_FMT_NV21,
 | 
						|
        AV_PIX_FMT_NONE
 | 
						|
    };
 | 
						|
 | 
						|
    ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int checkline(void *ctx, const unsigned char *src, int stride, int len, int bpp)
 | 
						|
{
 | 
						|
    int total = 0;
 | 
						|
    int div = len;
 | 
						|
 | 
						|
    switch (bpp) {
 | 
						|
    case 1:
 | 
						|
        while (--len >= 0) {
 | 
						|
            total += src[0];
 | 
						|
            src += stride;
 | 
						|
        }
 | 
						|
        break;
 | 
						|
    case 3:
 | 
						|
    case 4:
 | 
						|
        while (--len >= 0) {
 | 
						|
            total += src[0] + src[1] + src[2];
 | 
						|
            src += stride;
 | 
						|
        }
 | 
						|
        div *= 3;
 | 
						|
        break;
 | 
						|
    }
 | 
						|
    total /= div;
 | 
						|
 | 
						|
    av_log(ctx, AV_LOG_DEBUG, "total:%d\n", total);
 | 
						|
    return total;
 | 
						|
}
 | 
						|
 | 
						|
static av_cold int init(AVFilterContext *ctx, const char *args)
 | 
						|
{
 | 
						|
    CropDetectContext *cd = ctx->priv;
 | 
						|
 | 
						|
    cd->limit = 24;
 | 
						|
    cd->round = 0;
 | 
						|
    cd->reset_count = 0;
 | 
						|
    cd->frame_nb = -2;
 | 
						|
 | 
						|
    if (args)
 | 
						|
        sscanf(args, "%d:%d:%d", &cd->limit, &cd->round, &cd->reset_count);
 | 
						|
 | 
						|
    av_log(ctx, AV_LOG_VERBOSE, "limit:%d round:%d reset_count:%d\n",
 | 
						|
           cd->limit, cd->round, cd->reset_count);
 | 
						|
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int config_input(AVFilterLink *inlink)
 | 
						|
{
 | 
						|
    AVFilterContext *ctx = inlink->dst;
 | 
						|
    CropDetectContext *cd = ctx->priv;
 | 
						|
 | 
						|
    av_image_fill_max_pixsteps(cd->max_pixsteps, NULL,
 | 
						|
                               av_pix_fmt_desc_get(inlink->format));
 | 
						|
 | 
						|
    cd->x1 = inlink->w - 1;
 | 
						|
    cd->y1 = inlink->h - 1;
 | 
						|
    cd->x2 = 0;
 | 
						|
    cd->y2 = 0;
 | 
						|
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 | 
						|
{
 | 
						|
    AVFilterContext *ctx = inlink->dst;
 | 
						|
    CropDetectContext *cd = ctx->priv;
 | 
						|
    int bpp = cd->max_pixsteps[0];
 | 
						|
    int w, h, x, y, shrink_by;
 | 
						|
 | 
						|
    // ignore first 2 frames - they may be empty
 | 
						|
    if (++cd->frame_nb > 0) {
 | 
						|
        // Reset the crop area every reset_count frames, if reset_count is > 0
 | 
						|
        if (cd->reset_count > 0 && cd->frame_nb > cd->reset_count) {
 | 
						|
            cd->x1 = frame->width  - 1;
 | 
						|
            cd->y1 = frame->height - 1;
 | 
						|
            cd->x2 = 0;
 | 
						|
            cd->y2 = 0;
 | 
						|
            cd->frame_nb = 1;
 | 
						|
        }
 | 
						|
 | 
						|
        for (y = 0; y < cd->y1; y++) {
 | 
						|
            if (checkline(ctx, frame->data[0] + frame->linesize[0] * y, bpp, frame->width, bpp) > cd->limit) {
 | 
						|
                cd->y1 = y;
 | 
						|
                break;
 | 
						|
            }
 | 
						|
        }
 | 
						|
 | 
						|
        for (y = frame->height - 1; y > cd->y2; y--) {
 | 
						|
            if (checkline(ctx, frame->data[0] + frame->linesize[0] * y, bpp, frame->width, bpp) > cd->limit) {
 | 
						|
                cd->y2 = y;
 | 
						|
                break;
 | 
						|
            }
 | 
						|
        }
 | 
						|
 | 
						|
        for (y = 0; y < cd->x1; y++) {
 | 
						|
            if (checkline(ctx, frame->data[0] + bpp*y, frame->linesize[0], frame->height, bpp) > cd->limit) {
 | 
						|
                cd->x1 = y;
 | 
						|
                break;
 | 
						|
            }
 | 
						|
        }
 | 
						|
 | 
						|
        for (y = frame->width - 1; y > cd->x2; y--) {
 | 
						|
            if (checkline(ctx, frame->data[0] + bpp*y, frame->linesize[0], frame->height, bpp) > cd->limit) {
 | 
						|
                cd->x2 = y;
 | 
						|
                break;
 | 
						|
            }
 | 
						|
        }
 | 
						|
 | 
						|
        // round x and y (up), important for yuv colorspaces
 | 
						|
        // make sure they stay rounded!
 | 
						|
        x = (cd->x1+1) & ~1;
 | 
						|
        y = (cd->y1+1) & ~1;
 | 
						|
 | 
						|
        w = cd->x2 - x + 1;
 | 
						|
        h = cd->y2 - y + 1;
 | 
						|
 | 
						|
        // w and h must be divisible by 2 as well because of yuv
 | 
						|
        // colorspace problems.
 | 
						|
        if (cd->round <= 1)
 | 
						|
            cd->round = 16;
 | 
						|
        if (cd->round % 2)
 | 
						|
            cd->round *= 2;
 | 
						|
 | 
						|
        shrink_by = w % cd->round;
 | 
						|
        w -= shrink_by;
 | 
						|
        x += (shrink_by/2 + 1) & ~1;
 | 
						|
 | 
						|
        shrink_by = h % cd->round;
 | 
						|
        h -= shrink_by;
 | 
						|
        y += (shrink_by/2 + 1) & ~1;
 | 
						|
 | 
						|
        av_log(ctx, AV_LOG_INFO,
 | 
						|
               "x1:%d x2:%d y1:%d y2:%d w:%d h:%d x:%d y:%d pts:%"PRId64" t:%f crop=%d:%d:%d:%d\n",
 | 
						|
               cd->x1, cd->x2, cd->y1, cd->y2, w, h, x, y, frame->pts,
 | 
						|
               frame->pts == AV_NOPTS_VALUE ? -1 : frame->pts * av_q2d(inlink->time_base),
 | 
						|
               w, h, x, y);
 | 
						|
    }
 | 
						|
 | 
						|
    return ff_filter_frame(inlink->dst->outputs[0], frame);
 | 
						|
}
 | 
						|
 | 
						|
static const AVFilterPad avfilter_vf_cropdetect_inputs[] = {
 | 
						|
    {
 | 
						|
        .name             = "default",
 | 
						|
        .type             = AVMEDIA_TYPE_VIDEO,
 | 
						|
        .config_props     = config_input,
 | 
						|
        .get_video_buffer = ff_null_get_video_buffer,
 | 
						|
        .filter_frame     = filter_frame,
 | 
						|
    },
 | 
						|
    { NULL }
 | 
						|
};
 | 
						|
 | 
						|
static const AVFilterPad avfilter_vf_cropdetect_outputs[] = {
 | 
						|
    {
 | 
						|
        .name = "default",
 | 
						|
        .type = AVMEDIA_TYPE_VIDEO
 | 
						|
    },
 | 
						|
    { NULL }
 | 
						|
};
 | 
						|
 | 
						|
AVFilter avfilter_vf_cropdetect = {
 | 
						|
    .name        = "cropdetect",
 | 
						|
    .description = NULL_IF_CONFIG_SMALL("Auto-detect crop size."),
 | 
						|
 | 
						|
    .priv_size = sizeof(CropDetectContext),
 | 
						|
    .init      = init,
 | 
						|
 | 
						|
    .query_formats = query_formats,
 | 
						|
 | 
						|
    .inputs    = avfilter_vf_cropdetect_inputs,
 | 
						|
 | 
						|
    .outputs   = avfilter_vf_cropdetect_outputs,
 | 
						|
};
 |