diff options
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 172 |
1 files changed, 90 insertions, 82 deletions
diff --git a/cmdutils.c b/cmdutils.c index feeea694d8..a5363b8176 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -2,20 +2,20 @@ * Various utilities for command line tools * Copyright (c) 2000-2003 Fabrice Bellard * - * 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 */ @@ -79,12 +79,8 @@ void uninit_opts(void) av_freep(&sws_opts); #endif for (i = 0; i < opt_name_count; i++) { - //opt_values are only stored for codec-specific options in which case - //both the name and value are dup'd - if (opt_values[i]) { - av_freep(&opt_names[i]); - av_freep(&opt_values[i]); - } + av_freep(&opt_names[i]); + av_freep(&opt_values[i]); } av_freep(&opt_names); av_freep(&opt_values); @@ -281,8 +277,10 @@ unknown_opt: fprintf(stderr, "%s: failed to set value '%s' for option '%s'\n", argv[0], arg, opt); exit(1); } - } else if (po->u.func_arg) { - po->u.func_arg(arg); + } else if (po->flags & OPT_DUMMY) { + /* Do nothing for this option */ + } else { + po->u.func_arg(arg); } if(po->flags & OPT_EXIT) exit(0); @@ -298,6 +296,31 @@ int opt_default(const char *opt, const char *arg){ int ret= 0; const AVOption *o= NULL; int opt_types[]={AV_OPT_FLAG_VIDEO_PARAM, AV_OPT_FLAG_AUDIO_PARAM, 0, AV_OPT_FLAG_SUBTITLE_PARAM, 0}; + AVCodec *p = NULL; + AVOutputFormat *oformat = NULL; + AVInputFormat *iformat = NULL; + + while ((p = av_codec_next(p))) { + AVClass *c = p->priv_class; + if (c && av_find_opt(&c, opt, NULL, 0, 0)) + break; + } + if (p) + goto out; + while ((oformat = av_oformat_next(oformat))) { + const AVClass *c = oformat->priv_class; + if (c && av_find_opt(&c, opt, NULL, 0, 0)) + break; + } + if (oformat) + goto out; + while ((iformat = av_iformat_next(iformat))) { + const AVClass *c = iformat->priv_class; + if (c && av_find_opt(&c, opt, NULL, 0, 0)) + break; + } + if (iformat) + goto out; for(type=0; *avcodec_opts && type<AVMEDIA_TYPE_NB && ret>= 0; type++){ const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); @@ -315,39 +338,25 @@ int opt_default(const char *opt, const char *arg){ ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o); else if(opt[0] == 's' && avcodec_opts[AVMEDIA_TYPE_SUBTITLE]) ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o); + if (ret >= 0) + opt += 1; } if (o && ret < 0) { fprintf(stderr, "Invalid value '%s' for option '%s'\n", arg, opt); exit(1); } if (!o) { - AVCodec *p = NULL; - AVOutputFormat *oformat = NULL; - while ((p=av_codec_next(p))){ - AVClass *c= p->priv_class; - if(c && av_find_opt(&c, opt, NULL, 0, 0)) - break; - } - if (!p) { - while ((oformat = av_oformat_next(oformat))) { - const AVClass *c = oformat->priv_class; - if (c && av_find_opt(&c, opt, NULL, 0, 0)) - break; - } - } - if(!p && !oformat){ - fprintf(stderr, "Unrecognized option '%s'\n", opt); - exit(1); - } + fprintf(stderr, "Unrecognized option '%s'\n", opt); + exit(1); } + out: // av_log(NULL, AV_LOG_ERROR, "%s:%s: %f 0x%0X\n", opt, arg, av_get_double(avcodec_opts, opt, NULL), (int)av_get_int(avcodec_opts, opt, NULL)); - //FIXME we should always use avcodec_opts, ... for storing options so there will not be any need to keep track of what i set over this opt_values= av_realloc(opt_values, sizeof(void*)*(opt_name_count+1)); - opt_values[opt_name_count]= o ? NULL : av_strdup(arg); + opt_values[opt_name_count] = av_strdup(arg); opt_names= av_realloc(opt_names, sizeof(void*)*(opt_name_count+1)); - opt_names[opt_name_count++]= o ? o->name : av_strdup(opt); + opt_names[opt_name_count++] = av_strdup(opt); if ((*avcodec_opts && avcodec_opts[0]->debug) || (avformat_opts && avformat_opts->debug)) av_log_set_level(AV_LOG_DEBUG); @@ -402,34 +411,54 @@ int opt_timelimit(const char *opt, const char *arg) return 0; } +static void *alloc_priv_context(int size, AVClass *class){ + void *p = av_mallocz(size); + if (p) { + *(AVClass**)p = class; + av_opt_set_defaults(p); + } + return p; +} + void set_context_opts(void *ctx, void *opts_ctx, int flags, AVCodec *codec) { int i; void *priv_ctx=NULL; if(!strcmp("AVCodecContext", (*(AVClass**)ctx)->class_name)){ AVCodecContext *avctx= ctx; - if(codec && codec->priv_class && avctx->priv_data){ + if(codec && codec->priv_class){ + if(!avctx->priv_data && codec->priv_data_size) + avctx->priv_data= alloc_priv_context(codec->priv_data_size, codec->priv_class); priv_ctx= avctx->priv_data; } } else if (!strcmp("AVFormatContext", (*(AVClass**)ctx)->class_name)) { AVFormatContext *avctx = ctx; if (avctx->oformat && avctx->oformat->priv_class) { priv_ctx = avctx->priv_data; + } else if (avctx->iformat && avctx->iformat->priv_class) { + priv_ctx = avctx->priv_data; } } for(i=0; i<opt_name_count; i++){ char buf[256]; const AVOption *opt; - const char *str= av_get_string(opts_ctx, opt_names[i], &opt, buf, sizeof(buf)); - /* if an option with name opt_names[i] is present in opts_ctx then str is non-NULL */ - if(str && ((opt->flags & flags) == flags)) - av_set_string3(ctx, opt_names[i], str, 1, NULL); - /* We need to use a differnt system to pass options to the private context because - it is not known which codec and thus context kind that will be when parsing options - we thus use opt_values directly instead of opts_ctx */ - if(!str && priv_ctx && av_get_string(priv_ctx, opt_names[i], &opt, buf, sizeof(buf))){ - av_set_string3(priv_ctx, opt_names[i], opt_values[i], 1, NULL); + const char *str; + if (priv_ctx) { + if (av_find_opt(priv_ctx, opt_names[i], NULL, flags, flags)) { + if (av_set_string3(priv_ctx, opt_names[i], opt_values[i], 1, NULL) < 0) { + fprintf(stderr, "Invalid value '%s' for option '%s'\n", + opt_names[i], opt_values[i]); + exit(1); + } + } else + goto global; + } else { + global: + str = av_get_string(opts_ctx, opt_names[i], &opt, buf, sizeof(buf)); + /* if an option with name opt_names[i] is present in opts_ctx then str is non-NULL */ + if (str && ((opt->flags & flags) == flags)) + av_set_string3(ctx, opt_names[i], str, 1, NULL); } } } @@ -464,7 +493,7 @@ static int warned_cfg = 0; } \ if (flags & SHOW_CONFIG) { \ const char *cfg = libname##_configuration(); \ - if (strcmp(LIBAV_CONFIGURATION, cfg)) { \ + if (strcmp(FFMPEG_CONFIGURATION, cfg)) { \ if (!warned_cfg) { \ fprintf(outstream, \ "%sWARNING: library configuration mismatch\n", \ @@ -490,17 +519,17 @@ static void print_all_libs_info(FILE* outstream, int flags) void show_banner(void) { - fprintf(stderr, "%s version " LIBAV_VERSION ", Copyright (c) %d-%d the Libav developers\n", + fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n", program_name, program_birth_year, this_year); fprintf(stderr, " built on %s %s with %s %s\n", __DATE__, __TIME__, CC_TYPE, CC_VERSION); - fprintf(stderr, " configuration: " LIBAV_CONFIGURATION "\n"); + fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n"); print_all_libs_info(stderr, INDENT|SHOW_CONFIG); print_all_libs_info(stderr, INDENT|SHOW_VERSION); } void show_version(void) { - printf("%s " LIBAV_VERSION "\n", program_name); + printf("%s " FFMPEG_VERSION "\n", program_name); print_all_libs_info(stdout, SHOW_VERSION); } @@ -710,16 +739,20 @@ void show_bsfs(void) void show_protocols(void) { - void *opaque = NULL; - const char *name; + URLProtocol *up=NULL; printf("Supported file protocols:\n" - "Input:\n"); - while ((name = avio_enum_protocols(&opaque, 0))) - printf("%s\n", name); - printf("Output:\n"); - while ((name = avio_enum_protocols(&opaque, 1))) - printf("%s\n", name); + "I.. = Input supported\n" + ".O. = Output supported\n" + "..S = Seek supported\n" + "FLAGS NAME\n" + "----- \n"); + while((up = av_protocol_next(up))) + printf("%c%c%c %s\n", + up->url_read ? 'I' : '.', + up->url_write ? 'O' : '.', + up->url_seek ? 'S' : '.', + up->name); } void show_filters(void) @@ -801,33 +834,6 @@ int read_file(const char *filename, char **bufptr, size_t *size) return 0; } -void init_pts_correction(PtsCorrectionContext *ctx) -{ - ctx->num_faulty_pts = ctx->num_faulty_dts = 0; - ctx->last_pts = ctx->last_dts = INT64_MIN; -} - -int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t reordered_pts, int64_t dts) -{ - int64_t pts = AV_NOPTS_VALUE; - - if (dts != AV_NOPTS_VALUE) { - ctx->num_faulty_dts += dts <= ctx->last_dts; - ctx->last_dts = dts; - } - if (reordered_pts != AV_NOPTS_VALUE) { - ctx->num_faulty_pts += reordered_pts <= ctx->last_pts; - ctx->last_pts = reordered_pts; - } - if ((ctx->num_faulty_pts<=ctx->num_faulty_dts || dts == AV_NOPTS_VALUE) - && reordered_pts != AV_NOPTS_VALUE) - pts = reordered_pts; - else - pts = dts; - - return pts; -} - FILE *get_preset_file(char *filename, size_t filename_size, const char *preset_name, int is_path, const char *codec_name) { @@ -913,10 +919,12 @@ int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame, memcpy(frame->data, picref->data, sizeof(frame->data)); memcpy(frame->linesize, picref->linesize, sizeof(frame->linesize)); + frame->pkt_pos = picref->pos; frame->interlaced_frame = picref->video->interlaced; frame->top_field_first = picref->video->top_field_first; frame->key_frame = picref->video->key_frame; frame->pict_type = picref->video->pict_type; + frame->sample_aspect_ratio = picref->video->sample_aspect_ratio; return 1; } |