mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
80e9e63c94
* commit '759001c534287a96dc96d1e274665feb7059145d': lavc decoders: work with refcounted frames. Anton Khirnov (1): lavc decoders: work with refcounted frames. Clément Bœsch (47): lavc/ansi: reset file lavc/ansi: re-do refcounted frame changes from Anton fraps: reset file lavc/fraps: switch to refcounted frames gifdec: reset file lavc/gifdec: switch to refcounted frames dsicinav: resolve conflicts smc: resolve conflicts zmbv: resolve conflicts rpza: resolve conflicts vble: resolve conflicts xxan: resolve conflicts targa: resolve conflicts vmnc: resolve conflicts utvideodec: resolve conflicts tscc: resolve conflicts ulti: resolve conflicts ffv1dec: resolve conflicts dnxhddec: resolve conflicts v210dec: resolve conflicts vp3: resolve conflicts vcr1: resolve conflicts v210x: resolve conflicts wavpack: resolve conflicts pngdec: fix compilation roqvideodec: resolve conflicts pictordec: resolve conflicts mdec: resolve conflicts tiertexseqv: resolve conflicts smacker: resolve conflicts vb: resolve conflicts vqavideo: resolve conflicts xl: resolve conflicts tmv: resolve conflicts vmdav: resolve conflicts truemotion1: resolve conflicts truemotion2: resolve conflicts lcldec: fix compilation libcelt_dec: fix compilation qdrw: fix compilation r210dec: fix compilation rl2: fix compilation wnv1: fix compilation yop: fix compilation tiff: resolve conflicts interplayvideo: fix compilation qpeg: resolve conflicts (FIXME/TESTME). Hendrik Leppkes (33): 012v: convert to refcounted frames 8bps: fix compilation 8svx: resolve conflicts 4xm: resolve conflicts aasc: resolve conflicts bfi: fix compilation aura: fix compilation alsdec: resolve conflicts avrndec: convert to refcounted frames avuidec: convert to refcounted frames bintext: convert to refcounted frames cavsdec: resolve conflicts brender_pix: convert to refcounted frames cinepak: resolve conflicts cinepak: avoid using AVFrame struct directly in private context cljr: fix compilation cpia: convert to refcounted frames cscd: resolve conflicts iff: resolve conflicts and do proper conversion to refcounted frames 4xm: fix reference frame handling cyuv: fix compilation dxa: fix compilation eacmv: fix compilation eamad: fix compilation eatgv: fix compilation escape124: remove unused variable. escape130: convert to refcounted frames evrcdec: convert to refcounted frames exr: convert to refcounted frames mvcdec: convert to refcounted frames paf: properly free the frame data on decode close sgirle: convert to refcounted frames lavfi/moviesrc: use refcounted frames Michael Niedermayer (56): Merge commit '759001c534287a96dc96d1e274665feb7059145d' resolve conflicts in headers motion_est: resolve conflict mpeg4videodec: fix conflicts dpcm conflict fix dpx: fix conflicts indeo3: resolve confilcts kmvc: resolve conflicts kmvc: resolve conflicts h264: resolve conflicts utils: resolve conflicts rawdec: resolve conflcits mpegvideo: resolve conflicts svq1enc: resolve conflicts mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads pthreads: resolve conflicts frame_thread_encoder: simple compilefix not yet tested snow: update to buffer refs crytsalhd: fix compile dirac: switch to new API sonic: update to new API svq1: resolve conflict, update to new API ffwavesynth: update to new buffer API g729: update to new API indeo5: fix compile j2kdec: update to new buffer API linopencore-amr: fix compile libvorbisdec: update to new API loco: fix compile paf: update to new API proresdec: update to new API vp56: update to new api / resolve conflicts xface: convert to refcounted frames xan: fix compile&fate v408: update to ref counted buffers v308: update to ref counted buffers yuv4dec: update to ref counted buffers y41p: update to ref counted frames xbm: update to refcounted frames targa_y216: update to refcounted buffers qpeg: fix fate/crash cdxl: fix fate tscc: fix reget buffer useage targa_y216dec: fix style msmpeg4: fix fate h264: ref_picture() copy fields that have been lost too update_frame_pool: use channel field h264: Put code that prevents deadlocks back mpegvideo: dont allow last == current wmalossless: fix buffer ref messup ff_alloc_picture: free tables in case of dimension mismatches h264: fix null pointer dereference and assertion failure frame_thread_encoder: update to bufrefs ec: fix used arrays snowdec: fix off by 1 error in dimensions check h264: disallow single unpaired fields as references of frames Paul B Mahol (2): lavc/vima: convert to refcounted frames sanm: convert to refcounted frames Conflicts: libavcodec/4xm.c libavcodec/8bps.c libavcodec/8svx.c libavcodec/aasc.c libavcodec/alsdec.c libavcodec/anm.c libavcodec/ansi.c libavcodec/avs.c libavcodec/bethsoftvideo.c libavcodec/bfi.c libavcodec/c93.c libavcodec/cavsdec.c libavcodec/cdgraphics.c libavcodec/cinepak.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/dsicinav.c libavcodec/dvdec.c libavcodec/dxa.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/eatgq.c libavcodec/eatgv.c libavcodec/eatqi.c libavcodec/error_resilience.c libavcodec/escape124.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/flicvideo.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_direct.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/huffyuvdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo2.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/jvdec.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/lagarith.c libavcodec/libopenjpegdec.c libavcodec/mdec.c libavcodec/mimic.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mmvideo.c libavcodec/motion_est.c libavcodec/motionpixels.c libavcodec/mpc7.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/msrle.c libavcodec/msvideo1.c libavcodec/nuv.c libavcodec/options_table.h libavcodec/pcx.c libavcodec/pictordec.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/pthread.c libavcodec/qpeg.c libavcodec/qtrle.c libavcodec/r210dec.c libavcodec/rawdec.c libavcodec/roqvideodec.c libavcodec/rpza.c libavcodec/smacker.c libavcodec/smc.c libavcodec/svq1dec.c libavcodec/svq1enc.c libavcodec/targa.c libavcodec/tiertexseqv.c libavcodec/tiff.c libavcodec/tmv.c libavcodec/truemotion1.c libavcodec/truemotion2.c libavcodec/tscc.c libavcodec/ulti.c libavcodec/utils.c libavcodec/utvideodec.c libavcodec/v210dec.c libavcodec/v210x.c libavcodec/vb.c libavcodec/vble.c libavcodec/vcr1.c libavcodec/vmdav.c libavcodec/vmnc.c libavcodec/vp3.c libavcodec/vp56.c libavcodec/vp56.h libavcodec/vp6.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/xl.c libavcodec/xxan.c libavcodec/zmbv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
129 lines
4.4 KiB
C
129 lines
4.4 KiB
C
/*
|
|
* Copyright (c) 2008 Alexander Strange <astrange@ithinksw.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
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* Multithreading support functions
|
|
* @author Alexander Strange <astrange@ithinksw.com>
|
|
*/
|
|
|
|
#ifndef AVCODEC_THREAD_H
|
|
#define AVCODEC_THREAD_H
|
|
|
|
#include "libavutil/buffer.h"
|
|
|
|
#include "config.h"
|
|
#include "avcodec.h"
|
|
|
|
typedef struct ThreadFrame {
|
|
AVFrame *f;
|
|
AVCodecContext *owner;
|
|
// progress->data is an array of 2 ints holding progress for top/bottom
|
|
// fields
|
|
AVBufferRef *progress;
|
|
} ThreadFrame;
|
|
|
|
/**
|
|
* Wait for decoding threads to finish and reset internal state.
|
|
* Called by avcodec_flush_buffers().
|
|
*
|
|
* @param avctx The context.
|
|
*/
|
|
void ff_thread_flush(AVCodecContext *avctx);
|
|
|
|
/**
|
|
* Submit a new frame to a decoding thread.
|
|
* Returns the next available frame in picture. *got_picture_ptr
|
|
* will be 0 if none is available.
|
|
* The return value on success is the size of the consumed packet for
|
|
* compatibility with avcodec_decode_video2(). This means the decoder
|
|
* has to consume the full packet.
|
|
*
|
|
* Parameters are the same as avcodec_decode_video2().
|
|
*/
|
|
int ff_thread_decode_frame(AVCodecContext *avctx, AVFrame *picture,
|
|
int *got_picture_ptr, AVPacket *avpkt);
|
|
|
|
/**
|
|
* If the codec defines update_thread_context(), call this
|
|
* when they are ready for the next thread to start decoding
|
|
* the next frame. After calling it, do not change any variables
|
|
* read by the update_thread_context() method, or call ff_thread_get_buffer().
|
|
*
|
|
* @param avctx The context.
|
|
*/
|
|
void ff_thread_finish_setup(AVCodecContext *avctx);
|
|
|
|
/**
|
|
* Notify later decoding threads when part of their reference picture is ready.
|
|
* Call this when some part of the picture is finished decoding.
|
|
* Later calls with lower values of progress have no effect.
|
|
*
|
|
* @param f The picture being decoded.
|
|
* @param progress Value, in arbitrary units, of how much of the picture has decoded.
|
|
* @param field The field being decoded, for field-picture codecs.
|
|
* 0 for top field or frame pictures, 1 for bottom field.
|
|
*/
|
|
void ff_thread_report_progress(ThreadFrame *f, int progress, int field);
|
|
|
|
/**
|
|
* Wait for earlier decoding threads to finish reference pictures.
|
|
* Call this before accessing some part of a picture, with a given
|
|
* value for progress, and it will return after the responsible decoding
|
|
* thread calls ff_thread_report_progress() with the same or
|
|
* higher value for progress.
|
|
*
|
|
* @param f The picture being referenced.
|
|
* @param progress Value, in arbitrary units, to wait for.
|
|
* @param field The field being referenced, for field-picture codecs.
|
|
* 0 for top field or frame pictures, 1 for bottom field.
|
|
*/
|
|
void ff_thread_await_progress(ThreadFrame *f, int progress, int field);
|
|
|
|
/**
|
|
* Wrapper around get_buffer() for frame-multithreaded codecs.
|
|
* Call this function instead of ff_get_buffer(f).
|
|
* Cannot be called after the codec has called ff_thread_finish_setup().
|
|
*
|
|
* @param avctx The current context.
|
|
* @param f The frame to write into.
|
|
*/
|
|
int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags);
|
|
|
|
/**
|
|
* Wrapper around release_buffer() frame-for multithreaded codecs.
|
|
* Call this function instead of avctx->release_buffer(f).
|
|
* The AVFrame will be copied and the actual release_buffer() call
|
|
* will be performed later. The contents of data pointed to by the
|
|
* AVFrame should not be changed until ff_thread_get_buffer() is called
|
|
* on it.
|
|
*
|
|
* @param avctx The current context.
|
|
* @param f The picture being released.
|
|
*/
|
|
void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f);
|
|
|
|
int ff_thread_ref_frame(ThreadFrame *dst, ThreadFrame *src);
|
|
|
|
int ff_thread_init(AVCodecContext *s);
|
|
void ff_thread_free(AVCodecContext *s);
|
|
|
|
#endif /* AVCODEC_THREAD_H */
|