* 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>
295 lines
9.4 KiB
C
295 lines
9.4 KiB
C
/*
|
|
* Copyright (c) 2001 Fabrice Bellard
|
|
* Copyright (c) 2002-2004 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
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* Options definition for AVCodecContext.
|
|
*/
|
|
|
|
#include "avcodec.h"
|
|
#include "internal.h"
|
|
#include "libavutil/avassert.h"
|
|
#include "libavutil/mem.h"
|
|
#include "libavutil/opt.h"
|
|
#include <float.h> /* FLT_MIN, FLT_MAX */
|
|
#include <string.h>
|
|
|
|
#include "options_table.h"
|
|
|
|
static const char* context_to_name(void* ptr) {
|
|
AVCodecContext *avc= ptr;
|
|
|
|
if(avc && avc->codec && avc->codec->name)
|
|
return avc->codec->name;
|
|
else
|
|
return "NULL";
|
|
}
|
|
|
|
static void *codec_child_next(void *obj, void *prev)
|
|
{
|
|
AVCodecContext *s = obj;
|
|
if (!prev && s->codec && s->codec->priv_class && s->priv_data)
|
|
return s->priv_data;
|
|
return NULL;
|
|
}
|
|
|
|
static const AVClass *codec_child_class_next(const AVClass *prev)
|
|
{
|
|
AVCodec *c = NULL;
|
|
|
|
/* find the codec that corresponds to prev */
|
|
while (prev && (c = av_codec_next(c)))
|
|
if (c->priv_class == prev)
|
|
break;
|
|
|
|
/* find next codec with priv options */
|
|
while (c = av_codec_next(c))
|
|
if (c->priv_class)
|
|
return c->priv_class;
|
|
return NULL;
|
|
}
|
|
|
|
static AVClassCategory get_category(void *ptr)
|
|
{
|
|
AVCodecContext* avctx = ptr;
|
|
if(avctx->codec && avctx->codec->decode) return AV_CLASS_CATEGORY_DECODER;
|
|
else return AV_CLASS_CATEGORY_ENCODER;
|
|
}
|
|
|
|
static const AVClass av_codec_context_class = {
|
|
.class_name = "AVCodecContext",
|
|
.item_name = context_to_name,
|
|
.option = options,
|
|
.version = LIBAVUTIL_VERSION_INT,
|
|
.log_level_offset_offset = offsetof(AVCodecContext, log_level_offset),
|
|
.child_next = codec_child_next,
|
|
.child_class_next = codec_child_class_next,
|
|
.category = AV_CLASS_CATEGORY_ENCODER,
|
|
.get_category = get_category,
|
|
};
|
|
|
|
#if FF_API_ALLOC_CONTEXT
|
|
void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType codec_type){
|
|
AVCodec c= {0};
|
|
c.type= codec_type;
|
|
avcodec_get_context_defaults3(s, &c);
|
|
}
|
|
#endif
|
|
|
|
int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec)
|
|
{
|
|
int flags=0;
|
|
memset(s, 0, sizeof(AVCodecContext));
|
|
|
|
s->av_class = &av_codec_context_class;
|
|
|
|
s->codec_type = codec ? codec->type : AVMEDIA_TYPE_UNKNOWN;
|
|
if(s->codec_type == AVMEDIA_TYPE_AUDIO)
|
|
flags= AV_OPT_FLAG_AUDIO_PARAM;
|
|
else if(s->codec_type == AVMEDIA_TYPE_VIDEO)
|
|
flags= AV_OPT_FLAG_VIDEO_PARAM;
|
|
else if(s->codec_type == AVMEDIA_TYPE_SUBTITLE)
|
|
flags= AV_OPT_FLAG_SUBTITLE_PARAM;
|
|
av_opt_set_defaults2(s, flags, flags);
|
|
|
|
s->time_base = (AVRational){0,1};
|
|
s->get_buffer2 = avcodec_default_get_buffer2;
|
|
s->get_format = avcodec_default_get_format;
|
|
s->execute = avcodec_default_execute;
|
|
s->execute2 = avcodec_default_execute2;
|
|
s->sample_aspect_ratio = (AVRational){0,1};
|
|
s->pix_fmt = AV_PIX_FMT_NONE;
|
|
s->sample_fmt = AV_SAMPLE_FMT_NONE;
|
|
s->timecode_frame_start = -1;
|
|
|
|
s->reordered_opaque = AV_NOPTS_VALUE;
|
|
if(codec && codec->priv_data_size){
|
|
if(!s->priv_data){
|
|
s->priv_data= av_mallocz(codec->priv_data_size);
|
|
if (!s->priv_data) {
|
|
return AVERROR(ENOMEM);
|
|
}
|
|
}
|
|
if(codec->priv_class){
|
|
*(const AVClass**)s->priv_data = codec->priv_class;
|
|
av_opt_set_defaults(s->priv_data);
|
|
}
|
|
}
|
|
if (codec && codec->defaults) {
|
|
int ret;
|
|
const AVCodecDefault *d = codec->defaults;
|
|
while (d->key) {
|
|
ret = av_opt_set(s, d->key, d->value, 0);
|
|
av_assert0(ret >= 0);
|
|
d++;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
AVCodecContext *avcodec_alloc_context3(const AVCodec *codec)
|
|
{
|
|
AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext));
|
|
|
|
if(avctx==NULL) return NULL;
|
|
|
|
if(avcodec_get_context_defaults3(avctx, codec) < 0){
|
|
av_free(avctx);
|
|
return NULL;
|
|
}
|
|
|
|
return avctx;
|
|
}
|
|
|
|
#if FF_API_ALLOC_CONTEXT
|
|
AVCodecContext *avcodec_alloc_context2(enum AVMediaType codec_type){
|
|
AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext));
|
|
|
|
if(avctx==NULL) return NULL;
|
|
|
|
avcodec_get_context_defaults2(avctx, codec_type);
|
|
|
|
return avctx;
|
|
}
|
|
|
|
void avcodec_get_context_defaults(AVCodecContext *s){
|
|
avcodec_get_context_defaults2(s, AVMEDIA_TYPE_UNKNOWN);
|
|
}
|
|
|
|
AVCodecContext *avcodec_alloc_context(void){
|
|
return avcodec_alloc_context2(AVMEDIA_TYPE_UNKNOWN);
|
|
}
|
|
#endif
|
|
|
|
int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
|
|
{
|
|
if (avcodec_is_open(dest)) { // check that the dest context is uninitialized
|
|
av_log(dest, AV_LOG_ERROR,
|
|
"Tried to copy AVCodecContext %p into already-initialized %p\n",
|
|
src, dest);
|
|
return AVERROR(EINVAL);
|
|
}
|
|
memcpy(dest, src, sizeof(*dest));
|
|
|
|
/* set values specific to opened codecs back to their default state */
|
|
dest->priv_data = NULL;
|
|
dest->codec = NULL;
|
|
dest->slice_offset = NULL;
|
|
dest->hwaccel = NULL;
|
|
dest->thread_opaque = NULL;
|
|
dest->internal = NULL;
|
|
|
|
/* reallocate values that should be allocated separately */
|
|
dest->rc_eq = NULL;
|
|
dest->extradata = NULL;
|
|
dest->intra_matrix = NULL;
|
|
dest->inter_matrix = NULL;
|
|
dest->rc_override = NULL;
|
|
if (src->rc_eq) {
|
|
dest->rc_eq = av_strdup(src->rc_eq);
|
|
if (!dest->rc_eq)
|
|
return AVERROR(ENOMEM);
|
|
}
|
|
|
|
#define alloc_and_copy_or_fail(obj, size, pad) \
|
|
if (src->obj && size > 0) { \
|
|
dest->obj = av_malloc(size + pad); \
|
|
if (!dest->obj) \
|
|
goto fail; \
|
|
memcpy(dest->obj, src->obj, size); \
|
|
if (pad) \
|
|
memset(((uint8_t *) dest->obj) + size, 0, pad); \
|
|
}
|
|
alloc_and_copy_or_fail(extradata, src->extradata_size,
|
|
FF_INPUT_BUFFER_PADDING_SIZE);
|
|
alloc_and_copy_or_fail(intra_matrix, 64 * sizeof(int16_t), 0);
|
|
alloc_and_copy_or_fail(inter_matrix, 64 * sizeof(int16_t), 0);
|
|
alloc_and_copy_or_fail(rc_override, src->rc_override_count * sizeof(*src->rc_override), 0);
|
|
#undef alloc_and_copy_or_fail
|
|
|
|
return 0;
|
|
|
|
fail:
|
|
av_freep(&dest->rc_override);
|
|
av_freep(&dest->intra_matrix);
|
|
av_freep(&dest->inter_matrix);
|
|
av_freep(&dest->extradata);
|
|
av_freep(&dest->rc_eq);
|
|
return AVERROR(ENOMEM);
|
|
}
|
|
|
|
const AVClass *avcodec_get_class(void)
|
|
{
|
|
return &av_codec_context_class;
|
|
}
|
|
|
|
#define FOFFSET(x) offsetof(AVFrame,x)
|
|
|
|
static const AVOption frame_options[]={
|
|
{"best_effort_timestamp", "", FOFFSET(best_effort_timestamp), AV_OPT_TYPE_INT64, {.i64 = AV_NOPTS_VALUE }, INT64_MIN, INT64_MAX, 0},
|
|
{"pkt_pos", "", FOFFSET(pkt_pos), AV_OPT_TYPE_INT64, {.i64 = -1 }, INT64_MIN, INT64_MAX, 0},
|
|
{"pkt_size", "", FOFFSET(pkt_size), AV_OPT_TYPE_INT64, {.i64 = -1 }, INT64_MIN, INT64_MAX, 0},
|
|
{"sample_aspect_ratio", "", FOFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL, {.dbl = 0 }, 0, INT_MAX, 0},
|
|
{"width", "", FOFFSET(width), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0},
|
|
{"height", "", FOFFSET(height), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0},
|
|
{"format", "", FOFFSET(format), AV_OPT_TYPE_INT, {.i64 = -1 }, 0, INT_MAX, 0},
|
|
{"channel_layout", "", FOFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = 0 }, 0, INT64_MAX, 0},
|
|
{"sample_rate", "", FOFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0},
|
|
{NULL},
|
|
};
|
|
|
|
static const AVClass av_frame_class = {
|
|
.class_name = "AVFrame",
|
|
.item_name = NULL,
|
|
.option = frame_options,
|
|
.version = LIBAVUTIL_VERSION_INT,
|
|
};
|
|
|
|
const AVClass *avcodec_get_frame_class(void)
|
|
{
|
|
return &av_frame_class;
|
|
}
|
|
|
|
#define SROFFSET(x) offsetof(AVSubtitleRect,x)
|
|
|
|
static const AVOption subtitle_rect_options[]={
|
|
{"x", "", SROFFSET(x), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0},
|
|
{"y", "", SROFFSET(y), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0},
|
|
{"w", "", SROFFSET(w), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0},
|
|
{"h", "", SROFFSET(h), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0},
|
|
{"type", "", SROFFSET(type), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0},
|
|
{"flags", "", SROFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, 1, 0, "flags"},
|
|
{"forced", "", SROFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, 1, 0},
|
|
{NULL},
|
|
};
|
|
|
|
static const AVClass av_subtitle_rect_class = {
|
|
.class_name = "AVSubtitleRect",
|
|
.item_name = NULL,
|
|
.option = subtitle_rect_options,
|
|
.version = LIBAVUTIL_VERSION_INT,
|
|
};
|
|
|
|
const AVClass *avcodec_get_subtitle_rect_class(void)
|
|
{
|
|
return &av_subtitle_rect_class;
|
|
}
|