X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fformats.c;h=62facc6634959e3aaf8521c5dd33ff534d8a1542;hb=7a72695c05f12f21a62dc99fa64d1726fc11b236;hp=83bdcd7a7af25a7fb604bf8834665ef64c00bf56;hpb=b74a1da49db5ebed51aceae6cacc2329288a92c1;p=ffmpeg diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 83bdcd7a7af..62facc66349 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -2,24 +2,27 @@ * Filter layer - format negotiation * Copyright (c) 2007 Bobby Bingham * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * 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. * - * Libav is distributed in the hope that it will be useful, + * 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 Libav; if not, write to the Free Software + * 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/eval.h" #include "libavutil/pixdesc.h" +#include "libavutil/parseutils.h" +#include "libavutil/audioconvert.h" #include "avfilter.h" #include "internal.h" #include "formats.h" @@ -63,11 +66,17 @@ do { goto fail; \ for (i = 0; i < a->nb; i++) \ for (j = 0; j < b->nb; j++) \ - if (a->fmts[i] == b->fmts[j]) \ + if (a->fmts[i] == b->fmts[j]) { \ + if(k >= FFMIN(a->nb, b->nb)){ \ + av_log(0, AV_LOG_ERROR, "Duplicate formats in avfilter_merge_formats() detected\n"); \ + av_free(ret->fmts); \ + av_free(ret); \ + return NULL; \ + } \ ret->fmts[k++] = a->fmts[i]; \ - \ - ret->nb = k; \ + } \ } \ + ret->nb = k; \ /* check that there was at least one common format */ \ if (!ret->nb) \ goto fail; \ @@ -154,26 +163,72 @@ int ff_fmt_is_in(int fmt, const int *fmts) { const int *p; - for (p = fmts; *p != PIX_FMT_NONE; p++) { + for (p = fmts; *p != -1; p++) { if (fmt == *p) return 1; } return 0; } +#define COPY_INT_LIST(list_copy, list, type) { \ + int count = 0; \ + if (list) \ + for (count = 0; list[count] != -1; count++) \ + ; \ + list_copy = av_calloc(count+1, sizeof(type)); \ + if (list_copy) { \ + memcpy(list_copy, list, sizeof(type) * count); \ + list_copy[count] = -1; \ + } \ +} + +int *ff_copy_int_list(const int * const list) +{ + int *ret = NULL; + COPY_INT_LIST(ret, list, int); + return ret; +} + +int64_t *ff_copy_int64_list(const int64_t * const list) +{ + int64_t *ret = NULL; + COPY_INT_LIST(ret, list, int64_t); + return ret; +} + +#define MAKE_FORMAT_LIST(type, field, count_field) \ + type *formats; \ + int count = 0; \ + if (fmts) \ + for (count = 0; fmts[count] != -1; count++) \ + ; \ + formats = av_mallocz(sizeof(*formats)); \ + if (!formats) return NULL; \ + formats->count_field = count; \ + if (count) { \ + formats->field = av_malloc(sizeof(*formats->field)*count); \ + if (!formats->field) { \ + av_free(formats); \ + return NULL; \ + } \ + } + AVFilterFormats *ff_make_format_list(const int *fmts) { - AVFilterFormats *formats; - int count; + MAKE_FORMAT_LIST(AVFilterFormats, formats, format_count); + while (count--) + formats->formats[count] = fmts[count]; - for (count = 0; fmts[count] != -1; count++) - ; + return formats; +} - formats = av_mallocz(sizeof(*formats)); +AVFilterChannelLayouts *avfilter_make_format64_list(const int64_t *fmts) +{ + MAKE_FORMAT_LIST(AVFilterChannelLayouts, + channel_layouts, nb_channel_layouts); if (count) - formats->formats = av_malloc(sizeof(*formats->formats) * count); - formats->format_count = count; - memcpy(formats->formats, fmts, sizeof(*formats->formats) * count); + memcpy(formats->channel_layouts, fmts, + sizeof(*formats->channel_layouts) * count); return formats; } @@ -195,7 +250,7 @@ do { \ return 0; \ } while (0) -int ff_add_format(AVFilterFormats **avff, int fmt) +int ff_add_format(AVFilterFormats **avff, int64_t fmt) { ADD_FORMAT(avff, fmt, int, formats, format_count); } @@ -220,6 +275,28 @@ AVFilterFormats *ff_all_formats(enum AVMediaType type) return ret; } +const int64_t avfilter_all_channel_layouts[] = { +#include "all_channel_layouts.inc" + -1 +}; + +// AVFilterFormats *avfilter_make_all_channel_layouts(void) +// { +// return avfilter_make_format64_list(avfilter_all_channel_layouts); +// } + +AVFilterFormats *ff_planar_sample_fmts(void) +{ + AVFilterFormats *ret = NULL; + int fmt; + + for (fmt = 0; fmt < AV_SAMPLE_FMT_NB; fmt++) + if (av_sample_fmt_is_planar(fmt)) + ff_add_format(&ret, fmt); + + return ret; +} + AVFilterFormats *ff_all_samplerates(void) { AVFilterFormats *ret = av_mallocz(sizeof(*ret)); @@ -318,14 +395,14 @@ void ff_formats_changeref(AVFilterFormats **oldref, AVFilterFormats **newref) { \ int count = 0, i; \ \ - for (i = 0; i < ctx->input_count; i++) { \ - if (ctx->inputs[i]) { \ + for (i = 0; i < ctx->nb_inputs; i++) { \ + if (ctx->inputs[i] && !ctx->inputs[i]->out_fmts) { \ ref(fmts, &ctx->inputs[i]->out_fmts); \ count++; \ } \ } \ - for (i = 0; i < ctx->output_count; i++) { \ - if (ctx->outputs[i]) { \ + for (i = 0; i < ctx->nb_outputs; i++) { \ + if (ctx->outputs[i] && !ctx->outputs[i]->in_fmts) { \ ref(fmts, &ctx->outputs[i]->in_fmts); \ count++; \ } \ @@ -378,42 +455,92 @@ int ff_default_query_formats(AVFilterContext *ctx) return 0; } -#if FF_API_FILTERS_PUBLIC -int avfilter_default_query_formats(AVFilterContext *ctx) -{ - return ff_default_query_formats(ctx); -} -void avfilter_set_common_formats(AVFilterContext *ctx, AVFilterFormats *formats) -{ - ff_set_common_formats(ctx, formats); -} -AVFilterFormats *avfilter_make_format_list(const int *fmts) -{ - return ff_make_format_list(fmts); -} -int avfilter_add_format(AVFilterFormats **avff, int fmt) +/* internal functions for parsing audio format arguments */ + +int ff_parse_pixel_format(enum PixelFormat *ret, const char *arg, void *log_ctx) { - return ff_add_format(avff, fmt); + char *tail; + int pix_fmt = av_get_pix_fmt(arg); + if (pix_fmt == PIX_FMT_NONE) { + pix_fmt = strtol(arg, &tail, 0); + if (*tail || (unsigned)pix_fmt >= PIX_FMT_NB) { + av_log(log_ctx, AV_LOG_ERROR, "Invalid pixel format '%s'\n", arg); + return AVERROR(EINVAL); + } + } + *ret = pix_fmt; + return 0; } -AVFilterFormats *avfilter_all_formats(enum AVMediaType type) + +int ff_parse_sample_format(int *ret, const char *arg, void *log_ctx) { - return ff_all_formats(type); + char *tail; + int sfmt = av_get_sample_fmt(arg); + if (sfmt == AV_SAMPLE_FMT_NONE) { + sfmt = strtol(arg, &tail, 0); + if (*tail || (unsigned)sfmt >= AV_SAMPLE_FMT_NB) { + av_log(log_ctx, AV_LOG_ERROR, "Invalid sample format '%s'\n", arg); + return AVERROR(EINVAL); + } + } + *ret = sfmt; + return 0; } -AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b) + +int ff_parse_time_base(AVRational *ret, const char *arg, void *log_ctx) { - return ff_merge_formats(a, b); + AVRational r; + if(av_parse_ratio(&r, arg, INT_MAX, 0, log_ctx) < 0 ||r.num<=0 ||r.den<=0) { + av_log(log_ctx, AV_LOG_ERROR, "Invalid time base '%s'\n", arg); + return AVERROR(EINVAL); + } + *ret = r; + return 0; } -void avfilter_formats_ref(AVFilterFormats *f, AVFilterFormats **ref) + +int ff_parse_sample_rate(int *ret, const char *arg, void *log_ctx) { - ff_formats_ref(f, ref); + char *tail; + double srate = av_strtod(arg, &tail); + if (*tail || srate < 1 || (int)srate != srate || srate > INT_MAX) { + av_log(log_ctx, AV_LOG_ERROR, "Invalid sample rate '%s'\n", arg); + return AVERROR(EINVAL); + } + *ret = srate; + return 0; } -void avfilter_formats_unref(AVFilterFormats **ref) + +int ff_parse_channel_layout(int64_t *ret, const char *arg, void *log_ctx) { - ff_formats_unref(ref); + char *tail; + int64_t chlayout = av_get_channel_layout(arg); + if (chlayout == 0) { + chlayout = strtol(arg, &tail, 10); + if (*tail || chlayout == 0) { + av_log(log_ctx, AV_LOG_ERROR, "Invalid channel layout '%s'\n", arg); + return AVERROR(EINVAL); + } + } + *ret = chlayout; + return 0; } -void avfilter_formats_changeref(AVFilterFormats **oldref, - AVFilterFormats **newref) + +#ifdef TEST + +#undef printf + +int main(void) { - ff_formats_changeref(oldref, newref); + const int64_t *cl; + char buf[512]; + + for (cl = avfilter_all_channel_layouts; *cl != -1; cl++) { + av_get_channel_layout_string(buf, sizeof(buf), -1, *cl); + printf("%s\n", buf); + } + + return 0; } + #endif +