* 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>
		
	
			
		
			
				
	
	
		
			177 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			177 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright (c) 2007 Benoit Fouet
 | |
|  * Copyright (c) 2010 Stefano Sabatini
 | |
|  *
 | |
|  * 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
 | |
|  * horizontal flip filter
 | |
|  */
 | |
| 
 | |
| #include <string.h>
 | |
| 
 | |
| #include "avfilter.h"
 | |
| #include "formats.h"
 | |
| #include "internal.h"
 | |
| #include "video.h"
 | |
| #include "libavutil/pixdesc.h"
 | |
| #include "libavutil/internal.h"
 | |
| #include "libavutil/intreadwrite.h"
 | |
| #include "libavutil/imgutils.h"
 | |
| 
 | |
| typedef struct {
 | |
|     int max_step[4];    ///< max pixel step for each plane, expressed as a number of bytes
 | |
|     int hsub, vsub;     ///< chroma subsampling
 | |
| } FlipContext;
 | |
| 
 | |
| static int query_formats(AVFilterContext *ctx)
 | |
| {
 | |
|     AVFilterFormats *pix_fmts = NULL;
 | |
|     int fmt;
 | |
| 
 | |
|     for (fmt = 0; fmt < AV_PIX_FMT_NB; fmt++) {
 | |
|         const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt);
 | |
|         if (!(desc->flags & PIX_FMT_HWACCEL ||
 | |
|               desc->flags & PIX_FMT_BITSTREAM ||
 | |
|               (desc->log2_chroma_w != desc->log2_chroma_h &&
 | |
|                desc->comp[0].plane == desc->comp[1].plane)))
 | |
|             ff_add_format(&pix_fmts, fmt);
 | |
|     }
 | |
| 
 | |
|     ff_set_common_formats(ctx, pix_fmts);
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static int config_props(AVFilterLink *inlink)
 | |
| {
 | |
|     FlipContext *flip = inlink->dst->priv;
 | |
|     const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format);
 | |
| 
 | |
|     av_image_fill_max_pixsteps(flip->max_step, NULL, pix_desc);
 | |
|     flip->hsub = pix_desc->log2_chroma_w;
 | |
|     flip->vsub = pix_desc->log2_chroma_h;
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 | |
| {
 | |
|     AVFilterContext *ctx  = inlink->dst;
 | |
|     FlipContext *flip     = ctx->priv;
 | |
|     AVFilterLink *outlink = ctx->outputs[0];
 | |
|     AVFrame *out;
 | |
|     uint8_t *inrow, *outrow;
 | |
|     int i, j, plane, step, hsub, vsub;
 | |
| 
 | |
|     out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 | |
|     if (!out) {
 | |
|         av_frame_free(&in);
 | |
|         return AVERROR(ENOMEM);
 | |
|     }
 | |
|     av_frame_copy_props(out, in);
 | |
| 
 | |
|     /* copy palette if required */
 | |
|     if (av_pix_fmt_desc_get(inlink->format)->flags & PIX_FMT_PAL)
 | |
|         memcpy(out->data[1], in->data[1], AVPALETTE_SIZE);
 | |
| 
 | |
|     for (plane = 0; plane < 4 && in->data[plane]; plane++) {
 | |
|         step = flip->max_step[plane];
 | |
|         hsub = (plane == 1 || plane == 2) ? flip->hsub : 0;
 | |
|         vsub = (plane == 1 || plane == 2) ? flip->vsub : 0;
 | |
| 
 | |
|         outrow = out->data[plane];
 | |
|         inrow  = in ->data[plane] + ((inlink->w >> hsub) - 1) * step;
 | |
|         for (i = 0; i < in->height >> vsub; i++) {
 | |
|             switch (step) {
 | |
|             case 1:
 | |
|                 for (j = 0; j < (inlink->w >> hsub); j++)
 | |
|                     outrow[j] = inrow[-j];
 | |
|             break;
 | |
| 
 | |
|             case 2:
 | |
|             {
 | |
|                 uint16_t *outrow16 = (uint16_t *)outrow;
 | |
|                 uint16_t * inrow16 = (uint16_t *) inrow;
 | |
|                 for (j = 0; j < (inlink->w >> hsub); j++)
 | |
|                     outrow16[j] = inrow16[-j];
 | |
|             }
 | |
|             break;
 | |
| 
 | |
|             case 3:
 | |
|             {
 | |
|                 uint8_t *in  =  inrow;
 | |
|                 uint8_t *out = outrow;
 | |
|                 for (j = 0; j < (inlink->w >> hsub); j++, out += 3, in -= 3) {
 | |
|                     int32_t v = AV_RB24(in);
 | |
|                     AV_WB24(out, v);
 | |
|                 }
 | |
|             }
 | |
|             break;
 | |
| 
 | |
|             case 4:
 | |
|             {
 | |
|                 uint32_t *outrow32 = (uint32_t *)outrow;
 | |
|                 uint32_t * inrow32 = (uint32_t *) inrow;
 | |
|                 for (j = 0; j < (inlink->w >> hsub); j++)
 | |
|                     outrow32[j] = inrow32[-j];
 | |
|             }
 | |
|             break;
 | |
| 
 | |
|             default:
 | |
|                 for (j = 0; j < (inlink->w >> hsub); j++)
 | |
|                     memcpy(outrow + j*step, inrow - j*step, step);
 | |
|             }
 | |
| 
 | |
|             inrow  += in ->linesize[plane];
 | |
|             outrow += out->linesize[plane];
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     av_frame_free(&in);
 | |
|     return ff_filter_frame(outlink, out);
 | |
| }
 | |
| 
 | |
| static const AVFilterPad avfilter_vf_hflip_inputs[] = {
 | |
|     {
 | |
|         .name         = "default",
 | |
|         .type         = AVMEDIA_TYPE_VIDEO,
 | |
|         .filter_frame = filter_frame,
 | |
|         .config_props = config_props,
 | |
|     },
 | |
|     { NULL }
 | |
| };
 | |
| 
 | |
| static const AVFilterPad avfilter_vf_hflip_outputs[] = {
 | |
|     {
 | |
|         .name = "default",
 | |
|         .type = AVMEDIA_TYPE_VIDEO,
 | |
|     },
 | |
|     { NULL }
 | |
| };
 | |
| 
 | |
| AVFilter avfilter_vf_hflip = {
 | |
|     .name      = "hflip",
 | |
|     .description = NULL_IF_CONFIG_SMALL("Horizontally flip the input video."),
 | |
|     .priv_size = sizeof(FlipContext),
 | |
|     .query_formats = query_formats,
 | |
| 
 | |
|     .inputs    = avfilter_vf_hflip_inputs,
 | |
|     .outputs   = avfilter_vf_hflip_outputs,
 | |
| };
 |