* qatar/master: (27 commits)
  avconv: free packet in write_frame() when discarding due to frame number limit
  FATE: use +/- flag option syntax for vp8 emu-edge tests
  lavf: make av_interleave_packet_per_dts() private.
  lavf: deprecate av_read_packet().
  oggdec: output correct timestamps for Vorbis
  avconv: pass input stream timestamps to audio encoders
  lavc: shrink encoded audio packet size after encoding.
  xa: set correct bit rate
  xa: do not set bit_rate, block_align, or bits_per_coded_sample
  xa: fix end-of-file handling
  xa: fix timestamp calculation
  bink: fix typo in FFALIGN() argument
  bink: align plane width to 8 when calculating bundle sizes
  doc: pass -Idoc texi2html and texi2pod
  doc: texi2pod: add -I flag
  movenc: Add a min_frag_duration option
  rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers
  libavformat: Set the default for the max_delay option to -1
  Generate manpages for AV{Format,Codec}Context AVOptions.
  doc/avconv: remove entries for AVOptions.
  ...
Conflicts:
	doc/Makefile
	doc/ffmpeg.texi
	doc/muxers.texi
	ffmpeg.c
	libavcodec/Makefile
	libavcodec/options.c
	libavcodec/vp8.c
	libavformat/options.c
	tests/fate/demux.mak
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
	
			
		
			
				
	
	
		
			256 lines
		
	
	
		
			7.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			256 lines
		
	
	
		
			7.9 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/opt.h"
 | 
						|
#include <float.h>              /* FLT_MIN, FLT_MAX */
 | 
						|
 | 
						|
#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 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,
 | 
						|
};
 | 
						|
 | 
						|
#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, 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_buffer          = avcodec_default_get_buffer;
 | 
						|
    s->release_buffer      = avcodec_default_release_buffer;
 | 
						|
    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             = PIX_FMT_NONE;
 | 
						|
    s->sample_fmt          = AV_SAMPLE_FMT_NONE;
 | 
						|
    s->timecode_frame_start = -1;
 | 
						|
 | 
						|
    s->reget_buffer        = avcodec_default_reget_buffer;
 | 
						|
    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(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, {.dbl = AV_NOPTS_VALUE }, INT64_MIN, INT64_MAX, 0},
 | 
						|
{"pkt_pos", "", FOFFSET(pkt_pos), AV_OPT_TYPE_INT64, {.dbl = -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, {.dbl = 0 }, 0, INT_MAX, 0},
 | 
						|
{"height", "", FOFFSET(height), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, 0},
 | 
						|
{"format", "", FOFFSET(format), AV_OPT_TYPE_INT, {.dbl = -1 }, 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;
 | 
						|
}
 |