mirror of
				https://github.com/nyanmisaka/ffmpeg-rockchip.git
				synced 2025-10-31 20:42:49 +08:00 
			
		
		
		
	 a05a44e205
			
		
	
	a05a44e205
	
	
	
		
			
			* 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
      759001c534 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>
		
	
		
			
				
	
	
		
			158 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			158 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright 2007 Bobby Bingham
 | |
|  * Copyright Stefano Sabatini <stefasab gmail com>
 | |
|  * Copyright Vitor Sessak <vitor1001 gmail com>
 | |
|  *
 | |
|  * 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 <string.h>
 | |
| #include <stdio.h>
 | |
| 
 | |
| #include "libavutil/avassert.h"
 | |
| #include "libavutil/buffer.h"
 | |
| #include "libavutil/imgutils.h"
 | |
| #include "libavutil/mem.h"
 | |
| 
 | |
| #include "avfilter.h"
 | |
| #include "internal.h"
 | |
| #include "video.h"
 | |
| 
 | |
| AVFrame *ff_null_get_video_buffer(AVFilterLink *link, int w, int h)
 | |
| {
 | |
|     return ff_get_video_buffer(link->dst->outputs[0], w, h);
 | |
| }
 | |
| 
 | |
| /* TODO: set the buffer's priv member to a context structure for the whole
 | |
|  * filter chain.  This will allow for a buffer pool instead of the constant
 | |
|  * alloc & free cycle currently implemented. */
 | |
| AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h)
 | |
| {
 | |
|     AVFrame *frame = av_frame_alloc();
 | |
|     int ret;
 | |
| 
 | |
| #if 0 //POOL
 | |
|     AVFilterPool *pool = link->pool;
 | |
|     if (pool) {
 | |
|         for (i = 0; i < POOL_SIZE; i++) {
 | |
|             picref = pool->pic[i];
 | |
|             if (picref && picref->buf->format == link->format && picref->buf->w == w && picref->buf->h == h) {
 | |
|                 AVFilterBuffer *pic = picref->buf;
 | |
|                 pool->pic[i] = NULL;
 | |
|                 pool->count--;
 | |
|                 av_assert0(!picref->video->qp_table);
 | |
|                 picref->video->w = w;
 | |
|                 picref->video->h = h;
 | |
|                 picref->perms = full_perms;
 | |
|                 picref->format = link->format;
 | |
|                 pic->refcount = 1;
 | |
|                 memcpy(picref->data,     pic->data,     sizeof(picref->data));
 | |
|                 memcpy(picref->linesize, pic->linesize, sizeof(picref->linesize));
 | |
|                 pool->refcount++;
 | |
|                 return picref;
 | |
|             }
 | |
|         }
 | |
|     } else {
 | |
|         pool = link->pool = av_mallocz(sizeof(AVFilterPool));
 | |
|         pool->refcount = 1;
 | |
|     }
 | |
| #endif
 | |
|     if (!frame)
 | |
|         return NULL;
 | |
| 
 | |
|     frame->width  = w;
 | |
|     frame->height = h;
 | |
|     frame->format = link->format;
 | |
| 
 | |
|     ret = av_frame_get_buffer(frame, 32);
 | |
|     if (ret < 0)
 | |
|         av_frame_free(&frame);
 | |
| 
 | |
| #if 0 //POOL
 | |
|     memset(data[0], 128, i);
 | |
| 
 | |
|     picref->buf->priv = pool;
 | |
|     picref->buf->free = NULL;
 | |
|     pool->refcount++;
 | |
| #endif
 | |
| 
 | |
|     return frame;
 | |
| }
 | |
| 
 | |
| #if FF_API_AVFILTERBUFFER
 | |
| AVFilterBufferRef *
 | |
| avfilter_get_video_buffer_ref_from_arrays(uint8_t * const data[4], const int linesize[4], int perms,
 | |
|                                           int w, int h, enum AVPixelFormat format)
 | |
| {
 | |
|     AVFilterBuffer *pic = av_mallocz(sizeof(AVFilterBuffer));
 | |
|     AVFilterBufferRef *picref = av_mallocz(sizeof(AVFilterBufferRef));
 | |
| 
 | |
|     if (!pic || !picref)
 | |
|         goto fail;
 | |
| 
 | |
|     picref->buf = pic;
 | |
|     picref->buf->free = ff_avfilter_default_free_buffer;
 | |
|     if (!(picref->video = av_mallocz(sizeof(AVFilterBufferRefVideoProps))))
 | |
|         goto fail;
 | |
| 
 | |
|     pic->w = picref->video->w = w;
 | |
|     pic->h = picref->video->h = h;
 | |
| 
 | |
|     /* make sure the buffer gets read permission or it's useless for output */
 | |
|     picref->perms = perms | AV_PERM_READ;
 | |
| 
 | |
|     pic->refcount = 1;
 | |
|     picref->type = AVMEDIA_TYPE_VIDEO;
 | |
|     pic->format = picref->format = format;
 | |
| 
 | |
|     memcpy(pic->data,        data,          4*sizeof(data[0]));
 | |
|     memcpy(pic->linesize,    linesize,      4*sizeof(linesize[0]));
 | |
|     memcpy(picref->data,     pic->data,     sizeof(picref->data));
 | |
|     memcpy(picref->linesize, pic->linesize, sizeof(picref->linesize));
 | |
| 
 | |
|     pic->   extended_data = pic->data;
 | |
|     picref->extended_data = picref->data;
 | |
| 
 | |
|     picref->pts = AV_NOPTS_VALUE;
 | |
| 
 | |
|     return picref;
 | |
| 
 | |
| fail:
 | |
|     if (picref && picref->video)
 | |
|         av_free(picref->video);
 | |
|     av_free(picref);
 | |
|     av_free(pic);
 | |
|     return NULL;
 | |
| }
 | |
| #endif
 | |
| 
 | |
| AVFrame *ff_get_video_buffer(AVFilterLink *link, int w, int h)
 | |
| {
 | |
|     AVFrame *ret = NULL;
 | |
| 
 | |
|     av_unused char buf[16];
 | |
|     FF_TPRINTF_START(NULL, get_video_buffer); ff_tlog_link(NULL, link, 0);
 | |
| 
 | |
|     if (link->dstpad->get_video_buffer)
 | |
|         ret = link->dstpad->get_video_buffer(link, w, h);
 | |
| 
 | |
|     if (!ret)
 | |
|         ret = ff_default_get_video_buffer(link, w, h);
 | |
| 
 | |
|     return ret;
 | |
| }
 |