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>
		
	
		
			
				
	
	
		
			122 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			122 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Generic buffer queue
 | |
|  * Copyright (c) 2012 Nicolas George
 | |
|  *
 | |
|  * 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
 | |
|  */
 | |
| 
 | |
| #ifndef AVFILTER_BUFFERQUEUE_H
 | |
| #define AVFILTER_BUFFERQUEUE_H
 | |
| 
 | |
| /**
 | |
|  * FFBufQueue: simple AVFrame queue API
 | |
|  *
 | |
|  * Note: this API is not thread-safe. Concurrent access to the same queue
 | |
|  * must be protected by a mutex or any synchronization mechanism.
 | |
|  */
 | |
| 
 | |
| /**
 | |
|  * Maximum size of the queue.
 | |
|  *
 | |
|  * This value can be overridden by definying it before including this
 | |
|  * header.
 | |
|  * Powers of 2 are recommended.
 | |
|  */
 | |
| #ifndef FF_BUFQUEUE_SIZE
 | |
| #define FF_BUFQUEUE_SIZE 32
 | |
| #endif
 | |
| 
 | |
| #include "avfilter.h"
 | |
| #include "libavutil/avassert.h"
 | |
| 
 | |
| /**
 | |
|  * Structure holding the queue
 | |
|  */
 | |
| struct FFBufQueue {
 | |
|     AVFrame *queue[FF_BUFQUEUE_SIZE];
 | |
|     unsigned short head;
 | |
|     unsigned short available; /**< number of available buffers */
 | |
| };
 | |
| 
 | |
| #define BUCKET(i) queue->queue[(queue->head + (i)) % FF_BUFQUEUE_SIZE]
 | |
| 
 | |
| /**
 | |
|  * Test if a buffer queue is full.
 | |
|  */
 | |
| static inline int ff_bufqueue_is_full(struct FFBufQueue *queue)
 | |
| {
 | |
|     return queue->available == FF_BUFQUEUE_SIZE;
 | |
| }
 | |
| 
 | |
| /**
 | |
|  * Add a buffer to the queue.
 | |
|  *
 | |
|  * If the queue is already full, then the current last buffer is dropped
 | |
|  * (and unrefed) with a warning before adding the new buffer.
 | |
|  */
 | |
| static inline void ff_bufqueue_add(void *log, struct FFBufQueue *queue,
 | |
|                                    AVFrame *buf)
 | |
| {
 | |
|     if (ff_bufqueue_is_full(queue)) {
 | |
|         av_log(log, AV_LOG_WARNING, "Buffer queue overflow, dropping.\n");
 | |
|         av_frame_free(&BUCKET(--queue->available));
 | |
|     }
 | |
|     BUCKET(queue->available++) = buf;
 | |
| }
 | |
| 
 | |
| /**
 | |
|  * Get a buffer from the queue without altering it.
 | |
|  *
 | |
|  * Buffer with index 0 is the first buffer in the queue.
 | |
|  * Return NULL if the queue has not enough buffers.
 | |
|  */
 | |
| static inline AVFrame *ff_bufqueue_peek(struct FFBufQueue *queue,
 | |
|                                         unsigned index)
 | |
| {
 | |
|     return index < queue->available ? BUCKET(index) : NULL;
 | |
| }
 | |
| 
 | |
| /**
 | |
|  * Get the first buffer from the queue and remove it.
 | |
|  *
 | |
|  * Do not use on an empty queue.
 | |
|  */
 | |
| static inline AVFrame *ff_bufqueue_get(struct FFBufQueue *queue)
 | |
| {
 | |
|     AVFrame *ret = queue->queue[queue->head];
 | |
|     av_assert0(queue->available);
 | |
|     queue->available--;
 | |
|     queue->queue[queue->head] = NULL;
 | |
|     queue->head = (queue->head + 1) % FF_BUFQUEUE_SIZE;
 | |
|     return ret;
 | |
| }
 | |
| 
 | |
| /**
 | |
|  * Unref and remove all buffers from the queue.
 | |
|  */
 | |
| static inline void ff_bufqueue_discard_all(struct FFBufQueue *queue)
 | |
| {
 | |
|     while (queue->available) {
 | |
|         AVFrame *buf = ff_bufqueue_get(queue);
 | |
|         av_frame_free(&buf);
 | |
|     }
 | |
| }
 | |
| 
 | |
| #undef BUCKET
 | |
| 
 | |
| #endif /* AVFILTER_BUFFERQUEUE_H */
 |