
* commit 'aa45b90804ab21175b8c116bd8e5eb4b4e85fbcb': (22 commits) alsdec: Check k used for rice decoder. cavsdec: check for changing w/h. avidec: use actually read size instead of requested size wmaprodec: check num_vec_coeffs for validity lagarith: check count before writing zeros. indeo5: check tile size in decode_mb_info(). indeo5: prevent null pointer dereference on broken files indeo: check for invalid motion vectors indeo: clear allocated band buffers indeo: check custom Huffman tables for errors dfa: add some checks to ensure that decoder won't write past frame end dfa: check that the caller set width/height properly. bytestream: add a new set of bytestream functions with overread checking avsdec: Set dimensions instead of relying on the demuxer. lavfi: avfilter_merge_formats: handle case where inputs are same rv34: use AVERROR return values in ff_rv34_decode_frame() h263: Add ff_ prefix to nonstatic symbols eval: fix swapping of lt() and lte() bmpdec: only initialize palette for pal8. vc1dec: add flush function for WMV9 and VC-1 decoders ... Conflicts: libavcodec/avs.c libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
217 lines
6.2 KiB
C
217 lines
6.2 KiB
C
/*
|
|
* Filter layer - format negotiation
|
|
* Copyright (c) 2007 Bobby Bingham
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
#include "libavutil/pixdesc.h"
|
|
#include "libavutil/audioconvert.h"
|
|
#include "avfilter.h"
|
|
|
|
/**
|
|
* Add all refs from a to ret and destroy a.
|
|
*/
|
|
static void merge_ref(AVFilterFormats *ret, AVFilterFormats *a)
|
|
{
|
|
int i;
|
|
|
|
for(i = 0; i < a->refcount; i ++) {
|
|
ret->refs[ret->refcount] = a->refs[i];
|
|
*ret->refs[ret->refcount++] = ret;
|
|
}
|
|
|
|
av_free(a->refs);
|
|
av_free(a->formats);
|
|
av_free(a);
|
|
}
|
|
|
|
AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
|
|
{
|
|
AVFilterFormats *ret;
|
|
unsigned i, j, k = 0;
|
|
|
|
if (a == b)
|
|
return a;
|
|
|
|
if (a == b)
|
|
return a;
|
|
|
|
ret = av_mallocz(sizeof(AVFilterFormats));
|
|
|
|
/* merge list of formats */
|
|
ret->formats = av_malloc(sizeof(*ret->formats) * FFMIN(a->format_count,
|
|
b->format_count));
|
|
for(i = 0; i < a->format_count; i ++)
|
|
for(j = 0; j < b->format_count; j ++)
|
|
if(a->formats[i] == b->formats[j])
|
|
ret->formats[k++] = a->formats[i];
|
|
|
|
ret->format_count = k;
|
|
/* check that there was at least one common format */
|
|
if(!ret->format_count) {
|
|
av_free(ret->formats);
|
|
av_free(ret);
|
|
return NULL;
|
|
}
|
|
|
|
ret->refs = av_malloc(sizeof(AVFilterFormats**)*(a->refcount+b->refcount));
|
|
|
|
merge_ref(ret, a);
|
|
merge_ref(ret, b);
|
|
|
|
return ret;
|
|
}
|
|
|
|
#define MAKE_FORMAT_LIST() \
|
|
AVFilterFormats *formats; \
|
|
int count = 0; \
|
|
if (fmts) \
|
|
for (count = 0; fmts[count] != -1; count++) \
|
|
; \
|
|
formats = av_mallocz(sizeof(AVFilterFormats)); \
|
|
if (!formats) return NULL; \
|
|
formats->format_count = count; \
|
|
if (count) { \
|
|
formats->formats = av_malloc(sizeof(*formats->formats)*count); \
|
|
if (!formats->formats) { \
|
|
av_free(formats); \
|
|
return NULL; \
|
|
} \
|
|
}
|
|
|
|
AVFilterFormats *avfilter_make_format_list(const int *fmts)
|
|
{
|
|
MAKE_FORMAT_LIST();
|
|
while (count--)
|
|
formats->formats[count] = fmts[count];
|
|
|
|
return formats;
|
|
}
|
|
|
|
AVFilterFormats *avfilter_make_format64_list(const int64_t *fmts)
|
|
{
|
|
MAKE_FORMAT_LIST();
|
|
if (count)
|
|
memcpy(formats->formats, fmts, sizeof(*formats->formats) * count);
|
|
|
|
return formats;
|
|
}
|
|
|
|
int avfilter_add_format(AVFilterFormats **avff, int64_t fmt)
|
|
{
|
|
int64_t *fmts;
|
|
|
|
if (!(*avff) && !(*avff = av_mallocz(sizeof(AVFilterFormats))))
|
|
return AVERROR(ENOMEM);
|
|
|
|
fmts = av_realloc((*avff)->formats,
|
|
sizeof(*(*avff)->formats) * ((*avff)->format_count+1));
|
|
if (!fmts)
|
|
return AVERROR(ENOMEM);
|
|
|
|
(*avff)->formats = fmts;
|
|
(*avff)->formats[(*avff)->format_count++] = fmt;
|
|
return 0;
|
|
}
|
|
|
|
AVFilterFormats *avfilter_all_formats(enum AVMediaType type)
|
|
{
|
|
AVFilterFormats *ret = NULL;
|
|
int fmt;
|
|
int num_formats = type == AVMEDIA_TYPE_VIDEO ? PIX_FMT_NB :
|
|
type == AVMEDIA_TYPE_AUDIO ? AV_SAMPLE_FMT_NB : 0;
|
|
|
|
for (fmt = 0; fmt < num_formats; fmt++)
|
|
if ((type != AVMEDIA_TYPE_VIDEO) ||
|
|
(type == AVMEDIA_TYPE_VIDEO && !(av_pix_fmt_descriptors[fmt].flags & PIX_FMT_HWACCEL)))
|
|
avfilter_add_format(&ret, fmt);
|
|
|
|
return ret;
|
|
}
|
|
|
|
AVFilterFormats *avfilter_all_channel_layouts(void)
|
|
{
|
|
static int64_t chlayouts[] = {
|
|
AV_CH_LAYOUT_MONO,
|
|
AV_CH_LAYOUT_STEREO,
|
|
AV_CH_LAYOUT_4POINT0,
|
|
AV_CH_LAYOUT_QUAD,
|
|
AV_CH_LAYOUT_5POINT0,
|
|
AV_CH_LAYOUT_5POINT0_BACK,
|
|
AV_CH_LAYOUT_5POINT1,
|
|
AV_CH_LAYOUT_5POINT1_BACK,
|
|
AV_CH_LAYOUT_5POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX,
|
|
AV_CH_LAYOUT_7POINT1,
|
|
AV_CH_LAYOUT_7POINT1_WIDE,
|
|
AV_CH_LAYOUT_7POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX,
|
|
-1,
|
|
};
|
|
|
|
return avfilter_make_format64_list(chlayouts);
|
|
}
|
|
|
|
void avfilter_formats_ref(AVFilterFormats *f, AVFilterFormats **ref)
|
|
{
|
|
*ref = f;
|
|
f->refs = av_realloc(f->refs, sizeof(AVFilterFormats**) * ++f->refcount);
|
|
f->refs[f->refcount-1] = ref;
|
|
}
|
|
|
|
static int find_ref_index(AVFilterFormats **ref)
|
|
{
|
|
int i;
|
|
for(i = 0; i < (*ref)->refcount; i ++)
|
|
if((*ref)->refs[i] == ref)
|
|
return i;
|
|
return -1;
|
|
}
|
|
|
|
void avfilter_formats_unref(AVFilterFormats **ref)
|
|
{
|
|
int idx;
|
|
|
|
if (!*ref)
|
|
return;
|
|
|
|
idx = find_ref_index(ref);
|
|
|
|
if(idx >= 0)
|
|
memmove((*ref)->refs + idx, (*ref)->refs + idx+1,
|
|
sizeof(AVFilterFormats**) * ((*ref)->refcount-idx-1));
|
|
|
|
if(!--(*ref)->refcount) {
|
|
av_free((*ref)->formats);
|
|
av_free((*ref)->refs);
|
|
av_free(*ref);
|
|
}
|
|
*ref = NULL;
|
|
}
|
|
|
|
void avfilter_formats_changeref(AVFilterFormats **oldref,
|
|
AVFilterFormats **newref)
|
|
{
|
|
int idx = find_ref_index(oldref);
|
|
|
|
if(idx >= 0) {
|
|
(*oldref)->refs[idx] = newref;
|
|
*newref = *oldref;
|
|
*oldref = NULL;
|
|
}
|
|
}
|
|
|