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>
231 lines
6.9 KiB
C
231 lines
6.9 KiB
C
/*
|
|
* 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
|
|
* common internal api header.
|
|
*/
|
|
|
|
#ifndef AVCODEC_INTERNAL_H
|
|
#define AVCODEC_INTERNAL_H
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "libavutil/buffer.h"
|
|
#include "libavutil/mathematics.h"
|
|
#include "libavutil/pixfmt.h"
|
|
#include "avcodec.h"
|
|
|
|
#define FF_SANE_NB_CHANNELS 128U
|
|
|
|
typedef struct FramePool {
|
|
/**
|
|
* Pools for each data plane. For audio all the planes have the same size,
|
|
* so only pools[0] is used.
|
|
*/
|
|
AVBufferPool *pools[4];
|
|
|
|
/*
|
|
* Pool parameters
|
|
*/
|
|
int format;
|
|
int width, height;
|
|
int stride_align[AV_NUM_DATA_POINTERS];
|
|
int linesize[4];
|
|
int planes;
|
|
int channels;
|
|
int samples;
|
|
} FramePool;
|
|
|
|
typedef struct AVCodecInternal {
|
|
/**
|
|
* Whether the parent AVCodecContext is a copy of the context which had
|
|
* init() called on it.
|
|
* This is used by multithreading - shared tables and picture pointers
|
|
* should be freed from the original context only.
|
|
*/
|
|
int is_copy;
|
|
|
|
/**
|
|
* Whether to allocate progress for frame threading.
|
|
*
|
|
* The codec must set it to 1 if it uses ff_thread_await/report_progress(),
|
|
* then progress will be allocated in ff_thread_get_buffer(). The frames
|
|
* then MUST be freed with ff_thread_release_buffer().
|
|
*
|
|
* If the codec does not need to call the progress functions (there are no
|
|
* dependencies between the frames), it should leave this at 0. Then it can
|
|
* decode straight to the user-provided frames (which the user will then
|
|
* free with av_frame_unref()), there is no need to call
|
|
* ff_thread_release_buffer().
|
|
*/
|
|
int allocate_progress;
|
|
|
|
#if FF_API_OLD_ENCODE_AUDIO
|
|
/**
|
|
* Internal sample count used by avcodec_encode_audio() to fabricate pts.
|
|
* Can be removed along with avcodec_encode_audio().
|
|
*/
|
|
int sample_count;
|
|
#endif
|
|
|
|
/**
|
|
* An audio frame with less than required samples has been submitted and
|
|
* padded with silence. Reject all subsequent frames.
|
|
*/
|
|
int last_audio_frame;
|
|
|
|
AVFrame to_free;
|
|
|
|
FramePool *pool;
|
|
|
|
/**
|
|
* temporary buffer used for encoders to store their bitstream
|
|
*/
|
|
uint8_t *byte_buffer;
|
|
unsigned int byte_buffer_size;
|
|
|
|
void *frame_thread_encoder;
|
|
|
|
/**
|
|
* Number of audio samples to skip at the start of the next decoded frame
|
|
*/
|
|
int skip_samples;
|
|
} AVCodecInternal;
|
|
|
|
struct AVCodecDefault {
|
|
const uint8_t *key;
|
|
const uint8_t *value;
|
|
};
|
|
|
|
/**
|
|
* Return the hardware accelerated codec for codec codec_id and
|
|
* pixel format pix_fmt.
|
|
*
|
|
* @param codec_id the codec to match
|
|
* @param pix_fmt the pixel format to match
|
|
* @return the hardware accelerated codec, or NULL if none was found.
|
|
*/
|
|
AVHWAccel *ff_find_hwaccel(enum AVCodecID codec_id, enum AVPixelFormat pix_fmt);
|
|
|
|
/**
|
|
* Return the index into tab at which {a,b} match elements {[0],[1]} of tab.
|
|
* If there is no such matching pair then size is returned.
|
|
*/
|
|
int ff_match_2uint16(const uint16_t (*tab)[2], int size, int a, int b);
|
|
|
|
unsigned int avpriv_toupper4(unsigned int x);
|
|
|
|
/**
|
|
* does needed setup of pkt_pts/pos and such for (re)get_buffer();
|
|
*/
|
|
void ff_init_buffer_info(AVCodecContext *s, AVFrame *frame);
|
|
|
|
|
|
void avpriv_color_frame(AVFrame *frame, const int color[4]);
|
|
|
|
/**
|
|
* Remove and free all side data from packet.
|
|
*/
|
|
void ff_packet_free_side_data(AVPacket *pkt);
|
|
|
|
extern volatile int ff_avcodec_locked;
|
|
int ff_lock_avcodec(AVCodecContext *log_ctx);
|
|
int ff_unlock_avcodec(void);
|
|
|
|
int avpriv_lock_avformat(void);
|
|
int avpriv_unlock_avformat(void);
|
|
|
|
/**
|
|
* Maximum size in bytes of extradata.
|
|
* This value was chosen such that every bit of the buffer is
|
|
* addressable by a 32-bit signed integer as used by get_bits.
|
|
*/
|
|
#define FF_MAX_EXTRADATA_SIZE ((1 << 28) - FF_INPUT_BUFFER_PADDING_SIZE)
|
|
|
|
/**
|
|
* Check AVPacket size and/or allocate data.
|
|
*
|
|
* Encoders supporting AVCodec.encode2() can use this as a convenience to
|
|
* ensure the output packet data is large enough, whether provided by the user
|
|
* or allocated in this function.
|
|
*
|
|
* @param avctx the AVCodecContext of the encoder
|
|
* @param avpkt the AVPacket
|
|
* If avpkt->data is already set, avpkt->size is checked
|
|
* to ensure it is large enough.
|
|
* If avpkt->data is NULL, a new buffer is allocated.
|
|
* avpkt->size is set to the specified size.
|
|
* All other AVPacket fields will be reset with av_init_packet().
|
|
* @param size the minimum required packet size
|
|
* @return 0 on success, negative error code on failure
|
|
*/
|
|
int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int size);
|
|
|
|
int ff_alloc_packet(AVPacket *avpkt, int size);
|
|
|
|
/**
|
|
* Rescale from sample rate to AVCodecContext.time_base.
|
|
*/
|
|
static av_always_inline int64_t ff_samples_to_time_base(AVCodecContext *avctx,
|
|
int64_t samples)
|
|
{
|
|
if(samples == AV_NOPTS_VALUE)
|
|
return AV_NOPTS_VALUE;
|
|
return av_rescale_q(samples, (AVRational){ 1, avctx->sample_rate },
|
|
avctx->time_base);
|
|
}
|
|
|
|
/**
|
|
* Get a buffer for a frame. This is a wrapper around
|
|
* AVCodecContext.get_buffer() and should be used instead calling get_buffer()
|
|
* directly.
|
|
*/
|
|
int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags);
|
|
|
|
/**
|
|
* Identical in function to av_frame_make_writable(), except it uses
|
|
* ff_get_buffer() to allocate the buffer when needed.
|
|
*/
|
|
int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame);
|
|
|
|
int ff_thread_can_start_frame(AVCodecContext *avctx);
|
|
|
|
int ff_get_logical_cpus(AVCodecContext *avctx);
|
|
|
|
int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx);
|
|
|
|
/**
|
|
* Call avcodec_open2 recursively by decrementing counter, unlocking mutex,
|
|
* calling the function and then restoring again. Assumes the mutex is
|
|
* already locked
|
|
*/
|
|
int ff_codec_open2_recursive(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);
|
|
|
|
/**
|
|
* Call avcodec_close recursively, counterpart to avcodec_open2_recursive.
|
|
*/
|
|
int ff_codec_close_recursive(AVCodecContext *avctx);
|
|
|
|
/**
|
|
* Finalize buf into extradata and set its size appropriately.
|
|
*/
|
|
int avpriv_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf);
|
|
|
|
#endif /* AVCODEC_INTERNAL_H */
|