X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Futils.c;h=d1a1510858b2842e40fe024922e7cf0f4cd76925;hb=d4f0f2d1e80b76260eb6b9cdde472ac069dfda56;hp=2e8a86c1faae22c939ce445e1c97e4503adc642a;hpb=828bd088f3f74dcdb8451d58557b0d8caefa3227;p=ffmpeg diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2e8a86c1faa..d1a1510858b 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -25,60 +25,47 @@ * utils. */ +#include "config.h" +#include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/crc.h" +#include "libavutil/frame.h" +#include "libavutil/internal.h" #include "libavutil/mathematics.h" #include "libavutil/pixdesc.h" -#include "libavutil/audioconvert.h" #include "libavutil/imgutils.h" #include "libavutil/samplefmt.h" #include "libavutil/dict.h" #include "avcodec.h" #include "dsputil.h" #include "libavutil/opt.h" -#include "imgconvert.h" #include "thread.h" -#include "audioconvert.h" #include "internal.h" #include "bytestream.h" +#include "version.h" #include #include #include #include -static int volatile entangled_thread_counter=0; -static int (*ff_lockmgr_cb)(void **mutex, enum AVLockOp op); +static int volatile entangled_thread_counter = 0; +static int (*lockmgr_cb)(void **mutex, enum AVLockOp op); static void *codec_mutex; static void *avformat_mutex; -void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size) +#if FF_API_FAST_MALLOC && CONFIG_SHARED && HAVE_SYMVER +FF_SYMVER(void*, av_fast_realloc, (void *ptr, unsigned int *size, size_t min_size), "LIBAVCODEC_55") { - if(min_size < *size) - return ptr; - - min_size= FFMAX(17*min_size/16 + 32, min_size); - - ptr= av_realloc(ptr, min_size); - if(!ptr) //we could set this to the unmodified min_size but this is safer if the user lost the ptr and uses NULL now - min_size= 0; - - *size= min_size; - - return ptr; + return av_fast_realloc(ptr, size, min_size); } -void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size) +FF_SYMVER(void, av_fast_malloc, (void *ptr, unsigned int *size, size_t min_size), "LIBAVCODEC_55") { - void **p = ptr; - if (min_size < *size) - return; - min_size= FFMAX(17*min_size/16 + 32, min_size); - av_free(*p); - *p = av_malloc(min_size); - if (!*p) min_size = 0; - *size= min_size; + av_fast_malloc(ptr, size, min_size); } +#endif void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size) { @@ -96,12 +83,15 @@ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size) /* encoder management */ static AVCodec *first_avcodec = NULL; -AVCodec *av_codec_next(AVCodec *c){ - if(c) return c->next; - else return first_avcodec; +AVCodec *av_codec_next(const AVCodec *c) +{ + if (c) + return c->next; + else + return first_avcodec; } -static void avcodec_init(void) +static av_cold void avcodec_init(void) { static int initialized = 0; @@ -109,26 +99,28 @@ static void avcodec_init(void) return; initialized = 1; - ff_dsputil_static_init(); + if (CONFIG_DSPUTIL) + ff_dsputil_static_init(); } -int av_codec_is_encoder(AVCodec *codec) +int av_codec_is_encoder(const AVCodec *codec) { - return codec && (codec->encode || codec->encode2); + return codec && (codec->encode_sub || codec->encode2); } -int av_codec_is_decoder(AVCodec *codec) +int av_codec_is_decoder(const AVCodec *codec) { return codec && codec->decode; } -void avcodec_register(AVCodec *codec) +av_cold void avcodec_register(AVCodec *codec) { AVCodec **p; avcodec_init(); p = &first_avcodec; - while (*p != NULL) p = &(*p)->next; - *p = codec; + while (*p != NULL) + p = &(*p)->next; + *p = codec; codec->next = NULL; if (codec->init_static_data) @@ -140,111 +132,134 @@ unsigned avcodec_get_edge_width(void) return EDGE_WIDTH; } -void avcodec_set_dimensions(AVCodecContext *s, int width, int height){ - s->coded_width = width; - s->coded_height= height; - s->width = width; - s->height = height; +#if FF_API_SET_DIMENSIONS +void avcodec_set_dimensions(AVCodecContext *s, int width, int height) +{ + ff_set_dimensions(s, width, height); +} +#endif + +int ff_set_dimensions(AVCodecContext *s, int width, int height) +{ + int ret = av_image_check_size(width, height, 0, s); + + if (ret < 0) + width = height = 0; + s->width = s->coded_width = width; + s->height = s->coded_height = height; + + return ret; } -#define INTERNAL_BUFFER_SIZE (32+1) +#if HAVE_NEON || ARCH_PPC || HAVE_MMX +# define STRIDE_ALIGN 16 +#else +# define STRIDE_ALIGN 8 +#endif void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int linesize_align[AV_NUM_DATA_POINTERS]) { int i; - int w_align= 1; - int h_align= 1; - - switch(s->pix_fmt){ - case PIX_FMT_YUV420P: - case PIX_FMT_YUYV422: - case PIX_FMT_UYVY422: - case PIX_FMT_YUV422P: - case PIX_FMT_YUV440P: - case PIX_FMT_YUV444P: - case PIX_FMT_GBRP: - case PIX_FMT_GRAY8: - case PIX_FMT_GRAY16BE: - case PIX_FMT_GRAY16LE: - case PIX_FMT_YUVJ420P: - case PIX_FMT_YUVJ422P: - case PIX_FMT_YUVJ440P: - case PIX_FMT_YUVJ444P: - case PIX_FMT_YUVA420P: - case PIX_FMT_YUV420P9LE: - case PIX_FMT_YUV420P9BE: - case PIX_FMT_YUV420P10LE: - case PIX_FMT_YUV420P10BE: - case PIX_FMT_YUV422P9LE: - case PIX_FMT_YUV422P9BE: - case PIX_FMT_YUV422P10LE: - case PIX_FMT_YUV422P10BE: - case PIX_FMT_YUV444P9LE: - case PIX_FMT_YUV444P9BE: - case PIX_FMT_YUV444P10LE: - case PIX_FMT_YUV444P10BE: - case PIX_FMT_GBRP9LE: - case PIX_FMT_GBRP9BE: - case PIX_FMT_GBRP10LE: - case PIX_FMT_GBRP10BE: + int w_align = 1; + int h_align = 1; + + switch (s->pix_fmt) { + case AV_PIX_FMT_YUV420P: + case AV_PIX_FMT_YUYV422: + case AV_PIX_FMT_UYVY422: + case AV_PIX_FMT_YUV422P: + case AV_PIX_FMT_YUV440P: + case AV_PIX_FMT_YUV444P: + case AV_PIX_FMT_GBRP: + case AV_PIX_FMT_GRAY8: + case AV_PIX_FMT_GRAY16BE: + case AV_PIX_FMT_GRAY16LE: + case AV_PIX_FMT_YUVJ420P: + case AV_PIX_FMT_YUVJ422P: + case AV_PIX_FMT_YUVJ440P: + case AV_PIX_FMT_YUVJ444P: + case AV_PIX_FMT_YUVA420P: + case AV_PIX_FMT_YUVA422P: + case AV_PIX_FMT_YUVA444P: + case AV_PIX_FMT_YUV420P9LE: + case AV_PIX_FMT_YUV420P9BE: + case AV_PIX_FMT_YUV420P10LE: + case AV_PIX_FMT_YUV420P10BE: + case AV_PIX_FMT_YUV422P9LE: + case AV_PIX_FMT_YUV422P9BE: + case AV_PIX_FMT_YUV422P10LE: + case AV_PIX_FMT_YUV422P10BE: + case AV_PIX_FMT_YUV444P9LE: + case AV_PIX_FMT_YUV444P9BE: + case AV_PIX_FMT_YUV444P10LE: + case AV_PIX_FMT_YUV444P10BE: + case AV_PIX_FMT_GBRP9LE: + case AV_PIX_FMT_GBRP9BE: + case AV_PIX_FMT_GBRP10LE: + case AV_PIX_FMT_GBRP10BE: w_align = 16; //FIXME assume 16 pixel per macroblock h_align = 16 * 2; // interlaced needs 2 macroblocks height break; - case PIX_FMT_YUV411P: - case PIX_FMT_UYYVYY411: - w_align=32; - h_align=8; + case AV_PIX_FMT_YUV411P: + case AV_PIX_FMT_UYYVYY411: + w_align = 32; + h_align = 8; break; - case PIX_FMT_YUV410P: - if(s->codec_id == CODEC_ID_SVQ1){ - w_align=64; - h_align=64; + case AV_PIX_FMT_YUV410P: + if (s->codec_id == AV_CODEC_ID_SVQ1) { + w_align = 64; + h_align = 64; } - case PIX_FMT_RGB555: - if(s->codec_id == CODEC_ID_RPZA){ - w_align=4; - h_align=4; + case AV_PIX_FMT_RGB555: + if (s->codec_id == AV_CODEC_ID_RPZA) { + w_align = 4; + h_align = 4; } - case PIX_FMT_PAL8: - case PIX_FMT_BGR8: - case PIX_FMT_RGB8: - if(s->codec_id == CODEC_ID_SMC){ - w_align=4; - h_align=4; + case AV_PIX_FMT_PAL8: + case AV_PIX_FMT_BGR8: + case AV_PIX_FMT_RGB8: + if (s->codec_id == AV_CODEC_ID_SMC) { + w_align = 4; + h_align = 4; } break; - case PIX_FMT_BGR24: - if((s->codec_id == CODEC_ID_MSZH) || (s->codec_id == CODEC_ID_ZLIB)){ - w_align=4; - h_align=4; + case AV_PIX_FMT_BGR24: + if ((s->codec_id == AV_CODEC_ID_MSZH) || + (s->codec_id == AV_CODEC_ID_ZLIB)) { + w_align = 4; + h_align = 4; } break; default: - w_align= 1; - h_align= 1; + w_align = 1; + h_align = 1; break; } - *width = FFALIGN(*width , w_align); - *height= FFALIGN(*height, h_align); - if (s->codec_id == CODEC_ID_H264) - *height+=2; // some of the optimized chroma MC reads one line too much + *width = FFALIGN(*width, w_align); + *height = FFALIGN(*height, h_align); + if (s->codec_id == AV_CODEC_ID_H264) + // some of the optimized chroma MC reads one line too much + *height += 2; for (i = 0; i < 4; i++) linesize_align[i] = STRIDE_ALIGN; } -void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){ - int chroma_shift = av_pix_fmt_descriptors[s->pix_fmt].log2_chroma_w; +void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height) +{ + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->pix_fmt); + int chroma_shift = desc->log2_chroma_w; int linesize_align[AV_NUM_DATA_POINTERS]; int align; + avcodec_align_dimensions2(s, width, height, linesize_align); - align = FFMAX(linesize_align[0], linesize_align[3]); + align = FFMAX(linesize_align[0], linesize_align[3]); linesize_align[1] <<= chroma_shift; linesize_align[2] <<= chroma_shift; - align = FFMAX3(align, linesize_align[1], linesize_align[2]); - *width=FFALIGN(*width, align); + align = FFMAX3(align, linesize_align[1], linesize_align[2]); + *width = FFALIGN(*width, align); } int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, @@ -283,351 +298,553 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, return ret; } -static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame) +static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame) { - AVCodecInternal *avci = avctx->internal; - InternalBuffer *buf; - int buf_size, ret; + FramePool *pool = avctx->internal->pool; + int i, ret; - buf_size = av_samples_get_buffer_size(NULL, avctx->channels, - frame->nb_samples, avctx->sample_fmt, - 0); - if (buf_size < 0) - return AVERROR(EINVAL); + switch (avctx->codec_type) { + case AVMEDIA_TYPE_VIDEO: { + AVPicture picture; + int size[4] = { 0 }; + int w = frame->width; + int h = frame->height; + int tmpsize, unaligned; - /* allocate InternalBuffer if needed */ - if (!avci->buffer) { - avci->buffer = av_mallocz(sizeof(InternalBuffer)); - if (!avci->buffer) - return AVERROR(ENOMEM); - } - buf = avci->buffer; - - /* if there is a previously-used internal buffer, check its size and - channel count to see if we can reuse it */ - if (buf->extended_data) { - /* if current buffer is too small, free it */ - if (buf->extended_data[0] && buf_size > buf->audio_data_size) { - av_free(buf->extended_data[0]); - if (buf->extended_data != buf->data) - av_free(&buf->extended_data); - buf->extended_data = NULL; - buf->data[0] = NULL; + if (pool->format == frame->format && + pool->width == frame->width && pool->height == frame->height) + return 0; + + avcodec_align_dimensions2(avctx, &w, &h, pool->stride_align); + + if (!(avctx->flags & CODEC_FLAG_EMU_EDGE)) { + w += EDGE_WIDTH * 2; + h += EDGE_WIDTH * 2; } - /* if number of channels has changed, reset and/or free extended data - pointers but leave data buffer in buf->data[0] for reuse */ - if (buf->nb_channels != avctx->channels) { - if (buf->extended_data != buf->data) - av_free(buf->extended_data); - buf->extended_data = NULL; + + do { + // NOTE: do not align linesizes individually, this breaks e.g. assumptions + // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2 + av_image_fill_linesizes(picture.linesize, avctx->pix_fmt, w); + // increase alignment of w for next try (rhs gives the lowest bit set in w) + w += w & ~(w - 1); + + unaligned = 0; + for (i = 0; i < 4; i++) + unaligned |= picture.linesize[i] % pool->stride_align[i]; + } while (unaligned); + + tmpsize = av_image_fill_pointers(picture.data, avctx->pix_fmt, h, + NULL, picture.linesize); + if (tmpsize < 0) + return -1; + + for (i = 0; i < 3 && picture.data[i + 1]; i++) + size[i] = picture.data[i + 1] - picture.data[i]; + size[i] = tmpsize - (picture.data[i] - picture.data[0]); + + for (i = 0; i < 4; i++) { + av_buffer_pool_uninit(&pool->pools[i]); + pool->linesize[i] = picture.linesize[i]; + if (size[i]) { + pool->pools[i] = av_buffer_pool_init(size[i] + 16, NULL); + if (!pool->pools[i]) { + ret = AVERROR(ENOMEM); + goto fail; + } + } } - } + pool->format = frame->format; + pool->width = frame->width; + pool->height = frame->height; - /* if there is no previous buffer or the previous buffer cannot be used - as-is, allocate a new buffer and/or rearrange the channel pointers */ - if (!buf->extended_data) { - if (!buf->data[0]) { - if (!(buf->data[0] = av_mallocz(buf_size))) - return AVERROR(ENOMEM); - buf->audio_data_size = buf_size; + break; + } + case AVMEDIA_TYPE_AUDIO: { + int ch = av_get_channel_layout_nb_channels(frame->channel_layout); + int planar = av_sample_fmt_is_planar(frame->format); + int planes = planar ? ch : 1; + + if (pool->format == frame->format && pool->planes == planes && + pool->channels == ch && frame->nb_samples == pool->samples) + return 0; + + av_buffer_pool_uninit(&pool->pools[0]); + ret = av_samples_get_buffer_size(&pool->linesize[0], ch, + frame->nb_samples, frame->format, 0); + if (ret < 0) + goto fail; + + pool->pools[0] = av_buffer_pool_init(pool->linesize[0], NULL); + if (!pool->pools[0]) { + ret = AVERROR(ENOMEM); + goto fail; } - if ((ret = avcodec_fill_audio_frame(frame, avctx->channels, - avctx->sample_fmt, buf->data[0], - buf->audio_data_size, 0))) - return ret; - if (frame->extended_data == frame->data) - buf->extended_data = buf->data; - else - buf->extended_data = frame->extended_data; - memcpy(buf->data, frame->data, sizeof(frame->data)); - buf->linesize[0] = frame->linesize[0]; - buf->nb_channels = avctx->channels; - } else { - /* copy InternalBuffer info to the AVFrame */ - frame->extended_data = buf->extended_data; - frame->linesize[0] = buf->linesize[0]; - memcpy(frame->data, buf->data, sizeof(frame->data)); + pool->format = frame->format; + pool->planes = planes; + pool->channels = ch; + pool->samples = frame->nb_samples; + break; + } + default: av_assert0(0); } + return 0; +fail: + for (i = 0; i < 4; i++) + av_buffer_pool_uninit(&pool->pools[i]); + pool->format = -1; + pool->planes = pool->channels = pool->samples = 0; + pool->width = pool->height = 0; + return ret; +} - frame->type = FF_BUFFER_TYPE_INTERNAL; +static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame) +{ + FramePool *pool = avctx->internal->pool; + int planes = pool->planes; + int i; - if (avctx->pkt) frame->pkt_pts = avctx->pkt->pts; - else frame->pkt_pts = AV_NOPTS_VALUE; - frame->reordered_opaque = avctx->reordered_opaque; + frame->linesize[0] = pool->linesize[0]; - frame->sample_rate = avctx->sample_rate; - frame->format = avctx->sample_fmt; - frame->channel_layout = avctx->channel_layout; + if (planes > AV_NUM_DATA_POINTERS) { + frame->extended_data = av_mallocz(planes * sizeof(*frame->extended_data)); + frame->nb_extended_buf = planes - AV_NUM_DATA_POINTERS; + frame->extended_buf = av_mallocz(frame->nb_extended_buf * + sizeof(*frame->extended_buf)); + if (!frame->extended_data || !frame->extended_buf) { + av_freep(&frame->extended_data); + av_freep(&frame->extended_buf); + return AVERROR(ENOMEM); + } + } else + frame->extended_data = frame->data; + + for (i = 0; i < FFMIN(planes, AV_NUM_DATA_POINTERS); i++) { + frame->buf[i] = av_buffer_pool_get(pool->pools[0]); + if (!frame->buf[i]) + goto fail; + frame->extended_data[i] = frame->data[i] = frame->buf[i]->data; + } + for (i = 0; i < frame->nb_extended_buf; i++) { + frame->extended_buf[i] = av_buffer_pool_get(pool->pools[0]); + if (!frame->extended_buf[i]) + goto fail; + frame->extended_data[i + AV_NUM_DATA_POINTERS] = frame->extended_buf[i]->data; + } if (avctx->debug & FF_DEBUG_BUFFERS) - av_log(avctx, AV_LOG_DEBUG, "default_get_buffer called on frame %p, " - "internal audio buffer used\n", frame); + av_log(avctx, AV_LOG_DEBUG, "default_get_buffer called on frame %p", frame); return 0; +fail: + av_frame_unref(frame); + return AVERROR(ENOMEM); } static int video_get_buffer(AVCodecContext *s, AVFrame *pic) { + FramePool *pool = s->internal->pool; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pic->format); + int pixel_size = desc->comp[0].step_minus1 + 1; + int h_chroma_shift, v_chroma_shift; int i; - int w= s->width; - int h= s->height; - InternalBuffer *buf; - AVCodecInternal *avci = s->internal; - if(pic->data[0]!=NULL) { + if (pic->data[0] != NULL) { av_log(s, AV_LOG_ERROR, "pic->data[0]!=NULL in avcodec_default_get_buffer\n"); return -1; } - if(avci->buffer_count >= INTERNAL_BUFFER_SIZE) { - av_log(s, AV_LOG_ERROR, "buffer_count overflow (missing release_buffer?)\n"); - return -1; - } - if(av_image_check_size(w, h, 0, s)) - return -1; + memset(pic->data, 0, sizeof(pic->data)); + pic->extended_data = pic->data; - if (!avci->buffer) { - avci->buffer = av_mallocz((INTERNAL_BUFFER_SIZE+1) * - sizeof(InternalBuffer)); - } + av_pix_fmt_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift); - buf = &avci->buffer[avci->buffer_count]; + for (i = 0; i < 4 && pool->pools[i]; i++) { + const int h_shift = i == 0 ? 0 : h_chroma_shift; + const int v_shift = i == 0 ? 0 : v_chroma_shift; - if(buf->base[0] && (buf->width != w || buf->height != h || buf->pix_fmt != s->pix_fmt)){ - for (i = 0; i < AV_NUM_DATA_POINTERS; i++) { - av_freep(&buf->base[i]); - buf->data[i]= NULL; + pic->linesize[i] = pool->linesize[i]; + + pic->buf[i] = av_buffer_pool_get(pool->pools[i]); + if (!pic->buf[i]) + goto fail; + + // no edge if EDGE EMU or not planar YUV + if ((s->flags & CODEC_FLAG_EMU_EDGE) || !pool->pools[2]) + pic->data[i] = pic->buf[i]->data; + else { + pic->data[i] = pic->buf[i]->data + + FFALIGN((pic->linesize[i] * EDGE_WIDTH >> v_shift) + + (pixel_size * EDGE_WIDTH >> h_shift), pool->stride_align[i]); } } + for (; i < AV_NUM_DATA_POINTERS; i++) { + pic->data[i] = NULL; + pic->linesize[i] = 0; + } + if (pic->data[1] && !pic->data[2]) + avpriv_set_systematic_pal2((uint32_t *)pic->data[1], s->pix_fmt); - if (!buf->base[0]) { - int h_chroma_shift, v_chroma_shift; - int size[4] = {0}; - int tmpsize; - int unaligned; - AVPicture picture; - int stride_align[AV_NUM_DATA_POINTERS]; - const int pixel_size = av_pix_fmt_descriptors[s->pix_fmt].comp[0].step_minus1+1; + if (s->debug & FF_DEBUG_BUFFERS) + av_log(s, AV_LOG_DEBUG, "default_get_buffer called on pic %p\n", pic); - avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift); + return 0; +fail: + av_frame_unref(pic); + return AVERROR(ENOMEM); +} - avcodec_align_dimensions2(s, &w, &h, stride_align); +int avcodec_default_get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags) +{ + int ret; - if(!(s->flags&CODEC_FLAG_EMU_EDGE)){ - w+= EDGE_WIDTH*2; - h+= EDGE_WIDTH*2; - } + if ((ret = update_frame_pool(avctx, frame)) < 0) + return ret; - do { - // NOTE: do not align linesizes individually, this breaks e.g. assumptions - // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2 - av_image_fill_linesizes(picture.linesize, s->pix_fmt, w); - // increase alignment of w for next try (rhs gives the lowest bit set in w) - w += w & ~(w-1); +#if FF_API_GET_BUFFER +FF_DISABLE_DEPRECATION_WARNINGS + frame->type = FF_BUFFER_TYPE_INTERNAL; +FF_ENABLE_DEPRECATION_WARNINGS +#endif - unaligned = 0; - for (i=0; i<4; i++){ - unaligned |= picture.linesize[i] % stride_align[i]; - } - } while (unaligned); + switch (avctx->codec_type) { + case AVMEDIA_TYPE_VIDEO: + return video_get_buffer(avctx, frame); + case AVMEDIA_TYPE_AUDIO: + return audio_get_buffer(avctx, frame); + default: + return -1; + } +} - tmpsize = av_image_fill_pointers(picture.data, s->pix_fmt, h, NULL, picture.linesize); - if (tmpsize < 0) - return -1; +#if FF_API_GET_BUFFER +FF_DISABLE_DEPRECATION_WARNINGS +int avcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame) +{ + return avcodec_default_get_buffer2(avctx, frame, 0); +} - for (i=0; i<3 && picture.data[i+1]; i++) - size[i] = picture.data[i+1] - picture.data[i]; - size[i] = tmpsize - (picture.data[i] - picture.data[0]); +typedef struct CompatReleaseBufPriv { + AVCodecContext avctx; + AVFrame frame; +} CompatReleaseBufPriv; - memset(buf->base, 0, sizeof(buf->base)); - memset(buf->data, 0, sizeof(buf->data)); +static void compat_free_buffer(void *opaque, uint8_t *data) +{ + CompatReleaseBufPriv *priv = opaque; + if (priv->avctx.release_buffer) + priv->avctx.release_buffer(&priv->avctx, &priv->frame); + av_freep(&priv); +} - for(i=0; i<4 && size[i]; i++){ - const int h_shift= i==0 ? 0 : h_chroma_shift; - const int v_shift= i==0 ? 0 : v_chroma_shift; +static void compat_release_buffer(void *opaque, uint8_t *data) +{ + AVBufferRef *buf = opaque; + av_buffer_unref(&buf); +} +FF_ENABLE_DEPRECATION_WARNINGS +#endif - buf->linesize[i]= picture.linesize[i]; +int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) +{ + int ret; - buf->base[i]= av_malloc(size[i]+16); //FIXME 16 - if(buf->base[i]==NULL) return -1; - memset(buf->base[i], 128, size[i]); + switch (avctx->codec_type) { + case AVMEDIA_TYPE_VIDEO: + frame->width = FFMAX(avctx->width, avctx->coded_width); + frame->height = FFMAX(avctx->height, avctx->coded_height); + if (frame->format < 0) + frame->format = avctx->pix_fmt; + if (!frame->sample_aspect_ratio.num) + frame->sample_aspect_ratio = avctx->sample_aspect_ratio; + + if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0) + return ret; + break; + case AVMEDIA_TYPE_AUDIO: + if (!frame->sample_rate) + frame->sample_rate = avctx->sample_rate; + if (frame->format < 0) + frame->format = avctx->sample_fmt; + if (!frame->channel_layout) { + if (avctx->channel_layout) { + if (av_get_channel_layout_nb_channels(avctx->channel_layout) != + avctx->channels) { + av_log(avctx, AV_LOG_ERROR, "Inconsistent channel " + "configuration.\n"); + return AVERROR(EINVAL); + } + + frame->channel_layout = avctx->channel_layout; + } else { + if (avctx->channels > FF_SANE_NB_CHANNELS) { + av_log(avctx, AV_LOG_ERROR, "Too many channels: %d.\n", + avctx->channels); + return AVERROR(ENOSYS); + } - // no edge if EDGE EMU or not planar YUV - if((s->flags&CODEC_FLAG_EMU_EDGE) || !size[2]) - buf->data[i] = buf->base[i]; - else - buf->data[i] = buf->base[i] + FFALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (pixel_size*EDGE_WIDTH>>h_shift), stride_align[i]); - } - for (; i < AV_NUM_DATA_POINTERS; i++) { - buf->base[i] = buf->data[i] = NULL; - buf->linesize[i] = 0; + frame->channel_layout = av_get_default_channel_layout(avctx->channels); + if (!frame->channel_layout) + frame->channel_layout = (1ULL << avctx->channels) - 1; + } } - if(size[1] && !size[2]) - ff_set_systematic_pal2((uint32_t*)buf->data[1], s->pix_fmt); - buf->width = s->width; - buf->height = s->height; - buf->pix_fmt= s->pix_fmt; + break; + default: return AVERROR(EINVAL); } - pic->type= FF_BUFFER_TYPE_INTERNAL; - for (i = 0; i < AV_NUM_DATA_POINTERS; i++) { - pic->base[i]= buf->base[i]; - pic->data[i]= buf->data[i]; - pic->linesize[i]= buf->linesize[i]; - } - pic->extended_data = pic->data; - avci->buffer_count++; - pic->width = buf->width; - pic->height = buf->height; - pic->format = buf->pix_fmt; - pic->sample_aspect_ratio = s->sample_aspect_ratio; + frame->pkt_pts = avctx->internal->pkt ? avctx->internal->pkt->pts : AV_NOPTS_VALUE; + frame->reordered_opaque = avctx->reordered_opaque; - if(s->pkt) pic->pkt_pts= s->pkt->pts; - else pic->pkt_pts= AV_NOPTS_VALUE; - pic->reordered_opaque= s->reordered_opaque; +#if FF_API_GET_BUFFER +FF_DISABLE_DEPRECATION_WARNINGS + /* + * Wrap an old get_buffer()-allocated buffer in an bunch of AVBuffers. + * We wrap each plane in its own AVBuffer. Each of those has a reference to + * a dummy AVBuffer as its private data, unreffing it on free. + * When all the planes are freed, the dummy buffer's free callback calls + * release_buffer(). + */ + if (avctx->get_buffer) { + CompatReleaseBufPriv *priv = NULL; + AVBufferRef *dummy_buf = NULL; + int planes, i, ret; - if(s->debug&FF_DEBUG_BUFFERS) - av_log(s, AV_LOG_DEBUG, "default_get_buffer called on pic %p, %d " - "buffers used\n", pic, avci->buffer_count); + if (flags & AV_GET_BUFFER_FLAG_REF) + frame->reference = 1; - return 0; -} + ret = avctx->get_buffer(avctx, frame); + if (ret < 0) + return ret; -int avcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame) -{ - switch (avctx->codec_type) { - case AVMEDIA_TYPE_VIDEO: - return video_get_buffer(avctx, frame); - case AVMEDIA_TYPE_AUDIO: - return audio_get_buffer(avctx, frame); - default: - return -1; - } -} + /* return if the buffers are already set up + * this would happen e.g. when a custom get_buffer() calls + * avcodec_default_get_buffer + */ + if (frame->buf[0]) + return 0; -void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic){ - int i; - InternalBuffer *buf, *last; - AVCodecInternal *avci = s->internal; + priv = av_mallocz(sizeof(*priv)); + if (!priv) { + ret = AVERROR(ENOMEM); + goto fail; + } + priv->avctx = *avctx; + priv->frame = *frame; - assert(s->codec_type == AVMEDIA_TYPE_VIDEO); + dummy_buf = av_buffer_create(NULL, 0, compat_free_buffer, priv, 0); + if (!dummy_buf) { + ret = AVERROR(ENOMEM); + goto fail; + } + +#define WRAP_PLANE(ref_out, data, data_size) \ +do { \ + AVBufferRef *dummy_ref = av_buffer_ref(dummy_buf); \ + if (!dummy_ref) { \ + ret = AVERROR(ENOMEM); \ + goto fail; \ + } \ + ref_out = av_buffer_create(data, data_size, compat_release_buffer, \ + dummy_ref, 0); \ + if (!ref_out) { \ + av_frame_unref(frame); \ + ret = AVERROR(ENOMEM); \ + goto fail; \ + } \ +} while (0) + + if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); + + planes = av_pix_fmt_count_planes(frame->format); + /* workaround for AVHWAccel plane count of 0, buf[0] is used as + check for allocated buffers: make libavcodec happy */ + if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL) + planes = 1; + if (!desc || planes <= 0) { + ret = AVERROR(EINVAL); + goto fail; + } - assert(pic->type==FF_BUFFER_TYPE_INTERNAL); - assert(avci->buffer_count); + for (i = 0; i < planes; i++) { + int v_shift = (i == 1 || i == 2) ? desc->log2_chroma_h : 0; + int plane_size = (frame->height >> v_shift) * frame->linesize[i]; - if (avci->buffer) { - buf = NULL; /* avoids warning */ - for (i = 0; i < avci->buffer_count; i++) { //just 3-5 checks so is not worth to optimize - buf = &avci->buffer[i]; - if (buf->data[0] == pic->data[0]) - break; + WRAP_PLANE(frame->buf[i], frame->data[i], plane_size); + } + } else { + int planar = av_sample_fmt_is_planar(frame->format); + planes = planar ? avctx->channels : 1; + + if (planes > FF_ARRAY_ELEMS(frame->buf)) { + frame->nb_extended_buf = planes - FF_ARRAY_ELEMS(frame->buf); + frame->extended_buf = av_malloc(sizeof(*frame->extended_buf) * + frame->nb_extended_buf); + if (!frame->extended_buf) { + ret = AVERROR(ENOMEM); + goto fail; + } + } + + for (i = 0; i < FFMIN(planes, FF_ARRAY_ELEMS(frame->buf)); i++) + WRAP_PLANE(frame->buf[i], frame->extended_data[i], frame->linesize[0]); + + for (i = 0; i < frame->nb_extended_buf; i++) + WRAP_PLANE(frame->extended_buf[i], + frame->extended_data[i + FF_ARRAY_ELEMS(frame->buf)], + frame->linesize[0]); } - assert(i < avci->buffer_count); - avci->buffer_count--; - last = &avci->buffer[avci->buffer_count]; - if (buf != last) - FFSWAP(InternalBuffer, *buf, *last); + av_buffer_unref(&dummy_buf); + + frame->width = avctx->width; + frame->height = avctx->height; + + return 0; + +fail: + avctx->release_buffer(avctx, frame); + av_freep(&priv); + av_buffer_unref(&dummy_buf); + return ret; } +FF_ENABLE_DEPRECATION_WARNINGS +#endif + + ret = avctx->get_buffer2(avctx, frame, flags); - for (i = 0; i < AV_NUM_DATA_POINTERS; i++) { - pic->data[i]=NULL; -// pic->base[i]=NULL; + if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { + frame->width = avctx->width; + frame->height = avctx->height; } -//printf("R%X\n", pic->opaque); - if(s->debug&FF_DEBUG_BUFFERS) - av_log(s, AV_LOG_DEBUG, "default_release_buffer called on pic %p, %d " - "buffers used\n", pic, avci->buffer_count); + return ret; } -int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){ - AVFrame temp_pic; - int i; - - assert(s->codec_type == AVMEDIA_TYPE_VIDEO); +int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame) +{ + AVFrame tmp; + int ret; - /* If no picture return a new buffer */ - if(pic->data[0] == NULL) { - /* We will copy from buffer, so must be readable */ - pic->buffer_hints |= FF_BUFFER_HINTS_READABLE; - return s->get_buffer(s, pic); - } + av_assert0(avctx->codec_type == AVMEDIA_TYPE_VIDEO); - assert(s->pix_fmt == pic->format); + if (!frame->data[0]) + return ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF); - /* If internal buffer type return the same buffer */ - if(pic->type == FF_BUFFER_TYPE_INTERNAL) { - if(s->pkt) pic->pkt_pts= s->pkt->pts; - else pic->pkt_pts= AV_NOPTS_VALUE; - pic->reordered_opaque= s->reordered_opaque; + if (av_frame_is_writable(frame)) return 0; + + av_frame_move_ref(&tmp, frame); + + ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF); + if (ret < 0) { + av_frame_unref(&tmp); + return ret; } - /* - * Not internal type and reget_buffer not overridden, emulate cr buffer - */ - temp_pic = *pic; - for(i = 0; i < AV_NUM_DATA_POINTERS; i++) - pic->data[i] = pic->base[i] = NULL; - pic->opaque = NULL; - /* Allocate new frame */ - if (s->get_buffer(s, pic)) - return -1; - /* Copy image data from old buffer to new buffer */ - av_picture_copy((AVPicture*)pic, (AVPicture*)&temp_pic, s->pix_fmt, s->width, - s->height); - s->release_buffer(s, &temp_pic); // Release old frame + av_image_copy(frame->data, frame->linesize, tmp.data, tmp.linesize, + frame->format, frame->width, frame->height); + + av_frame_unref(&tmp); + return 0; } -int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){ +#if FF_API_GET_BUFFER +void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic) +{ + av_frame_unref(pic); +} + +int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic) +{ + av_assert0(0); + return AVERROR_BUG; +} +#endif + +int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2), void *arg, int *ret, int count, int size) +{ int i; - for(i=0; iflags & AV_PIX_FMT_FLAG_HWACCEL; +} + +enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat *fmt) +{ + while (*fmt != AV_PIX_FMT_NONE && is_hwaccel_pix_fmt(*fmt)) ++fmt; return fmt[0]; } -void avcodec_get_frame_defaults(AVFrame *pic){ - memset(pic, 0, sizeof(AVFrame)); +void avcodec_get_frame_defaults(AVFrame *frame) +{ + if (frame->extended_data != frame->data) + av_freep(&frame->extended_data); + + memset(frame, 0, sizeof(AVFrame)); + + frame->pts = AV_NOPTS_VALUE; + frame->key_frame = 1; + frame->sample_aspect_ratio = (AVRational) {0, 1 }; + frame->format = -1; /* unknown */ + frame->extended_data = frame->data; +} + +#if FF_API_AVFRAME_LAVC +AVFrame *avcodec_alloc_frame(void) +{ + AVFrame *frame = av_mallocz(sizeof(AVFrame)); + + if (frame == NULL) + return NULL; + + avcodec_get_frame_defaults(frame); - pic->pts= AV_NOPTS_VALUE; - pic->key_frame= 1; - pic->sample_aspect_ratio = (AVRational){0, 1}; - pic->format = -1; /* unknown */ + return frame; } +#endif -AVFrame *avcodec_alloc_frame(void){ - AVFrame *pic= av_malloc(sizeof(AVFrame)); +void avcodec_free_frame(AVFrame **frame) +{ + AVFrame *f; - if(pic==NULL) return NULL; + if (!frame || !*frame) + return; + + f = *frame; - avcodec_get_frame_defaults(pic); + if (f->extended_data != f->data) + av_freep(&f->extended_data); - return pic; + av_freep(frame); } -int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) +int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) { int ret = 0; AVDictionary *tmp = NULL; @@ -641,7 +858,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD } if ((codec && avctx->codec && codec != avctx->codec)) { av_log(avctx, AV_LOG_ERROR, "This AVCodecContext was allocated for %s, " - "but %s passed to avcodec_open2().\n", avctx->codec->name, codec->name); + "but %s passed to avcodec_open2().\n", avctx->codec->name, codec->name); return AVERROR(EINVAL); } if (!codec) @@ -654,13 +871,13 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD av_dict_copy(&tmp, *options, 0); /* If there is a user-supplied mutex locking routine, call it. */ - if (ff_lockmgr_cb) { - if ((*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN)) + if (lockmgr_cb) { + if ((*lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN)) return -1; } entangled_thread_counter++; - if(entangled_thread_counter != 1){ + if (entangled_thread_counter != 1) { av_log(avctx, AV_LOG_ERROR, "insufficient thread locking around avcodec_open/close()\n"); ret = -1; goto end; @@ -672,70 +889,83 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD goto end; } + avctx->internal->pool = av_mallocz(sizeof(*avctx->internal->pool)); + if (!avctx->internal->pool) { + ret = AVERROR(ENOMEM); + goto free_and_end; + } + if (codec->priv_data_size > 0) { - if(!avctx->priv_data){ - avctx->priv_data = av_mallocz(codec->priv_data_size); if (!avctx->priv_data) { - ret = AVERROR(ENOMEM); - goto end; - } - if (codec->priv_class) { - *(AVClass**)avctx->priv_data= codec->priv_class; - av_opt_set_defaults(avctx->priv_data); + avctx->priv_data = av_mallocz(codec->priv_data_size); + if (!avctx->priv_data) { + ret = AVERROR(ENOMEM); + goto end; + } + if (codec->priv_class) { + *(const AVClass **)avctx->priv_data = codec->priv_class; + av_opt_set_defaults(avctx->priv_data); + } } - } - if (codec->priv_class && (ret = av_opt_set_dict(avctx->priv_data, &tmp)) < 0) - goto free_and_end; + if (codec->priv_class && (ret = av_opt_set_dict(avctx->priv_data, &tmp)) < 0) + goto free_and_end; } else { avctx->priv_data = NULL; } if ((ret = av_opt_set_dict(avctx, &tmp)) < 0) goto free_and_end; - if(avctx->coded_width && avctx->coded_height) - avcodec_set_dimensions(avctx, avctx->coded_width, avctx->coded_height); - else if(avctx->width && avctx->height) - avcodec_set_dimensions(avctx, avctx->width, avctx->height); + if (avctx->coded_width && avctx->coded_height && !avctx->width && !avctx->height) + ret = ff_set_dimensions(avctx, avctx->coded_width, avctx->coded_height); + else if (avctx->width && avctx->height) + ret = ff_set_dimensions(avctx, avctx->width, avctx->height); + if (ret < 0) + goto free_and_end; if ((avctx->coded_width || avctx->coded_height || avctx->width || avctx->height) && ( av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx) < 0 || av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0)) { av_log(avctx, AV_LOG_WARNING, "ignoring invalid width/height values\n"); - avcodec_set_dimensions(avctx, 0, 0); + ff_set_dimensions(avctx, 0, 0); } /* if the decoder init function was already called previously, - free the already allocated subtitle_header before overwriting it */ + * free the already allocated subtitle_header before overwriting it */ if (av_codec_is_decoder(codec)) av_freep(&avctx->subtitle_header); -#define SANE_NB_CHANNELS 128U - if (avctx->channels > SANE_NB_CHANNELS) { + if (avctx->channels > FF_SANE_NB_CHANNELS) { ret = AVERROR(EINVAL); goto free_and_end; } avctx->codec = codec; if ((avctx->codec_type == AVMEDIA_TYPE_UNKNOWN || avctx->codec_type == codec->type) && - avctx->codec_id == CODEC_ID_NONE) { + avctx->codec_id == AV_CODEC_ID_NONE) { avctx->codec_type = codec->type; avctx->codec_id = codec->id; } if (avctx->codec_id != codec->id || (avctx->codec_type != codec->type - && avctx->codec_type != AVMEDIA_TYPE_ATTACHMENT)) { + && avctx->codec_type != AVMEDIA_TYPE_ATTACHMENT)) { av_log(avctx, AV_LOG_ERROR, "codec type or id mismatches\n"); ret = AVERROR(EINVAL); goto free_and_end; } avctx->frame_number = 0; + if (avctx->codec->capabilities & CODEC_CAP_EXPERIMENTAL && + avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { + ret = AVERROR_EXPERIMENTAL; + goto free_and_end; + } + if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && (!avctx->time_base.num || !avctx->time_base.den)) { avctx->time_base.num = 1; avctx->time_base.den = avctx->sample_rate; } - if (HAVE_THREADS && !avctx->thread_opaque) { + if (HAVE_THREADS) { ret = ff_thread_init(avctx); if (ret < 0) { goto free_and_end; @@ -747,9 +977,16 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD if (av_codec_is_encoder(avctx->codec)) { int i; if (avctx->codec->sample_fmts) { - for (i = 0; avctx->codec->sample_fmts[i] != AV_SAMPLE_FMT_NONE; i++) + for (i = 0; avctx->codec->sample_fmts[i] != AV_SAMPLE_FMT_NONE; i++) { if (avctx->sample_fmt == avctx->codec->sample_fmts[i]) break; + if (avctx->channels == 1 && + av_get_planar_sample_fmt(avctx->sample_fmt) == + av_get_planar_sample_fmt(avctx->codec->sample_fmts[i])) { + avctx->sample_fmt = avctx->codec->sample_fmts[i]; + break; + } + } if (avctx->codec->sample_fmts[i] == AV_SAMPLE_FMT_NONE) { av_log(avctx, AV_LOG_ERROR, "Specified sample_fmt is not supported.\n"); ret = AVERROR(EINVAL); @@ -757,10 +994,10 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD } } if (avctx->codec->pix_fmts) { - for (i = 0; avctx->codec->pix_fmts[i] != PIX_FMT_NONE; i++) + for (i = 0; avctx->codec->pix_fmts[i] != AV_PIX_FMT_NONE; i++) if (avctx->pix_fmt == avctx->codec->pix_fmts[i]) break; - if (avctx->codec->pix_fmts[i] == PIX_FMT_NONE) { + if (avctx->codec->pix_fmts[i] == AV_PIX_FMT_NONE) { av_log(avctx, AV_LOG_ERROR, "Specified pix_fmt is not supported\n"); ret = AVERROR(EINVAL); goto free_and_end; @@ -799,9 +1036,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD } else if (avctx->channel_layout) { avctx->channels = av_get_channel_layout_nb_channels(avctx->channel_layout); } + + if (!avctx->rc_initial_buffer_occupancy) + avctx->rc_initial_buffer_occupancy = avctx->rc_buffer_size * 3 / 4; } - if(avctx->codec->init && !(avctx->active_thread_type&FF_THREAD_FRAME)){ + if (avctx->codec->init && !(avctx->active_thread_type & FF_THREAD_FRAME)) { ret = avctx->codec->init(avctx); if (ret < 0) { goto free_and_end; @@ -810,18 +1050,28 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD if (av_codec_is_decoder(avctx->codec)) { /* validate channel layout from the decoder */ - if (avctx->channel_layout && - av_get_channel_layout_nb_channels(avctx->channel_layout) != avctx->channels) { - av_log(avctx, AV_LOG_WARNING, "channel layout does not match number of channels\n"); - avctx->channel_layout = 0; + if (avctx->channel_layout) { + int channels = av_get_channel_layout_nb_channels(avctx->channel_layout); + if (!avctx->channels) + avctx->channels = channels; + else if (channels != avctx->channels) { + av_log(avctx, AV_LOG_WARNING, + "channel layout does not match number of channels\n"); + avctx->channel_layout = 0; + } + } + if (avctx->channels && avctx->channels < 0 || + avctx->channels > FF_SANE_NB_CHANNELS) { + ret = AVERROR(EINVAL); + goto free_and_end; } } end: entangled_thread_counter--; /* Release any user-supplied mutex. */ - if (ff_lockmgr_cb) { - (*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE); + if (lockmgr_cb) { + (*lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE); } if (options) { av_dict_free(options); @@ -832,8 +1082,10 @@ end: free_and_end: av_dict_free(&tmp); av_freep(&avctx->priv_data); + if (avctx->internal) + av_freep(&avctx->internal->pool); av_freep(&avctx->internal); - avctx->codec= NULL; + avctx->codec = NULL; goto end; } @@ -843,55 +1095,129 @@ int ff_alloc_packet(AVPacket *avpkt, int size) return AVERROR(EINVAL); if (avpkt->data) { + AVBufferRef *buf = avpkt->buf; +#if FF_API_DESTRUCT_PACKET +FF_DISABLE_DEPRECATION_WARNINGS void *destruct = avpkt->destruct; +FF_ENABLE_DEPRECATION_WARNINGS +#endif if (avpkt->size < size) return AVERROR(EINVAL); av_init_packet(avpkt); +#if FF_API_DESTRUCT_PACKET +FF_DISABLE_DEPRECATION_WARNINGS avpkt->destruct = destruct; - avpkt->size = size; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + avpkt->buf = buf; + avpkt->size = size; return 0; } else { return av_new_packet(avpkt, size); } } +/** + * Pad last frame with silence. + */ +static int pad_last_frame(AVCodecContext *s, AVFrame **dst, const AVFrame *src) +{ + AVFrame *frame = NULL; + int ret; + + if (!(frame = av_frame_alloc())) + return AVERROR(ENOMEM); + + frame->format = src->format; + frame->channel_layout = src->channel_layout; + frame->nb_samples = s->frame_size; + ret = av_frame_get_buffer(frame, 32); + if (ret < 0) + goto fail; + + ret = av_frame_copy_props(frame, src); + if (ret < 0) + goto fail; + + if ((ret = av_samples_copy(frame->extended_data, src->extended_data, 0, 0, + src->nb_samples, s->channels, s->sample_fmt)) < 0) + goto fail; + if ((ret = av_samples_set_silence(frame->extended_data, src->nb_samples, + frame->nb_samples - src->nb_samples, + s->channels, s->sample_fmt)) < 0) + goto fail; + + *dst = frame; + + return 0; + +fail: + av_frame_free(&frame); + return ret; +} + int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr) { + AVFrame tmp; + AVFrame *padded_frame = NULL; int ret; int user_packet = !!avpkt->data; - int nb_samples; *got_packet_ptr = 0; if (!(avctx->codec->capabilities & CODEC_CAP_DELAY) && !frame) { av_free_packet(avpkt); av_init_packet(avpkt); - avpkt->size = 0; return 0; } + /* ensure that extended_data is properly set */ + if (frame && !frame->extended_data) { + if (av_sample_fmt_is_planar(avctx->sample_fmt) && + avctx->channels > AV_NUM_DATA_POINTERS) { + av_log(avctx, AV_LOG_ERROR, "Encoding to a planar sample format, " + "with more than %d channels, but extended_data is not set.\n", + AV_NUM_DATA_POINTERS); + return AVERROR(EINVAL); + } + av_log(avctx, AV_LOG_WARNING, "extended_data is not set.\n"); + + tmp = *frame; + tmp.extended_data = tmp.data; + frame = &tmp; + } + /* check for valid frame size */ if (frame) { - nb_samples = frame->nb_samples; if (avctx->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) { - if (nb_samples > avctx->frame_size) + if (frame->nb_samples > avctx->frame_size) return AVERROR(EINVAL); } else if (!(avctx->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) { - if (nb_samples != avctx->frame_size) - return AVERROR(EINVAL); + if (frame->nb_samples < avctx->frame_size && + !avctx->internal->last_audio_frame) { + ret = pad_last_frame(avctx, &padded_frame, frame); + if (ret < 0) + return ret; + + frame = padded_frame; + avctx->internal->last_audio_frame = 1; + } + + if (frame->nb_samples != avctx->frame_size) { + ret = AVERROR(EINVAL); + goto end; + } } - } else { - nb_samples = avctx->frame_size; } - if (avctx->codec->encode2) { - ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr); - if (!ret && *got_packet_ptr) { + ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr); + if (!ret) { + if (*got_packet_ptr) { if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) { if (avpkt->pts == AV_NOPTS_VALUE) avpkt->pts = frame->pts; @@ -903,202 +1229,32 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, } else { avpkt->size = 0; } - } else { - /* for compatibility with encoders not supporting encode2(), we need to - allocate a packet buffer if the user has not provided one or check - the size otherwise */ - int fs_tmp = 0; - int buf_size = avpkt->size; - if (!user_packet) { - if (avctx->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) { - av_assert0(av_get_bits_per_sample(avctx->codec_id) != 0); - buf_size = nb_samples * avctx->channels * - av_get_bits_per_sample(avctx->codec_id) / 8; - } else { - /* this is a guess as to the required size. - if an encoder needs more than this, it should probably - implement encode2() */ - buf_size = 2 * avctx->frame_size * avctx->channels * - av_get_bytes_per_sample(avctx->sample_fmt); - buf_size += FF_MIN_BUFFER_SIZE; - } - } - if ((ret = ff_alloc_packet(avpkt, buf_size))) - return ret; - - /* Encoders using AVCodec.encode() that support - CODEC_CAP_SMALL_LAST_FRAME require avctx->frame_size to be set to - the smaller size when encoding the last frame. - This code can be removed once all encoders supporting - CODEC_CAP_SMALL_LAST_FRAME use encode2() */ - if ((avctx->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) && - nb_samples < avctx->frame_size) { - fs_tmp = avctx->frame_size; - avctx->frame_size = nb_samples; - } - /* encode the frame */ - ret = avctx->codec->encode(avctx, avpkt->data, avpkt->size, - frame ? frame->data[0] : NULL); - if (ret >= 0) { - if (!ret) { - /* no output. if the packet data was allocated by libavcodec, - free it */ - if (!user_packet) - av_freep(&avpkt->data); - } else { - if (avctx->coded_frame) - avpkt->pts = avpkt->dts = avctx->coded_frame->pts; - /* Set duration for final small packet. This can be removed - once all encoders supporting CODEC_CAP_SMALL_LAST_FRAME use - encode2() */ - if (fs_tmp) { - avpkt->duration = ff_samples_to_time_base(avctx, - avctx->frame_size); - } - } - avpkt->size = ret; - *got_packet_ptr = (ret > 0); - ret = 0; - } - - if (fs_tmp) - avctx->frame_size = fs_tmp; - } - if (!ret) { if (!user_packet && avpkt->size) { - uint8_t *new_data = av_realloc(avpkt->data, avpkt->size); - if (new_data) - avpkt->data = new_data; + ret = av_buffer_realloc(&avpkt->buf, avpkt->size); + if (ret >= 0) + avpkt->data = avpkt->buf->data; } avctx->frame_number++; } - if (ret < 0 || !*got_packet_ptr) + if (ret < 0 || !*got_packet_ptr) { av_free_packet(avpkt); + av_init_packet(avpkt); + goto end; + } /* NOTE: if we add any audio encoders which output non-keyframe packets, - this needs to be moved to the encoders, but for now we can do it - here to simplify things */ + * this needs to be moved to the encoders, but for now we can do it + * here to simplify things */ avpkt->flags |= AV_PKT_FLAG_KEY; - return ret; -} - -#if FF_API_OLD_DECODE_AUDIO -int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx, - uint8_t *buf, int buf_size, - const short *samples) -{ - AVPacket pkt; - AVFrame frame0; - AVFrame *frame; - int ret, samples_size, got_packet; - - av_init_packet(&pkt); - pkt.data = buf; - pkt.size = buf_size; - - if (samples) { - frame = &frame0; - avcodec_get_frame_defaults(frame); - - if (avctx->frame_size) { - frame->nb_samples = avctx->frame_size; - } else { - /* if frame_size is not set, the number of samples must be - calculated from the buffer size */ - int64_t nb_samples; - if (!av_get_bits_per_sample(avctx->codec_id)) { - av_log(avctx, AV_LOG_ERROR, "avcodec_encode_audio() does not " - "support this codec\n"); - return AVERROR(EINVAL); - } - nb_samples = (int64_t)buf_size * 8 / - (av_get_bits_per_sample(avctx->codec_id) * - avctx->channels); - if (nb_samples >= INT_MAX) - return AVERROR(EINVAL); - frame->nb_samples = nb_samples; - } - - /* it is assumed that the samples buffer is large enough based on the - relevant parameters */ - samples_size = av_samples_get_buffer_size(NULL, avctx->channels, - frame->nb_samples, - avctx->sample_fmt, 1); - if ((ret = avcodec_fill_audio_frame(frame, avctx->channels, - avctx->sample_fmt, - samples, samples_size, 1))) - return ret; - - /* fabricate frame pts from sample count. - this is needed because the avcodec_encode_audio() API does not have - a way for the user to provide pts */ - frame->pts = ff_samples_to_time_base(avctx, - avctx->internal->sample_count); - avctx->internal->sample_count += frame->nb_samples; - } else { - frame = NULL; - } - - got_packet = 0; - ret = avcodec_encode_audio2(avctx, &pkt, frame, &got_packet); - if (!ret && got_packet && avctx->coded_frame) { - avctx->coded_frame->pts = pkt.pts; - avctx->coded_frame->key_frame = !!(pkt.flags & AV_PKT_FLAG_KEY); - } - /* free any side data since we cannot return it */ - if (pkt.side_data_elems > 0) { - int i; - for (i = 0; i < pkt.side_data_elems; i++) - av_free(pkt.side_data[i].data); - av_freep(&pkt.side_data); - pkt.side_data_elems = 0; - } - - if (frame && frame->extended_data != frame->data) - av_free(frame->extended_data); - - return ret ? ret : pkt.size; -} -#endif - -#if FF_API_OLD_ENCODE_VIDEO -int attribute_align_arg avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size, - const AVFrame *pict) -{ - AVPacket pkt; - int ret, got_packet = 0; - - if(buf_size < FF_MIN_BUFFER_SIZE){ - av_log(avctx, AV_LOG_ERROR, "buffer smaller than minimum size\n"); - return -1; - } - - av_init_packet(&pkt); - pkt.data = buf; - pkt.size = buf_size; - - ret = avcodec_encode_video2(avctx, &pkt, pict, &got_packet); - if (!ret && got_packet && avctx->coded_frame) { - avctx->coded_frame->pts = pkt.pts; - avctx->coded_frame->key_frame = !!(pkt.flags & AV_PKT_FLAG_KEY); - } - - /* free any side data since we cannot return it */ - if (pkt.side_data_elems > 0) { - int i; - for (i = 0; i < pkt.side_data_elems; i++) - av_free(pkt.side_data[i].data); - av_freep(&pkt.side_data); - pkt.side_data_elems = 0; - } +end: + av_frame_free(&padded_frame); - return ret ? ret : pkt.size; + return ret; } -#endif int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt, @@ -1113,7 +1269,7 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, if (!(avctx->codec->capabilities & CODEC_CAP_DELAY) && !frame) { av_free_packet(avpkt); av_init_packet(avpkt); - avpkt->size = 0; + avpkt->size = 0; return 0; } @@ -1130,9 +1286,9 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, avpkt->pts = avpkt->dts = frame->pts; if (!user_packet && avpkt->size) { - uint8_t *new_data = av_realloc(avpkt->data, avpkt->size); - if (new_data) - avpkt->data = new_data; + ret = av_buffer_realloc(&avpkt->buf, avpkt->size); + if (ret >= 0) + avpkt->data = avpkt->buf->data; } avctx->frame_number++; @@ -1149,160 +1305,163 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, const AVSubtitle *sub) { int ret; - if(sub->start_display_time) { + if (sub->start_display_time) { av_log(avctx, AV_LOG_ERROR, "start_display_time must be 0.\n"); return -1; } - if(sub->num_rects == 0 || !sub->rects) + if (sub->num_rects == 0 || !sub->rects) return -1; - ret = avctx->codec->encode(avctx, buf, buf_size, sub); + ret = avctx->codec->encode_sub(avctx, buf, buf_size, sub); avctx->frame_number++; return ret; } -static void apply_param_change(AVCodecContext *avctx, AVPacket *avpkt) +static int apply_param_change(AVCodecContext *avctx, AVPacket *avpkt) { - int size = 0; + int size = 0, ret; const uint8_t *data; uint32_t flags; - if (!(avctx->codec->capabilities & CODEC_CAP_PARAM_CHANGE)) - return; - data = av_packet_get_side_data(avpkt, AV_PKT_DATA_PARAM_CHANGE, &size); - if (!data || size < 4) - return; + if (!data) + return 0; + + if (!(avctx->codec->capabilities & CODEC_CAP_PARAM_CHANGE)) { + av_log(avctx, AV_LOG_ERROR, "This decoder does not support parameter " + "changes, but PARAM_CHANGE side data was sent to it.\n"); + return AVERROR(EINVAL); + } + + if (size < 4) + goto fail; + flags = bytestream_get_le32(&data); size -= 4; - if (size < 4) /* Required for any of the changes */ - return; + if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) { + if (size < 4) + goto fail; avctx->channels = bytestream_get_le32(&data); size -= 4; } if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT) { if (size < 8) - return; + goto fail; avctx->channel_layout = bytestream_get_le64(&data); size -= 8; } - if (size < 4) - return; if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) { + if (size < 4) + goto fail; avctx->sample_rate = bytestream_get_le32(&data); size -= 4; } if (flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS) { if (size < 8) - return; + goto fail; avctx->width = bytestream_get_le32(&data); avctx->height = bytestream_get_le32(&data); - avcodec_set_dimensions(avctx, avctx->width, avctx->height); size -= 8; + ret = ff_set_dimensions(avctx, avctx->width, avctx->height); + if (ret < 0) + return ret; } + + return 0; +fail: + av_log(avctx, AV_LOG_ERROR, "PARAM_CHANGE side data too small.\n"); + return AVERROR_INVALIDDATA; } int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, - int *got_picture_ptr, - AVPacket *avpkt) + int *got_picture_ptr, + AVPacket *avpkt) { + AVCodecInternal *avci = avctx->internal; int ret; - *got_picture_ptr= 0; - if((avctx->coded_width||avctx->coded_height) && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx)) + *got_picture_ptr = 0; + if ((avctx->coded_width || avctx->coded_height) && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx)) return -1; - avctx->pkt = avpkt; - apply_param_change(avctx, avpkt); + avctx->internal->pkt = avpkt; + ret = apply_param_change(avctx, avpkt); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Error applying parameter changes.\n"); + if (avctx->err_recognition & AV_EF_EXPLODE) + return ret; + } + + avcodec_get_frame_defaults(picture); + + if (!avctx->refcounted_frames) + av_frame_unref(&avci->to_free); - if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size || (avctx->active_thread_type&FF_THREAD_FRAME)){ - if (HAVE_THREADS && avctx->active_thread_type&FF_THREAD_FRAME) - ret = ff_thread_decode_frame(avctx, picture, got_picture_ptr, - avpkt); + if ((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size || (avctx->active_thread_type & FF_THREAD_FRAME)) { + if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME) + ret = ff_thread_decode_frame(avctx, picture, got_picture_ptr, + avpkt); else { ret = avctx->codec->decode(avctx, picture, got_picture_ptr, - avpkt); - picture->pkt_dts= avpkt->dts; - picture->sample_aspect_ratio = avctx->sample_aspect_ratio; - picture->width = avctx->width; - picture->height = avctx->height; - picture->format = avctx->pix_fmt; + avpkt); + picture->pkt_dts = avpkt->dts; + /* get_buffer is supposed to set frame parameters */ + if (!(avctx->codec->capabilities & CODEC_CAP_DR1)) { + picture->sample_aspect_ratio = avctx->sample_aspect_ratio; + picture->width = avctx->width; + picture->height = avctx->height; + picture->format = avctx->pix_fmt; + } } emms_c(); //needed to avoid an emms_c() call before every return; - if (*got_picture_ptr) - avctx->frame_number++; - }else - ret= 0; + if (ret < 0 && picture->buf[0]) + av_frame_unref(picture); - return ret; -} + if (*got_picture_ptr) { + if (!avctx->refcounted_frames) { + avci->to_free = *picture; + avci->to_free.extended_data = avci->to_free.data; + memset(picture->buf, 0, sizeof(picture->buf)); + } -#if FF_API_OLD_DECODE_AUDIO -int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples, - int *frame_size_ptr, - AVPacket *avpkt) -{ - AVFrame frame; - int ret, got_frame = 0; - - if (avctx->get_buffer != avcodec_default_get_buffer) { - av_log(avctx, AV_LOG_ERROR, "Custom get_buffer() for use with" - "avcodec_decode_audio3() detected. Overriding with avcodec_default_get_buffer\n"); - av_log(avctx, AV_LOG_ERROR, "Please port your application to " - "avcodec_decode_audio4()\n"); - avctx->get_buffer = avcodec_default_get_buffer; - } - - ret = avcodec_decode_audio4(avctx, &frame, &got_frame, avpkt); - - if (ret >= 0 && got_frame) { - int ch, plane_size; - int planar = av_sample_fmt_is_planar(avctx->sample_fmt); - int data_size = av_samples_get_buffer_size(&plane_size, avctx->channels, - frame.nb_samples, - avctx->sample_fmt, 1); - if (*frame_size_ptr < data_size) { - av_log(avctx, AV_LOG_ERROR, "output buffer size is too small for " - "the current frame (%d < %d)\n", *frame_size_ptr, data_size); - return AVERROR(EINVAL); + avctx->frame_number++; } + } else + ret = 0; - memcpy(samples, frame.extended_data[0], plane_size); - - if (planar && avctx->channels > 1) { - uint8_t *out = ((uint8_t *)samples) + plane_size; - for (ch = 1; ch < avctx->channels; ch++) { - memcpy(out, frame.extended_data[ch], plane_size); - out += plane_size; - } - } - *frame_size_ptr = data_size; - } else { - *frame_size_ptr = 0; - } return ret; } -#endif int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, AVPacket *avpkt) { + AVCodecInternal *avci = avctx->internal; int ret = 0; *got_frame_ptr = 0; - avctx->pkt = avpkt; + avctx->internal->pkt = avpkt; if (!avpkt->data && avpkt->size) { av_log(avctx, AV_LOG_ERROR, "invalid packet: NULL data, size != 0\n"); return AVERROR(EINVAL); } - apply_param_change(avctx, avpkt); + ret = apply_param_change(avctx, avpkt); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Error applying parameter changes.\n"); + if (avctx->err_recognition & AV_EF_EXPLODE) + return ret; + } + + avcodec_get_frame_defaults(frame); + + if (!avctx->refcounted_frames) + av_frame_unref(&avci->to_free); if ((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size) { ret = avctx->codec->decode(avctx, frame, got_frame_ptr, avpkt); @@ -1311,18 +1470,29 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, frame->pkt_dts = avpkt->dts; if (frame->format == AV_SAMPLE_FMT_NONE) frame->format = avctx->sample_fmt; - } + + if (!avctx->refcounted_frames) { + avci->to_free = *frame; + avci->to_free.extended_data = avci->to_free.data; + memset(frame->buf, 0, sizeof(frame->buf)); + frame->extended_buf = NULL; + frame->nb_extended_buf = 0; + } + } else if (frame->data[0]) + av_frame_unref(frame); } + + return ret; } int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, - int *got_sub_ptr, - AVPacket *avpkt) + int *got_sub_ptr, + AVPacket *avpkt) { int ret; - avctx->pkt = avpkt; + avctx->internal->pkt = avpkt; *got_sub_ptr = 0; ret = avctx->codec->decode(avctx, sub, got_sub_ptr, avpkt); if (*got_sub_ptr) @@ -1334,8 +1504,7 @@ void avsubtitle_free(AVSubtitle *sub) { int i; - for (i = 0; i < sub->num_rects; i++) - { + for (i = 0; i < sub->num_rects; i++) { av_freep(&sub->rects[i]->pict.data[0]); av_freep(&sub->rects[i]->pict.data[1]); av_freep(&sub->rects[i]->pict.data[2]); @@ -1353,25 +1522,31 @@ void avsubtitle_free(AVSubtitle *sub) av_cold int avcodec_close(AVCodecContext *avctx) { /* If there is a user-supplied mutex locking routine, call it. */ - if (ff_lockmgr_cb) { - if ((*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN)) + if (lockmgr_cb) { + if ((*lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN)) return -1; } entangled_thread_counter++; - if(entangled_thread_counter != 1){ + if (entangled_thread_counter != 1) { av_log(avctx, AV_LOG_ERROR, "insufficient thread locking around avcodec_open/close()\n"); entangled_thread_counter--; return -1; } if (avcodec_is_open(avctx)) { - if (HAVE_THREADS && avctx->thread_opaque) + FramePool *pool = avctx->internal->pool; + int i; + if (HAVE_THREADS && avctx->internal->thread_ctx) ff_thread_free(avctx); if (avctx->codec && avctx->codec->close) avctx->codec->close(avctx); - avcodec_default_free_buffers(avctx); avctx->coded_frame = NULL; + if (!avctx->refcounted_frames) + av_frame_unref(&avctx->internal->to_free); + for (i = 0; i < FF_ARRAY_ELEMS(pool->pools); i++) + av_buffer_pool_uninit(&pool->pools[i]); + av_freep(&avctx->internal->pool); av_freep(&avctx->internal); } @@ -1386,18 +1561,19 @@ av_cold int avcodec_close(AVCodecContext *avctx) entangled_thread_counter--; /* Release any user-supplied mutex. */ - if (ff_lockmgr_cb) { - (*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE); + if (lockmgr_cb) { + (*lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE); } return 0; } -AVCodec *avcodec_find_encoder(enum CodecID id) +static AVCodec *find_encdec(enum AVCodecID id, int encoder) { - AVCodec *p, *experimental=NULL; + AVCodec *p, *experimental = NULL; p = first_avcodec; while (p) { - if (av_codec_is_encoder(p) && p->id == id) { + if ((encoder ? av_codec_is_encoder(p) : av_codec_is_decoder(p)) && + p->id == id) { if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) { experimental = p; } else @@ -1408,6 +1584,11 @@ AVCodec *avcodec_find_encoder(enum CodecID id) return experimental; } +AVCodec *avcodec_find_encoder(enum AVCodecID id) +{ + return find_encdec(id, 1); +} + AVCodec *avcodec_find_encoder_by_name(const char *name) { AVCodec *p; @@ -1415,23 +1596,16 @@ AVCodec *avcodec_find_encoder_by_name(const char *name) return NULL; p = first_avcodec; while (p) { - if (av_codec_is_encoder(p) && strcmp(name,p->name) == 0) + if (av_codec_is_encoder(p) && strcmp(name, p->name) == 0) return p; p = p->next; } return NULL; } -AVCodec *avcodec_find_decoder(enum CodecID id) +AVCodec *avcodec_find_decoder(enum AVCodecID id) { - AVCodec *p; - p = first_avcodec; - while (p) { - if (av_codec_is_decoder(p) && p->id == id) - return p; - p = p->next; - } - return NULL; + return find_encdec(id, 0); } AVCodec *avcodec_find_decoder_by_name(const char *name) @@ -1441,7 +1615,7 @@ AVCodec *avcodec_find_decoder_by_name(const char *name) return NULL; p = first_avcodec; while (p) { - if (av_codec_is_decoder(p) && strcmp(name,p->name) == 0) + if (av_codec_is_decoder(p) && strcmp(name, p->name) == 0) return p; p = p->next; } @@ -1453,7 +1627,7 @@ static int get_bit_rate(AVCodecContext *ctx) int bit_rate; int bits_per_sample; - switch(ctx->codec_type) { + switch (ctx->codec_type) { case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_DATA: case AVMEDIA_TYPE_SUBTITLE: @@ -1475,13 +1649,18 @@ size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_ta { int i, len, ret = 0; +#define TAG_PRINT(x) \ + (((x) >= '0' && (x) <= '9') || \ + ((x) >= 'a' && (x) <= 'z') || ((x) >= 'A' && (x) <= 'Z') || \ + ((x) == '.' || (x) == ' ')) + for (i = 0; i < 4; i++) { len = snprintf(buf, buf_size, - isprint(codec_tag&0xFF) ? "%c" : "[%d]", codec_tag&0xFF); - buf += len; - buf_size = buf_size > len ? buf_size - len : 0; - ret += len; - codec_tag>>=8; + TAG_PRINT(codec_tag & 0xFF) ? "%c" : "[%d]", codec_tag & 0xFF); + buf += len; + buf_size = buf_size > len ? buf_size - len : 0; + ret += len; + codec_tag >>= 8; } return ret; } @@ -1490,7 +1669,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) { const char *codec_name; const char *profile = NULL; - AVCodec *p; + const AVCodec *p; char buf1[32]; int bitrate; AVRational display_aspect_ratio; @@ -1505,9 +1684,9 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) if (p) { codec_name = p->name; profile = av_get_profile_name(p, enc->profile); - } else if (enc->codec_id == CODEC_ID_MPEG2TS) { + } else if (enc->codec_id == AV_CODEC_ID_MPEG2TS) { /* fake mpeg2 transport stream codec (currently not - registered) */ + * registered) */ codec_name = "mpeg2ts"; } else if (enc->codec_name[0] != '\0') { codec_name = enc->codec_name; @@ -1519,7 +1698,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) codec_name = buf1; } - switch(enc->codec_type) { + switch (enc->codec_type) { case AVMEDIA_TYPE_VIDEO: snprintf(buf, buf_size, "Video: %s%s", @@ -1527,7 +1706,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) if (profile) snprintf(buf + strlen(buf), buf_size - strlen(buf), " (%s)", profile); - if (enc->pix_fmt != PIX_FMT_NONE) { + if (enc->pix_fmt != AV_PIX_FMT_NONE) { snprintf(buf + strlen(buf), buf_size - strlen(buf), ", %s", av_get_pix_fmt_name(enc->pix_fmt)); @@ -1538,19 +1717,19 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) enc->width, enc->height); if (enc->sample_aspect_ratio.num) { av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den, - enc->width*enc->sample_aspect_ratio.num, - enc->height*enc->sample_aspect_ratio.den, - 1024*1024); + enc->width * enc->sample_aspect_ratio.num, + enc->height * enc->sample_aspect_ratio.den, + 1024 * 1024); snprintf(buf + strlen(buf), buf_size - strlen(buf), " [PAR %d:%d DAR %d:%d]", enc->sample_aspect_ratio.num, enc->sample_aspect_ratio.den, display_aspect_ratio.num, display_aspect_ratio.den); } - if(av_log_get_level() >= AV_LOG_DEBUG){ - int g= av_gcd(enc->time_base.num, enc->time_base.den); + if (av_log_get_level() >= AV_LOG_DEBUG) { + int g = av_gcd(enc->time_base.num, enc->time_base.den); snprintf(buf + strlen(buf), buf_size - strlen(buf), - ", %d/%d", - enc->time_base.num/g, enc->time_base.den/g); + ", %d/%d", + enc->time_base.num / g, enc->time_base.den / g); } } if (encode) { @@ -1617,9 +1796,9 @@ const char *av_get_profile_name(const AVCodec *codec, int profile) return NULL; } -unsigned avcodec_version( void ) +unsigned avcodec_version(void) { - return LIBAVCODEC_VERSION_INT; + return LIBAVCODEC_VERSION_INT; } const char *avcodec_configuration(void) @@ -1635,121 +1814,72 @@ const char *avcodec_license(void) void avcodec_flush_buffers(AVCodecContext *avctx) { - if(HAVE_THREADS && avctx->active_thread_type&FF_THREAD_FRAME) + if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME) ff_thread_flush(avctx); - else if(avctx->codec->flush) + else if (avctx->codec->flush) avctx->codec->flush(avctx); -} - -static void video_free_buffers(AVCodecContext *s) -{ - AVCodecInternal *avci = s->internal; - int i, j; - if (!avci->buffer) - return; - - if (avci->buffer_count) - av_log(s, AV_LOG_WARNING, "Found %i unreleased buffers!\n", - avci->buffer_count); - for(i=0; ibuffer[i]; - for(j=0; j<4; j++){ - av_freep(&buf->base[j]); - buf->data[j]= NULL; - } - } - av_freep(&avci->buffer); - - avci->buffer_count=0; -} - -static void audio_free_buffers(AVCodecContext *avctx) -{ - AVCodecInternal *avci = avctx->internal; - InternalBuffer *buf; - - if (!avci->buffer) - return; - buf = avci->buffer; - - if (buf->extended_data) { - av_free(buf->extended_data[0]); - if (buf->extended_data != buf->data) - av_free(buf->extended_data); - } - av_freep(&avci->buffer); + if (!avctx->refcounted_frames) + av_frame_unref(&avctx->internal->to_free); } -void avcodec_default_free_buffers(AVCodecContext *avctx) +int av_get_exact_bits_per_sample(enum AVCodecID codec_id) { - switch (avctx->codec_type) { - case AVMEDIA_TYPE_VIDEO: - video_free_buffers(avctx); - break; - case AVMEDIA_TYPE_AUDIO: - audio_free_buffers(avctx); - break; - default: - break; - } -} - -int av_get_exact_bits_per_sample(enum CodecID codec_id) -{ - switch(codec_id){ - case CODEC_ID_ADPCM_CT: - case CODEC_ID_ADPCM_IMA_APC: - case CODEC_ID_ADPCM_IMA_EA_SEAD: - case CODEC_ID_ADPCM_IMA_WS: - case CODEC_ID_ADPCM_G722: - case CODEC_ID_ADPCM_YAMAHA: + switch (codec_id) { + case AV_CODEC_ID_ADPCM_CT: + case AV_CODEC_ID_ADPCM_IMA_APC: + case AV_CODEC_ID_ADPCM_IMA_EA_SEAD: + case AV_CODEC_ID_ADPCM_IMA_WS: + case AV_CODEC_ID_ADPCM_G722: + case AV_CODEC_ID_ADPCM_YAMAHA: return 4; - case CODEC_ID_PCM_ALAW: - case CODEC_ID_PCM_MULAW: - case CODEC_ID_PCM_S8: - case CODEC_ID_PCM_U8: - case CODEC_ID_PCM_ZORK: + case AV_CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_S8: + case AV_CODEC_ID_PCM_U8: + case AV_CODEC_ID_PCM_ZORK: return 8; - case CODEC_ID_PCM_S16BE: - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_S16LE_PLANAR: - case CODEC_ID_PCM_U16BE: - case CODEC_ID_PCM_U16LE: + case AV_CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S16LE_PLANAR: + case AV_CODEC_ID_PCM_U16BE: + case AV_CODEC_ID_PCM_U16LE: return 16; - case CODEC_ID_PCM_S24DAUD: - case CODEC_ID_PCM_S24BE: - case CODEC_ID_PCM_S24LE: - case CODEC_ID_PCM_U24BE: - case CODEC_ID_PCM_U24LE: + case AV_CODEC_ID_PCM_S24DAUD: + case AV_CODEC_ID_PCM_S24BE: + case AV_CODEC_ID_PCM_S24LE: + case AV_CODEC_ID_PCM_S24LE_PLANAR: + case AV_CODEC_ID_PCM_U24BE: + case AV_CODEC_ID_PCM_U24LE: return 24; - case CODEC_ID_PCM_S32BE: - case CODEC_ID_PCM_S32LE: - case CODEC_ID_PCM_U32BE: - case CODEC_ID_PCM_U32LE: - case CODEC_ID_PCM_F32BE: - case CODEC_ID_PCM_F32LE: + case AV_CODEC_ID_PCM_S32BE: + case AV_CODEC_ID_PCM_S32LE: + case AV_CODEC_ID_PCM_S32LE_PLANAR: + case AV_CODEC_ID_PCM_U32BE: + case AV_CODEC_ID_PCM_U32LE: + case AV_CODEC_ID_PCM_F32BE: + case AV_CODEC_ID_PCM_F32LE: return 32; - case CODEC_ID_PCM_F64BE: - case CODEC_ID_PCM_F64LE: + case AV_CODEC_ID_PCM_F64BE: + case AV_CODEC_ID_PCM_F64LE: return 64; default: return 0; } } -int av_get_bits_per_sample(enum CodecID codec_id) +int av_get_bits_per_sample(enum AVCodecID codec_id) { switch (codec_id) { - case CODEC_ID_ADPCM_SBPRO_2: + case AV_CODEC_ID_ADPCM_SBPRO_2: return 2; - case CODEC_ID_ADPCM_SBPRO_3: + case AV_CODEC_ID_ADPCM_SBPRO_3: return 3; - case CODEC_ID_ADPCM_SBPRO_4: - case CODEC_ID_ADPCM_IMA_WAV: - case CODEC_ID_ADPCM_IMA_QT: - case CODEC_ID_ADPCM_SWF: - case CODEC_ID_ADPCM_MS: + case AV_CODEC_ID_ADPCM_SBPRO_4: + case AV_CODEC_ID_ADPCM_IMA_WAV: + case AV_CODEC_ID_ADPCM_IMA_QT: + case AV_CODEC_ID_ADPCM_SWF: + case AV_CODEC_ID_ADPCM_MS: return 4; default: return av_get_exact_bits_per_sample(codec_id); @@ -1774,91 +1904,96 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) /* codecs with a fixed packet duration */ switch (id) { - case CODEC_ID_ADPCM_ADX: return 32; - case CODEC_ID_ADPCM_IMA_QT: return 64; - case CODEC_ID_ADPCM_EA_XAS: return 128; - case CODEC_ID_AMR_NB: - case CODEC_ID_GSM: - case CODEC_ID_QCELP: - case CODEC_ID_RA_144: - case CODEC_ID_RA_288: return 160; - case CODEC_ID_IMC: return 256; - case CODEC_ID_AMR_WB: - case CODEC_ID_GSM_MS: return 320; - case CODEC_ID_MP1: return 384; - case CODEC_ID_ATRAC1: return 512; - case CODEC_ID_ATRAC3: return 1024; - case CODEC_ID_MP2: - case CODEC_ID_MUSEPACK7: return 1152; - case CODEC_ID_AC3: return 1536; + case AV_CODEC_ID_ADPCM_ADX: return 32; + case AV_CODEC_ID_ADPCM_IMA_QT: return 64; + case AV_CODEC_ID_ADPCM_EA_XAS: return 128; + case AV_CODEC_ID_AMR_NB: + case AV_CODEC_ID_GSM: + case AV_CODEC_ID_QCELP: + case AV_CODEC_ID_RA_144: + case AV_CODEC_ID_RA_288: return 160; + case AV_CODEC_ID_IMC: return 256; + case AV_CODEC_ID_AMR_WB: + case AV_CODEC_ID_GSM_MS: return 320; + case AV_CODEC_ID_MP1: return 384; + case AV_CODEC_ID_ATRAC1: return 512; + case AV_CODEC_ID_ATRAC3: return 1024; + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MUSEPACK7: return 1152; + case AV_CODEC_ID_AC3: return 1536; } if (sr > 0) { /* calc from sample rate */ - if (id == CODEC_ID_TTA) + if (id == AV_CODEC_ID_TTA) return 256 * sr / 245; if (ch > 0) { /* calc from sample rate and channels */ - if (id == CODEC_ID_BINKAUDIO_DCT) + if (id == AV_CODEC_ID_BINKAUDIO_DCT) return (480 << (sr / 22050)) / ch; } } if (ba > 0) { /* calc from block_align */ - if (id == CODEC_ID_SIPR) { + if (id == AV_CODEC_ID_SIPR) { switch (ba) { case 20: return 160; case 19: return 144; case 29: return 288; case 37: return 480; } + } else if (id == AV_CODEC_ID_ILBC) { + switch (ba) { + case 38: return 160; + case 50: return 240; + } } } if (frame_bytes > 0) { /* calc from frame_bytes only */ - if (id == CODEC_ID_TRUESPEECH) + if (id == AV_CODEC_ID_TRUESPEECH) return 240 * (frame_bytes / 32); - if (id == CODEC_ID_NELLYMOSER) + if (id == AV_CODEC_ID_NELLYMOSER) return 256 * (frame_bytes / 64); if (bps > 0) { /* calc from frame_bytes and bits_per_coded_sample */ - if (id == CODEC_ID_ADPCM_G726) + if (id == AV_CODEC_ID_ADPCM_G726) return frame_bytes * 8 / bps; } if (ch > 0) { /* calc from frame_bytes and channels */ switch (id) { - case CODEC_ID_ADPCM_4XM: - case CODEC_ID_ADPCM_IMA_ISS: + case AV_CODEC_ID_ADPCM_4XM: + case AV_CODEC_ID_ADPCM_IMA_ISS: return (frame_bytes - 4 * ch) * 2 / ch; - case CODEC_ID_ADPCM_IMA_SMJPEG: + case AV_CODEC_ID_ADPCM_IMA_SMJPEG: return (frame_bytes - 4) * 2 / ch; - case CODEC_ID_ADPCM_IMA_AMV: + case AV_CODEC_ID_ADPCM_IMA_AMV: return (frame_bytes - 8) * 2 / ch; - case CODEC_ID_ADPCM_XA: + case AV_CODEC_ID_ADPCM_XA: return (frame_bytes / 128) * 224 / ch; - case CODEC_ID_INTERPLAY_DPCM: + case AV_CODEC_ID_INTERPLAY_DPCM: return (frame_bytes - 6 - ch) / ch; - case CODEC_ID_ROQ_DPCM: + case AV_CODEC_ID_ROQ_DPCM: return (frame_bytes - 8) / ch; - case CODEC_ID_XAN_DPCM: + case AV_CODEC_ID_XAN_DPCM: return (frame_bytes - 2 * ch) / ch; - case CODEC_ID_MACE3: + case AV_CODEC_ID_MACE3: return 3 * frame_bytes / ch; - case CODEC_ID_MACE6: + case AV_CODEC_ID_MACE6: return 6 * frame_bytes / ch; - case CODEC_ID_PCM_LXF: + case AV_CODEC_ID_PCM_LXF: return 2 * (frame_bytes / (5 * ch)); } if (tag) { /* calc from frame_bytes, channels, and codec_tag */ - if (id == CODEC_ID_SOL_DPCM) { + if (id == AV_CODEC_ID_SOL_DPCM) { if (tag == 3) return frame_bytes / ch; else @@ -1870,13 +2005,13 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) /* calc from frame_bytes, channels, and block_align */ int blocks = frame_bytes / ba; switch (avctx->codec_id) { - case CODEC_ID_ADPCM_IMA_WAV: + case AV_CODEC_ID_ADPCM_IMA_WAV: return blocks * (1 + (ba - 4 * ch) / (4 * ch) * 8); - case CODEC_ID_ADPCM_IMA_DK3: + case AV_CODEC_ID_ADPCM_IMA_DK3: return blocks * (((ba - 16) * 2 / 3 * 4) / ch); - case CODEC_ID_ADPCM_IMA_DK4: + case AV_CODEC_ID_ADPCM_IMA_DK4: return blocks * (1 + (ba - 4 * ch) * 2 / ch); - case CODEC_ID_ADPCM_MS: + case AV_CODEC_ID_ADPCM_MS: return blocks * (2 + (ba - 7 * ch) * 2 / ch); } } @@ -1884,11 +2019,11 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) if (bps > 0) { /* calc from frame_bytes, channels, and bits_per_coded_sample */ switch (avctx->codec_id) { - case CODEC_ID_PCM_DVD: + case AV_CODEC_ID_PCM_DVD: return 2 * (frame_bytes / ((bps * 2 / 8) * ch)); - case CODEC_ID_PCM_BLURAY: + case AV_CODEC_ID_PCM_BLURAY: return frame_bytes / ((FFALIGN(ch, 2) * bps) / 8); - case CODEC_ID_S302M: + case AV_CODEC_ID_S302M: return 2 * (frame_bytes / ((bps + 4) / 4)) / ch; } } @@ -1899,16 +2034,18 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) } #if !HAVE_THREADS -int ff_thread_init(AVCodecContext *s){ +int ff_thread_init(AVCodecContext *s) +{ return -1; } + #endif unsigned int av_xiphlacing(unsigned char *s, unsigned int v) { unsigned int n = 0; - while(v >= 0xff) { + while (v >= 0xff) { *s++ = 0xff; v -= 0xff; n++; @@ -1918,15 +2055,18 @@ unsigned int av_xiphlacing(unsigned char *s, unsigned int v) return n; } -int ff_match_2uint16(const uint16_t (*tab)[2], int size, int a, int b){ +int ff_match_2uint16(const uint16_t(*tab)[2], int size, int a, int b) +{ int i; - for(i=0; inext : first_hwaccel; } -AVHWAccel *ff_find_hwaccel(enum CodecID codec_id, enum PixelFormat pix_fmt) +AVHWAccel *ff_find_hwaccel(AVCodecContext *avctx) { - AVHWAccel *hwaccel=NULL; + enum AVCodecID codec_id = avctx->codec->id; + enum AVPixelFormat pix_fmt = avctx->pix_fmt; - while((hwaccel= av_hwaccel_next(hwaccel))){ - if ( hwaccel->id == codec_id + AVHWAccel *hwaccel = NULL; + + while ((hwaccel = av_hwaccel_next(hwaccel))) + if (hwaccel->id == codec_id && hwaccel->pix_fmt == pix_fmt) return hwaccel; - } return NULL; } int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)) { - if (ff_lockmgr_cb) { - if (ff_lockmgr_cb(&codec_mutex, AV_LOCK_DESTROY)) + if (lockmgr_cb) { + if (lockmgr_cb(&codec_mutex, AV_LOCK_DESTROY)) return -1; - if (ff_lockmgr_cb(&avformat_mutex, AV_LOCK_DESTROY)) + if (lockmgr_cb(&avformat_mutex, AV_LOCK_DESTROY)) return -1; } - ff_lockmgr_cb = cb; + lockmgr_cb = cb; - if (ff_lockmgr_cb) { - if (ff_lockmgr_cb(&codec_mutex, AV_LOCK_CREATE)) + if (lockmgr_cb) { + if (lockmgr_cb(&codec_mutex, AV_LOCK_CREATE)) return -1; - if (ff_lockmgr_cb(&avformat_mutex, AV_LOCK_CREATE)) + if (lockmgr_cb(&avformat_mutex, AV_LOCK_CREATE)) return -1; } return 0; @@ -1999,8 +2143,8 @@ int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)) int avpriv_lock_avformat(void) { - if (ff_lockmgr_cb) { - if ((*ff_lockmgr_cb)(&avformat_mutex, AV_LOCK_OBTAIN)) + if (lockmgr_cb) { + if ((*lockmgr_cb)(&avformat_mutex, AV_LOCK_OBTAIN)) return -1; } return 0; @@ -2008,8 +2152,8 @@ int avpriv_lock_avformat(void) int avpriv_unlock_avformat(void) { - if (ff_lockmgr_cb) { - if ((*ff_lockmgr_cb)(&avformat_mutex, AV_LOCK_RELEASE)) + if (lockmgr_cb) { + if ((*lockmgr_cb)(&avformat_mutex, AV_LOCK_RELEASE)) return -1; } return 0; @@ -2017,48 +2161,67 @@ int avpriv_unlock_avformat(void) unsigned int avpriv_toupper4(unsigned int x) { - return toupper( x &0xFF) - + (toupper((x>>8 )&0xFF)<<8 ) - + (toupper((x>>16)&0xFF)<<16) - + (toupper((x>>24)&0xFF)<<24); + return av_toupper(x & 0xFF) + + (av_toupper((x >> 8) & 0xFF) << 8) + + (av_toupper((x >> 16) & 0xFF) << 16) + + (av_toupper((x >> 24) & 0xFF) << 24); +} + +int ff_thread_ref_frame(ThreadFrame *dst, ThreadFrame *src) +{ + int ret; + + dst->owner = src->owner; + + ret = av_frame_ref(dst->f, src->f); + if (ret < 0) + return ret; + + if (src->progress && + !(dst->progress = av_buffer_ref(src->progress))) { + ff_thread_release_buffer(dst->owner, dst); + return AVERROR(ENOMEM); + } + + return 0; } #if !HAVE_THREADS -int ff_thread_get_buffer(AVCodecContext *avctx, AVFrame *f) +int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) { f->owner = avctx; - return avctx->get_buffer(avctx, f); + return ff_get_buffer(avctx, f->f, flags); } -void ff_thread_release_buffer(AVCodecContext *avctx, AVFrame *f) +void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f) { - f->owner->release_buffer(f->owner, f); + av_frame_unref(f->f); } void ff_thread_finish_setup(AVCodecContext *avctx) { } -void ff_thread_report_progress(AVFrame *f, int progress, int field) +void ff_thread_report_progress(ThreadFrame *f, int progress, int field) { } -void ff_thread_await_progress(AVFrame *f, int progress, int field) +void ff_thread_await_progress(ThreadFrame *f, int progress, int field) { } #endif -enum AVMediaType avcodec_get_type(enum CodecID codec_id) +enum AVMediaType avcodec_get_type(enum AVCodecID codec_id) { - if (codec_id <= CODEC_ID_NONE) + if (codec_id <= AV_CODEC_ID_NONE) return AVMEDIA_TYPE_UNKNOWN; - else if (codec_id < CODEC_ID_FIRST_AUDIO) + else if (codec_id < AV_CODEC_ID_FIRST_AUDIO) return AVMEDIA_TYPE_VIDEO; - else if (codec_id < CODEC_ID_FIRST_SUBTITLE) + else if (codec_id < AV_CODEC_ID_FIRST_SUBTITLE) return AVMEDIA_TYPE_AUDIO; - else if (codec_id < CODEC_ID_FIRST_UNKNOWN) + else if (codec_id < AV_CODEC_ID_FIRST_UNKNOWN) return AVMEDIA_TYPE_SUBTITLE; return AVMEDIA_TYPE_UNKNOWN; @@ -2068,3 +2231,36 @@ int avcodec_is_open(AVCodecContext *s) { return !!s->internal; } + +const uint8_t *avpriv_find_start_code(const uint8_t *restrict p, + const uint8_t *end, + uint32_t * restrict state) +{ + int i; + + assert(p <= end); + if (p >= end) + return end; + + for (i = 0; i < 3; i++) { + uint32_t tmp = *state << 8; + *state = tmp + *(p++); + if (tmp == 0x100 || p == end) + return p; + } + + while (p < end) { + if (p[-1] > 1 ) p += 3; + else if (p[-2] ) p += 2; + else if (p[-3]|(p[-1]-1)) p++; + else { + p++; + break; + } + } + + p = FFMIN(p, end) - 4; + *state = AV_RB32(p); + + return p + 4; +}