* 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>
		
	
			
		
			
				
	
	
		
			168 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			168 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright Stefano Sabatini <stefasab gmail com>
 | |
|  * Copyright Anton Khirnov <anton khirnov net>
 | |
|  * Copyright Michael Niedermayer <michaelni gmx at>
 | |
|  *
 | |
|  * 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 "libavutil/channel_layout.h"
 | |
| #include "libavutil/avassert.h"
 | |
| #include "libavutil/common.h"
 | |
| #include "libavutil/imgutils.h"
 | |
| #include "libavcodec/avcodec.h"
 | |
| 
 | |
| #include "avfilter.h"
 | |
| #include "internal.h"
 | |
| #include "audio.h"
 | |
| #include "avcodec.h"
 | |
| 
 | |
| void ff_avfilter_default_free_buffer(AVFilterBuffer *ptr)
 | |
| {
 | |
|     if (ptr->extended_data != ptr->data)
 | |
|         av_freep(&ptr->extended_data);
 | |
|     av_free(ptr->data[0]);
 | |
|     av_free(ptr);
 | |
| }
 | |
| 
 | |
| static void copy_video_props(AVFilterBufferRefVideoProps *dst, AVFilterBufferRefVideoProps *src) {
 | |
|     *dst = *src;
 | |
|     if (src->qp_table) {
 | |
|         int qsize = src->qp_table_size;
 | |
|         dst->qp_table = av_malloc(qsize);
 | |
|         memcpy(dst->qp_table, src->qp_table, qsize);
 | |
|     }
 | |
| }
 | |
| 
 | |
| AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask)
 | |
| {
 | |
|     AVFilterBufferRef *ret = av_malloc(sizeof(AVFilterBufferRef));
 | |
|     if (!ret)
 | |
|         return NULL;
 | |
|     *ret = *ref;
 | |
| 
 | |
|     ret->metadata = NULL;
 | |
|     av_dict_copy(&ret->metadata, ref->metadata, 0);
 | |
| 
 | |
|     if (ref->type == AVMEDIA_TYPE_VIDEO) {
 | |
|         ret->video = av_malloc(sizeof(AVFilterBufferRefVideoProps));
 | |
|         if (!ret->video) {
 | |
|             av_free(ret);
 | |
|             return NULL;
 | |
|         }
 | |
|         copy_video_props(ret->video, ref->video);
 | |
|         ret->extended_data = ret->data;
 | |
|     } else if (ref->type == AVMEDIA_TYPE_AUDIO) {
 | |
|         ret->audio = av_malloc(sizeof(AVFilterBufferRefAudioProps));
 | |
|         if (!ret->audio) {
 | |
|             av_free(ret);
 | |
|             return NULL;
 | |
|         }
 | |
|         *ret->audio = *ref->audio;
 | |
| 
 | |
|         if (ref->extended_data && ref->extended_data != ref->data) {
 | |
|             int nb_channels = av_get_channel_layout_nb_channels(ref->audio->channel_layout);
 | |
|             if (!(ret->extended_data = av_malloc(sizeof(*ret->extended_data) *
 | |
|                                                  nb_channels))) {
 | |
|                 av_freep(&ret->audio);
 | |
|                 av_freep(&ret);
 | |
|                 return NULL;
 | |
|             }
 | |
|             memcpy(ret->extended_data, ref->extended_data,
 | |
|                    sizeof(*ret->extended_data) * nb_channels);
 | |
|         } else
 | |
|             ret->extended_data = ret->data;
 | |
|     }
 | |
|     ret->perms &= pmask;
 | |
|     ret->buf->refcount ++;
 | |
|     return ret;
 | |
| }
 | |
| 
 | |
| void avfilter_unref_buffer(AVFilterBufferRef *ref)
 | |
| {
 | |
|     if (!ref)
 | |
|         return;
 | |
|     av_assert0(ref->buf->refcount > 0);
 | |
|     if (!(--ref->buf->refcount))
 | |
|         ref->buf->free(ref->buf);
 | |
|     if (ref->extended_data != ref->data)
 | |
|         av_freep(&ref->extended_data);
 | |
|     if (ref->video)
 | |
|         av_freep(&ref->video->qp_table);
 | |
|     av_freep(&ref->video);
 | |
|     av_freep(&ref->audio);
 | |
|     av_dict_free(&ref->metadata);
 | |
|     av_free(ref);
 | |
| }
 | |
| 
 | |
| void avfilter_unref_bufferp(AVFilterBufferRef **ref)
 | |
| {
 | |
|     avfilter_unref_buffer(*ref);
 | |
|     *ref = NULL;
 | |
| }
 | |
| 
 | |
| int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src)
 | |
| {
 | |
|     dst->pts    = src->pts;
 | |
|     dst->pos    = av_frame_get_pkt_pos(src);
 | |
|     dst->format = src->format;
 | |
| 
 | |
|     av_dict_free(&dst->metadata);
 | |
|     av_dict_copy(&dst->metadata, av_frame_get_metadata(src), 0);
 | |
| 
 | |
|     switch (dst->type) {
 | |
|     case AVMEDIA_TYPE_VIDEO:
 | |
|         dst->video->w                   = src->width;
 | |
|         dst->video->h                   = src->height;
 | |
|         dst->video->sample_aspect_ratio = src->sample_aspect_ratio;
 | |
|         dst->video->interlaced          = src->interlaced_frame;
 | |
|         dst->video->top_field_first     = src->top_field_first;
 | |
|         dst->video->key_frame           = src->key_frame;
 | |
|         dst->video->pict_type           = src->pict_type;
 | |
|         break;
 | |
|     case AVMEDIA_TYPE_AUDIO:
 | |
|         dst->audio->sample_rate         = src->sample_rate;
 | |
|         dst->audio->channel_layout      = src->channel_layout;
 | |
|         break;
 | |
|     default:
 | |
|         return AVERROR(EINVAL);
 | |
|     }
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| void avfilter_copy_buffer_ref_props(AVFilterBufferRef *dst, AVFilterBufferRef *src)
 | |
| {
 | |
|     // copy common properties
 | |
|     dst->pts             = src->pts;
 | |
|     dst->pos             = src->pos;
 | |
| 
 | |
|     switch (src->type) {
 | |
|     case AVMEDIA_TYPE_VIDEO: {
 | |
|         if (dst->video->qp_table)
 | |
|             av_freep(&dst->video->qp_table);
 | |
|         copy_video_props(dst->video, src->video);
 | |
|         break;
 | |
|     }
 | |
|     case AVMEDIA_TYPE_AUDIO: *dst->audio = *src->audio; break;
 | |
|     default: break;
 | |
|     }
 | |
| 
 | |
|     av_dict_free(&dst->metadata);
 | |
|     av_dict_copy(&dst->metadata, src->metadata, 0);
 | |
| }
 |