mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-19 21:36:54 +00:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: lavc: fix type for thread_type option avconv: move format to options context avconv: move limit_filesize to options context avconv: move start_time, recording_time and input_ts_offset to options context avconv: add a context for options. cmdutils: allow storing per-stream/chapter/.... options in a generic way cmdutils: split per-option code out of parse_options(). cmdutils: add support for caller-provided option context. cmdutils: declare only one pointer type in OptionDef cmdutils: move grow_array() from avconv to cmdutils. cmdutils: move exit_program() declaration to cmdutils from avconv http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes nutenc: add namespace to the api facing functions Conflicts: avconv.c cmdutils.c cmdutils.h ffmpeg.c ffplay.c ffprobe.c ffserver.c libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
commit
d2084402e6
216
avconv.c
216
avconv.c
@ -110,12 +110,8 @@ typedef struct MetadataMap {
|
||||
static const OptionDef options[];
|
||||
|
||||
#define MAX_STREAMS 1024 /* arbitrary sanity check value */
|
||||
static const char *last_asked_format = NULL;
|
||||
static AVDictionary *ts_scale;
|
||||
|
||||
static StreamMap *stream_maps = NULL;
|
||||
static int nb_stream_maps;
|
||||
|
||||
static AVDictionary *codec_names;
|
||||
|
||||
/* first item specifies output metadata, second is input */
|
||||
@ -175,9 +171,6 @@ static unsigned int data_codec_tag = 0;
|
||||
static float mux_preload= 0.5;
|
||||
static float mux_max_delay= 0.7;
|
||||
|
||||
static int64_t recording_time = INT64_MAX;
|
||||
static int64_t start_time = 0;
|
||||
static int64_t input_ts_offset = 0;
|
||||
static int file_overwrite = 0;
|
||||
static AVDictionary *metadata;
|
||||
static int do_benchmark = 0;
|
||||
@ -212,7 +205,6 @@ static int64_t extra_size = 0;
|
||||
static int nb_frames_dup = 0;
|
||||
static int nb_frames_drop = 0;
|
||||
static int input_sync;
|
||||
static uint64_t limit_filesize = UINT64_MAX;
|
||||
static int force_fps = 0;
|
||||
static char *forced_key_frames = NULL;
|
||||
|
||||
@ -337,6 +329,56 @@ static int nb_output_streams = 0;
|
||||
static OutputFile *output_files = NULL;
|
||||
static int nb_output_files = 0;
|
||||
|
||||
typedef struct OptionsContext {
|
||||
/* input/output options */
|
||||
int64_t start_time;
|
||||
const char *format;
|
||||
|
||||
/* input options */
|
||||
int64_t input_ts_offset;
|
||||
|
||||
/* output options */
|
||||
StreamMap *stream_maps;
|
||||
int nb_stream_maps;
|
||||
|
||||
int64_t recording_time;
|
||||
uint64_t limit_filesize;
|
||||
} OptionsContext;
|
||||
|
||||
static void reset_options(OptionsContext *o)
|
||||
{
|
||||
const OptionDef *po = options;
|
||||
|
||||
/* all OPT_SPEC and OPT_STRING can be freed in generic way */
|
||||
while (po->name) {
|
||||
void *dst = (uint8_t*)o + po->u.off;
|
||||
|
||||
if (po->flags & OPT_SPEC) {
|
||||
SpecifierOpt **so = dst;
|
||||
int i, *count = (int*)(so + 1);
|
||||
for (i = 0; i < *count; i++) {
|
||||
av_freep(&(*so)[i].specifier);
|
||||
if (po->flags & OPT_STRING)
|
||||
av_freep(&(*so)[i].u.str);
|
||||
}
|
||||
av_freep(so);
|
||||
*count = 0;
|
||||
} else if (po->flags & OPT_OFFSET && po->flags & OPT_STRING)
|
||||
av_freep(dst);
|
||||
po++;
|
||||
}
|
||||
|
||||
av_freep(&o->stream_maps);
|
||||
|
||||
memset(o, 0, sizeof(*o));
|
||||
|
||||
o->recording_time = INT64_MAX;
|
||||
o->limit_filesize = UINT64_MAX;
|
||||
|
||||
uninit_opts();
|
||||
init_opts();
|
||||
}
|
||||
|
||||
#if CONFIG_AVFILTER
|
||||
|
||||
static int configure_video_filters(InputStream *ist, OutputStream *ost)
|
||||
@ -510,7 +552,7 @@ static int decode_interrupt_cb(void)
|
||||
return q_pressed > 1;
|
||||
}
|
||||
|
||||
static int exit_program(int ret)
|
||||
void exit_program(int ret)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -560,7 +602,6 @@ static int exit_program(int ret)
|
||||
}
|
||||
|
||||
exit(ret); /* not all OS-es handle main() return value */
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void assert_avoptions(AVDictionary *m)
|
||||
@ -589,26 +630,6 @@ static void assert_codec_experimental(AVCodecContext *c, int encoder)
|
||||
}
|
||||
}
|
||||
|
||||
/* similar to ff_dynarray_add() and av_fast_realloc() */
|
||||
static void *grow_array(void *array, int elem_size, int *size, int new_size)
|
||||
{
|
||||
if (new_size >= INT_MAX / elem_size) {
|
||||
fprintf(stderr, "Array too big.\n");
|
||||
exit_program(1);
|
||||
}
|
||||
if (*size < new_size) {
|
||||
uint8_t *tmp = av_realloc(array, new_size*elem_size);
|
||||
if (!tmp) {
|
||||
fprintf(stderr, "Could not alloc buffer.\n");
|
||||
exit_program(1);
|
||||
}
|
||||
memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size);
|
||||
*size = new_size;
|
||||
return tmp;
|
||||
}
|
||||
return array;
|
||||
}
|
||||
|
||||
static void choose_sample_fmt(AVStream *st, AVCodec *codec)
|
||||
{
|
||||
if(codec && codec->sample_fmts){
|
||||
@ -2552,12 +2573,6 @@ static int transcode(OutputFile *output_files,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int opt_format(const char *opt, const char *arg)
|
||||
{
|
||||
last_asked_format = arg;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_video_rc_override_string(const char *opt, const char *arg)
|
||||
{
|
||||
video_rc_override_string = arg;
|
||||
@ -2738,7 +2753,7 @@ static int opt_codec_tag(const char *opt, const char *arg)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_map(const char *opt, const char *arg)
|
||||
static int opt_map(OptionsContext *o, const char *opt, const char *arg)
|
||||
{
|
||||
StreamMap *m = NULL;
|
||||
int i, negative = 0, file_idx;
|
||||
@ -2783,8 +2798,8 @@ static int opt_map(const char *opt, const char *arg)
|
||||
}
|
||||
if (negative)
|
||||
/* disable some already defined maps */
|
||||
for (i = 0; i < nb_stream_maps; i++) {
|
||||
m = &stream_maps[i];
|
||||
for (i = 0; i < o->nb_stream_maps; i++) {
|
||||
m = &o->stream_maps[i];
|
||||
if (check_stream_specifier(input_files[m->file_index].ctx,
|
||||
input_files[m->file_index].ctx->streams[m->stream_index],
|
||||
*p == ':' ? p + 1 : p) > 0)
|
||||
@ -2795,8 +2810,9 @@ static int opt_map(const char *opt, const char *arg)
|
||||
if (check_stream_specifier(input_files[file_idx].ctx, input_files[file_idx].ctx->streams[i],
|
||||
*p == ':' ? p + 1 : p) <= 0)
|
||||
continue;
|
||||
stream_maps = grow_array(stream_maps, sizeof(*stream_maps), &nb_stream_maps, nb_stream_maps + 1);
|
||||
m = &stream_maps[nb_stream_maps - 1];
|
||||
o->stream_maps = grow_array(o->stream_maps, sizeof(*o->stream_maps),
|
||||
&o->nb_stream_maps, o->nb_stream_maps + 1);
|
||||
m = &o->stream_maps[o->nb_stream_maps - 1];
|
||||
|
||||
m->file_index = file_idx;
|
||||
m->stream_index = i;
|
||||
@ -2873,24 +2889,6 @@ static int opt_input_ts_scale(const char *opt, const char *arg)
|
||||
return av_dict_set(&ts_scale, opt, arg, 0);
|
||||
}
|
||||
|
||||
static int opt_recording_time(const char *opt, const char *arg)
|
||||
{
|
||||
recording_time = parse_time_or_die(opt, arg, 1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_start_time(const char *opt, const char *arg)
|
||||
{
|
||||
start_time = parse_time_or_die(opt, arg, 1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_input_ts_offset(const char *opt, const char *arg)
|
||||
{
|
||||
input_ts_offset = parse_time_or_die(opt, arg, 1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static enum CodecID find_codec_or_die(const char *name, enum AVMediaType type, int encoder)
|
||||
{
|
||||
const char *codec_string = encoder ? "encoder" : "decoder";
|
||||
@ -3029,7 +3027,7 @@ static void add_input_streams(AVFormatContext *ic)
|
||||
}
|
||||
}
|
||||
|
||||
static int opt_input_file(const char *opt, const char *filename)
|
||||
static int opt_input_file(OptionsContext *o, const char *opt, const char *filename)
|
||||
{
|
||||
AVFormatContext *ic;
|
||||
AVInputFormat *file_iformat = NULL;
|
||||
@ -3039,12 +3037,11 @@ static int opt_input_file(const char *opt, const char *filename)
|
||||
AVDictionary **opts;
|
||||
int orig_nb_streams; // number of streams before avformat_find_stream_info
|
||||
|
||||
if (last_asked_format) {
|
||||
if (!(file_iformat = av_find_input_format(last_asked_format))) {
|
||||
fprintf(stderr, "Unknown input format: '%s'\n", last_asked_format);
|
||||
if (o->format) {
|
||||
if (!(file_iformat = av_find_input_format(o->format))) {
|
||||
fprintf(stderr, "Unknown input format: '%s'\n", o->format);
|
||||
exit_program(1);
|
||||
}
|
||||
last_asked_format = NULL;
|
||||
}
|
||||
|
||||
if (!strcmp(filename, "-"))
|
||||
@ -3129,20 +3126,18 @@ static int opt_input_file(const char *opt, const char *filename)
|
||||
exit_program(1);
|
||||
}
|
||||
|
||||
timestamp = start_time;
|
||||
timestamp = o->start_time;
|
||||
/* add the stream start time */
|
||||
if (ic->start_time != AV_NOPTS_VALUE)
|
||||
timestamp += ic->start_time;
|
||||
|
||||
/* if seeking requested, we execute it */
|
||||
if (start_time != 0) {
|
||||
if (o->start_time != 0) {
|
||||
ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD);
|
||||
if (ret < 0) {
|
||||
fprintf(stderr, "%s: could not seek to position %0.3f\n",
|
||||
filename, (double)timestamp / AV_TIME_BASE);
|
||||
}
|
||||
/* reset seek info */
|
||||
start_time = 0;
|
||||
}
|
||||
|
||||
/* update the current parameters so that they match the one of the input stream */
|
||||
@ -3155,7 +3150,7 @@ static int opt_input_file(const char *opt, const char *filename)
|
||||
input_files = grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1);
|
||||
input_files[nb_input_files - 1].ctx = ic;
|
||||
input_files[nb_input_files - 1].ist_index = nb_input_streams - ic->nb_streams;
|
||||
input_files[nb_input_files - 1].ts_offset = input_ts_offset - (copy_ts ? 0 : timestamp);
|
||||
input_files[nb_input_files - 1].ts_offset = o->input_ts_offset - (copy_ts ? 0 : timestamp);
|
||||
input_files[nb_input_files - 1].nb_streams = ic->nb_streams;
|
||||
|
||||
top_field_first = -1;
|
||||
@ -3167,14 +3162,13 @@ static int opt_input_file(const char *opt, const char *filename)
|
||||
audio_channels = 0;
|
||||
audio_sample_fmt = AV_SAMPLE_FMT_NONE;
|
||||
av_dict_free(&ts_scale);
|
||||
input_ts_offset = 0;
|
||||
|
||||
for (i = 0; i < orig_nb_streams; i++)
|
||||
av_dict_free(&opts[i]);
|
||||
av_freep(&opts);
|
||||
av_dict_free(&codec_names);
|
||||
uninit_opts();
|
||||
init_opts();
|
||||
|
||||
reset_options(o);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -3465,18 +3459,18 @@ static int opt_streamid(const char *opt, const char *arg)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int copy_chapters(int infile, int outfile)
|
||||
static int copy_chapters(InputFile *ifile, OutputFile *ofile)
|
||||
{
|
||||
AVFormatContext *is = input_files[infile].ctx;
|
||||
AVFormatContext *os = output_files[outfile].ctx;
|
||||
AVFormatContext *is = ifile->ctx;
|
||||
AVFormatContext *os = ofile->ctx;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < is->nb_chapters; i++) {
|
||||
AVChapter *in_ch = is->chapters[i], *out_ch;
|
||||
int64_t ts_off = av_rescale_q(start_time - input_files[infile].ts_offset,
|
||||
int64_t ts_off = av_rescale_q(ofile->start_time - ifile->ts_offset,
|
||||
AV_TIME_BASE_Q, in_ch->time_base);
|
||||
int64_t rt = (recording_time == INT64_MAX) ? INT64_MAX :
|
||||
av_rescale_q(recording_time, AV_TIME_BASE_Q, in_ch->time_base);
|
||||
int64_t rt = (ofile->recording_time == INT64_MAX) ? INT64_MAX :
|
||||
av_rescale_q(ofile->recording_time, AV_TIME_BASE_Q, in_ch->time_base);
|
||||
|
||||
|
||||
if (in_ch->end < ts_off)
|
||||
@ -3539,8 +3533,9 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_output_file(const char *opt, const char *filename)
|
||||
static void opt_output_file(void *optctx, const char *filename)
|
||||
{
|
||||
OptionsContext *o = optctx;
|
||||
AVFormatContext *oc;
|
||||
int i, err;
|
||||
AVOutputFormat *file_oformat;
|
||||
@ -3550,8 +3545,7 @@ static int opt_output_file(const char *opt, const char *filename)
|
||||
if (!strcmp(filename, "-"))
|
||||
filename = "pipe:";
|
||||
|
||||
err = avformat_alloc_output_context2(&oc, NULL, last_asked_format, filename);
|
||||
last_asked_format = NULL;
|
||||
err = avformat_alloc_output_context2(&oc, NULL, o->format, filename);
|
||||
if (!oc) {
|
||||
print_error(filename, err);
|
||||
exit_program(1);
|
||||
@ -3568,7 +3562,7 @@ static int opt_output_file(const char *opt, const char *filename)
|
||||
print_error(filename, err);
|
||||
exit_program(1);
|
||||
}
|
||||
} else if (!nb_stream_maps) {
|
||||
} else if (!o->nb_stream_maps) {
|
||||
/* pick the "best" stream of each type */
|
||||
#define NEW_STREAM(type, index)\
|
||||
if (index >= 0) {\
|
||||
@ -3616,8 +3610,8 @@ static int opt_output_file(const char *opt, const char *filename)
|
||||
}
|
||||
/* do something with data? */
|
||||
} else {
|
||||
for (i = 0; i < nb_stream_maps; i++) {
|
||||
StreamMap *map = &stream_maps[i];
|
||||
for (i = 0; i < o->nb_stream_maps; i++) {
|
||||
StreamMap *map = &o->stream_maps[i];
|
||||
|
||||
if (map->disabled)
|
||||
continue;
|
||||
@ -3648,9 +3642,9 @@ static int opt_output_file(const char *opt, const char *filename)
|
||||
output_files = grow_array(output_files, sizeof(*output_files), &nb_output_files, nb_output_files + 1);
|
||||
output_files[nb_output_files - 1].ctx = oc;
|
||||
output_files[nb_output_files - 1].ost_index = nb_output_streams - oc->nb_streams;
|
||||
output_files[nb_output_files - 1].recording_time = recording_time;
|
||||
output_files[nb_output_files - 1].start_time = start_time;
|
||||
output_files[nb_output_files - 1].limit_filesize = limit_filesize;
|
||||
output_files[nb_output_files - 1].recording_time = o->recording_time;
|
||||
output_files[nb_output_files - 1].start_time = o->start_time;
|
||||
output_files[nb_output_files - 1].limit_filesize = o->limit_filesize;
|
||||
av_dict_copy(&output_files[nb_output_files - 1].opts, format_opts, 0);
|
||||
|
||||
/* check filename in case of an image number is expected */
|
||||
@ -3710,7 +3704,7 @@ static int opt_output_file(const char *opt, const char *filename)
|
||||
}
|
||||
}
|
||||
if (chapters_input_file >= 0)
|
||||
copy_chapters(chapters_input_file, nb_output_files - 1);
|
||||
copy_chapters(&input_files[chapters_input_file], &output_files[nb_output_files - 1]);
|
||||
|
||||
/* copy metadata */
|
||||
for (i = 0; i < nb_meta_data_maps; i++) {
|
||||
@ -3775,26 +3769,19 @@ static int opt_output_file(const char *opt, const char *filename)
|
||||
audio_channels = 0;
|
||||
audio_sample_fmt = AV_SAMPLE_FMT_NONE;
|
||||
chapters_input_file = INT_MAX;
|
||||
recording_time = INT64_MAX;
|
||||
start_time = 0;
|
||||
limit_filesize = UINT64_MAX;
|
||||
|
||||
av_freep(&meta_data_maps);
|
||||
nb_meta_data_maps = 0;
|
||||
metadata_global_autocopy = 1;
|
||||
metadata_streams_autocopy = 1;
|
||||
metadata_chapters_autocopy = 1;
|
||||
av_freep(&stream_maps);
|
||||
nb_stream_maps = 0;
|
||||
av_freep(&streamid_map);
|
||||
nb_streamid_map = 0;
|
||||
|
||||
av_dict_free(&codec_names);
|
||||
|
||||
av_freep(&forced_key_frames);
|
||||
uninit_opts();
|
||||
init_opts();
|
||||
return 0;
|
||||
reset_options(o);
|
||||
}
|
||||
|
||||
/* same option as mencoder */
|
||||
@ -3949,7 +3936,7 @@ static int opt_help(const char *opt, const char *arg)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_target(const char *opt, const char *arg)
|
||||
static int opt_target(OptionsContext *o, const char *opt, const char *arg)
|
||||
{
|
||||
enum { PAL, NTSC, FILM, UNKNOWN } norm = UNKNOWN;
|
||||
static const char *const frame_rates[] = {"25", "30000/1001", "24000/1001"};
|
||||
@ -4008,7 +3995,7 @@ static int opt_target(const char *opt, const char *arg)
|
||||
if(!strcmp(arg, "vcd")) {
|
||||
opt_codec("c:v", "mpeg1video");
|
||||
opt_codec("c:a", "mp2");
|
||||
opt_format("f", "vcd");
|
||||
parse_option(o, "f", "vcd", options);
|
||||
|
||||
opt_frame_size("s", norm == PAL ? "352x288" : "352x240");
|
||||
opt_frame_rate("r", frame_rates[norm]);
|
||||
@ -4036,7 +4023,7 @@ static int opt_target(const char *opt, const char *arg)
|
||||
|
||||
opt_codec("c:v", "mpeg2video");
|
||||
opt_codec("c:a", "mp2");
|
||||
opt_format("f", "svcd");
|
||||
parse_option(o, "f", "svcd", options);
|
||||
|
||||
opt_frame_size("s", norm == PAL ? "480x576" : "480x480");
|
||||
opt_frame_rate("r", frame_rates[norm]);
|
||||
@ -4059,7 +4046,7 @@ static int opt_target(const char *opt, const char *arg)
|
||||
|
||||
opt_codec("c:v", "mpeg2video");
|
||||
opt_codec("c:a", "ac3");
|
||||
opt_format("f", "dvd");
|
||||
parse_option(o, "f", "dvd", options);
|
||||
|
||||
opt_frame_size("vcodec", norm == PAL ? "720x576" : "720x480");
|
||||
opt_frame_rate("r", frame_rates[norm]);
|
||||
@ -4079,7 +4066,7 @@ static int opt_target(const char *opt, const char *arg)
|
||||
|
||||
} else if(!strncmp(arg, "dv", 2)) {
|
||||
|
||||
opt_format("f", "dv");
|
||||
parse_option(o, "f", "dv", options);
|
||||
|
||||
opt_frame_size("s", norm == PAL ? "720x576" : "720x480");
|
||||
opt_frame_pix_fmt("pix_fmt", !strncmp(arg, "dv50", 4) ? "yuv422p" :
|
||||
@ -4149,22 +4136,23 @@ static int opt_passlogfile(const char *opt, const char *arg)
|
||||
#endif
|
||||
}
|
||||
|
||||
#define OFFSET(x) offsetof(OptionsContext, x)
|
||||
static const OptionDef options[] = {
|
||||
/* main options */
|
||||
#include "cmdutils_common_opts.h"
|
||||
{ "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" },
|
||||
{ "i", HAS_ARG, {(void*)opt_input_file}, "input file name", "filename" },
|
||||
{ "f", HAS_ARG | OPT_STRING | OPT_OFFSET, {.off = OFFSET(format)}, "force format", "fmt" },
|
||||
{ "i", HAS_ARG | OPT_FUNC2, {(void*)opt_input_file}, "input file name", "filename" },
|
||||
{ "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" },
|
||||
{ "c", HAS_ARG, {(void*)opt_codec}, "codec name", "codec" },
|
||||
{ "codec", HAS_ARG, {(void*)opt_codec}, "codec name", "codec" },
|
||||
{ "map", HAS_ARG | OPT_EXPERT, {(void*)opt_map}, "set input stream mapping", "file.stream[:syncfile.syncstream]" },
|
||||
{ "map", HAS_ARG | OPT_EXPERT | OPT_FUNC2, {(void*)opt_map}, "set input stream mapping", "file.stream[:syncfile.syncstream]" },
|
||||
{ "map_metadata", HAS_ARG | OPT_EXPERT, {(void*)opt_map_metadata}, "set metadata information of outfile from infile",
|
||||
"outfile[,metadata]:infile[,metadata]" },
|
||||
{ "map_chapters", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&chapters_input_file}, "set chapters mapping", "input_file_index" },
|
||||
{ "t", HAS_ARG, {(void*)opt_recording_time}, "record or transcode \"duration\" seconds of audio/video", "duration" },
|
||||
{ "fs", HAS_ARG | OPT_INT64, {(void*)&limit_filesize}, "set the limit file size in bytes", "limit_size" }, //
|
||||
{ "ss", HAS_ARG, {(void*)opt_start_time}, "set the start time offset", "time_off" },
|
||||
{ "itsoffset", HAS_ARG, {(void*)opt_input_ts_offset}, "set the input ts offset", "time_off" },
|
||||
{ "t", HAS_ARG | OPT_TIME | OPT_OFFSET, {.off = OFFSET(recording_time)}, "record or transcode \"duration\" seconds of audio/video", "duration" },
|
||||
{ "fs", HAS_ARG | OPT_INT64 | OPT_OFFSET, {.off = OFFSET(limit_filesize)}, "set the limit file size in bytes", "limit_size" }, //
|
||||
{ "ss", HAS_ARG | OPT_TIME | OPT_OFFSET, {.off = OFFSET(start_time)}, "set the start time offset", "time_off" },
|
||||
{ "itsoffset", HAS_ARG | OPT_TIME | OPT_OFFSET, {.off = OFFSET(input_ts_offset)}, "set the input ts offset", "time_off" },
|
||||
{ "itsscale", HAS_ARG, {(void*)opt_input_ts_scale}, "set the input ts scale", "scale" },
|
||||
{ "metadata", HAS_ARG, {(void*)opt_metadata}, "add metadata", "string=string" },
|
||||
{ "dframes", OPT_INT | HAS_ARG, {(void*)&max_frames[AVMEDIA_TYPE_DATA]}, "set the number of data frames to record", "number" },
|
||||
@ -4177,7 +4165,7 @@ static const OptionDef options[] = {
|
||||
"when dumping packets, also dump the payload" },
|
||||
{ "re", OPT_BOOL | OPT_EXPERT, {(void*)&rate_emu}, "read input at native frame rate", "" },
|
||||
{ "v", HAS_ARG, {(void*)opt_verbose}, "set the verbosity level", "number" },
|
||||
{ "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
|
||||
{ "target", HAS_ARG | OPT_FUNC2, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
|
||||
{ "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" },
|
||||
{ "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" },
|
||||
{ "adrift_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&audio_drift_threshold}, "audio drift threshold", "threshold" },
|
||||
@ -4263,8 +4251,11 @@ static const OptionDef options[] = {
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
OptionsContext o = { 0 };
|
||||
int64_t ti;
|
||||
|
||||
reset_options(&o);
|
||||
|
||||
av_log_set_flags(AV_LOG_SKIP_REPEATED);
|
||||
|
||||
if(argc>1 && !strcmp(argv[1], "-d")){
|
||||
@ -4289,13 +4280,11 @@ int main(int argc, char **argv)
|
||||
avio_set_interrupt_cb(decode_interrupt_cb);
|
||||
#endif
|
||||
|
||||
init_opts();
|
||||
|
||||
if(verbose>=0)
|
||||
show_banner();
|
||||
|
||||
/* parse options */
|
||||
parse_options(argc, argv, options, opt_output_file);
|
||||
parse_options(&o, argc, argv, options, opt_output_file);
|
||||
|
||||
if(nb_output_files <= 0 && nb_input_files == 0) {
|
||||
show_usage();
|
||||
@ -4323,5 +4312,6 @@ int main(int argc, char **argv)
|
||||
printf("bench: utime=%0.3fs maxrss=%ikB\n", ti / 1000000.0, maxrss);
|
||||
}
|
||||
|
||||
return exit_program(0);
|
||||
exit_program(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
155
cmdutils.c
155
cmdutils.c
@ -92,7 +92,8 @@ double parse_number_or_die(const char *context, const char *numstr, int type, do
|
||||
else
|
||||
return d;
|
||||
fprintf(stderr, error, context, numstr, min, max);
|
||||
exit(1);
|
||||
exit_program(1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int64_t parse_time_or_die(const char *context, const char *timestr, int is_duration)
|
||||
@ -101,7 +102,7 @@ int64_t parse_time_or_die(const char *context, const char *timestr, int is_durat
|
||||
if (av_parse_time(&us, timestr, is_duration) < 0) {
|
||||
fprintf(stderr, "Invalid %s specification for %s: %s\n",
|
||||
is_duration ? "duration" : "date", context, timestr);
|
||||
exit(1);
|
||||
exit_program(1);
|
||||
}
|
||||
return us;
|
||||
}
|
||||
@ -202,12 +203,80 @@ static inline void prepare_app_arguments(int *argc_ptr, char ***argv_ptr)
|
||||
}
|
||||
#endif /* WIN32 && !__MINGW32CE__ */
|
||||
|
||||
void parse_options(int argc, char **argv, const OptionDef *options,
|
||||
int (* parse_arg_function)(const char *opt, const char *arg))
|
||||
|
||||
int parse_option(void *optctx, const char *opt, const char *arg, const OptionDef *options)
|
||||
{
|
||||
const char *opt, *arg;
|
||||
int optindex, handleoptions=1;
|
||||
const OptionDef *po;
|
||||
int bool_val = 1;
|
||||
int *dstcount;
|
||||
void *dst;
|
||||
|
||||
po = find_option(options, opt);
|
||||
if (!po->name && opt[0] == 'n' && opt[1] == 'o') {
|
||||
/* handle 'no' bool option */
|
||||
po = find_option(options, opt + 2);
|
||||
if (!(po->name && (po->flags & OPT_BOOL)))
|
||||
goto unknown_opt;
|
||||
bool_val = 0;
|
||||
}
|
||||
if (!po->name)
|
||||
po = find_option(options, "default");
|
||||
if (!po->name) {
|
||||
unknown_opt:
|
||||
av_log(NULL, AV_LOG_ERROR, "Unrecognized option '%s'\n", opt);
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
if (po->flags & HAS_ARG && !arg) {
|
||||
av_log(NULL, AV_LOG_ERROR, "Missing argument for option '%s'\n", opt);
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
/* new-style options contain an offset into optctx, old-style address of
|
||||
* a global var*/
|
||||
dst = po->flags & (OPT_OFFSET|OPT_SPEC) ? (uint8_t*)optctx + po->u.off : po->u.dst_ptr;
|
||||
|
||||
if (po->flags & OPT_SPEC) {
|
||||
SpecifierOpt **so = dst;
|
||||
char *p = strchr(opt, ':');
|
||||
|
||||
dstcount = (int*)(so + 1);
|
||||
*so = grow_array(*so, sizeof(**so), dstcount, *dstcount + 1);
|
||||
(*so)[*dstcount - 1].specifier = av_strdup(p ? p + 1 : "");
|
||||
dst = &(*so)[*dstcount - 1].u;
|
||||
}
|
||||
|
||||
if (po->flags & OPT_STRING) {
|
||||
char *str;
|
||||
str = av_strdup(arg);
|
||||
*(char**)dst = str;
|
||||
} else if (po->flags & OPT_BOOL) {
|
||||
*(int*)dst = bool_val;
|
||||
} else if (po->flags & OPT_INT) {
|
||||
*(int*)dst = parse_number_or_die(opt, arg, OPT_INT64, INT_MIN, INT_MAX);
|
||||
} else if (po->flags & OPT_INT64) {
|
||||
*(int64_t*)dst = parse_number_or_die(opt, arg, OPT_INT64, INT64_MIN, INT64_MAX);
|
||||
} else if (po->flags & OPT_TIME) {
|
||||
*(int64_t*)dst = parse_time_or_die(opt, arg, 1);
|
||||
} else if (po->flags & OPT_FLOAT) {
|
||||
*(float*)dst = parse_number_or_die(opt, arg, OPT_FLOAT, -INFINITY, INFINITY);
|
||||
} else if (po->u.func_arg) {
|
||||
int ret = po->flags & OPT_FUNC2 ? po->u.func2_arg(optctx, opt, arg) :
|
||||
po->u.func_arg(opt, arg);
|
||||
if (ret < 0) {
|
||||
av_log(NULL, AV_LOG_ERROR, "Failed to set value '%s' for option '%s'\n", arg, opt);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
if (po->flags & OPT_EXIT)
|
||||
exit_program(0);
|
||||
return !!(po->flags & HAS_ARG);
|
||||
}
|
||||
|
||||
void parse_options(void *optctx, int argc, char **argv, const OptionDef *options,
|
||||
void (* parse_arg_function)(void *, const char*))
|
||||
{
|
||||
const char *opt;
|
||||
int optindex, handleoptions = 1, ret;
|
||||
|
||||
/* perform system-dependent conversions for arguments list */
|
||||
prepare_app_arguments(&argc, &argv);
|
||||
@ -218,60 +287,18 @@ void parse_options(int argc, char **argv, const OptionDef *options,
|
||||
opt = argv[optindex++];
|
||||
|
||||
if (handleoptions && opt[0] == '-' && opt[1] != '\0') {
|
||||
int bool_val = 1;
|
||||
if (opt[1] == '-' && opt[2] == '\0') {
|
||||
handleoptions = 0;
|
||||
continue;
|
||||
}
|
||||
opt++;
|
||||
po= find_option(options, opt);
|
||||
if (!po->name && opt[0] == 'n' && opt[1] == 'o') {
|
||||
/* handle 'no' bool option */
|
||||
po = find_option(options, opt + 2);
|
||||
if (!(po->name && (po->flags & OPT_BOOL)))
|
||||
goto unknown_opt;
|
||||
bool_val = 0;
|
||||
}
|
||||
if (!po->name)
|
||||
po= find_option(options, "default");
|
||||
if (!po->name) {
|
||||
unknown_opt:
|
||||
fprintf(stderr, "%s: unrecognized option '%s'\n", argv[0], opt);
|
||||
exit(1);
|
||||
}
|
||||
arg = NULL;
|
||||
if (po->flags & HAS_ARG) {
|
||||
arg = argv[optindex++];
|
||||
if (!arg) {
|
||||
fprintf(stderr, "%s: missing argument for option '%s'\n", argv[0], opt);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
if (po->flags & OPT_STRING) {
|
||||
char *str;
|
||||
str = av_strdup(arg);
|
||||
*po->u.str_arg = str;
|
||||
} else if (po->flags & OPT_BOOL) {
|
||||
*po->u.int_arg = bool_val;
|
||||
} else if (po->flags & OPT_INT) {
|
||||
*po->u.int_arg = parse_number_or_die(opt, arg, OPT_INT64, INT_MIN, INT_MAX);
|
||||
} else if (po->flags & OPT_INT64) {
|
||||
*po->u.int64_arg = parse_number_or_die(opt, arg, OPT_INT64, INT64_MIN, INT64_MAX);
|
||||
} else if (po->flags & OPT_FLOAT) {
|
||||
*po->u.float_arg = parse_number_or_die(opt, arg, OPT_FLOAT, -INFINITY, INFINITY);
|
||||
} else if (po->u.func_arg) {
|
||||
if (po->u.func_arg(opt, arg) < 0) {
|
||||
fprintf(stderr, "%s: failed to set value '%s' for option '%s'\n", argv[0], arg ? arg : "[null]", opt);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
if(po->flags & OPT_EXIT)
|
||||
exit(0);
|
||||
|
||||
if ((ret = parse_option(optctx, opt, argv[optindex], options)) < 0)
|
||||
exit_program(1);
|
||||
optindex += ret;
|
||||
} else {
|
||||
if (parse_arg_function) {
|
||||
if (parse_arg_function(NULL, opt) < 0)
|
||||
exit(1);
|
||||
}
|
||||
if (parse_arg_function)
|
||||
parse_arg_function(optctx, opt);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -338,7 +365,7 @@ int opt_loglevel(const char *opt, const char *arg)
|
||||
"Possible levels are numbers or:\n", arg);
|
||||
for (i = 0; i < FF_ARRAY_ELEMS(log_levels); i++)
|
||||
fprintf(stderr, "\"%s\"\n", log_levels[i].name);
|
||||
exit(1);
|
||||
exit_program(1);
|
||||
}
|
||||
av_log_set_level(level);
|
||||
return 0;
|
||||
@ -872,3 +899,21 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, AVDictionary *cod
|
||||
return opts;
|
||||
}
|
||||
|
||||
void *grow_array(void *array, int elem_size, int *size, int new_size)
|
||||
{
|
||||
if (new_size >= INT_MAX / elem_size) {
|
||||
av_log(NULL, AV_LOG_ERROR, "Array too big.\n");
|
||||
exit_program(1);
|
||||
}
|
||||
if (*size < new_size) {
|
||||
uint8_t *tmp = av_realloc(array, new_size*elem_size);
|
||||
if (!tmp) {
|
||||
av_log(NULL, AV_LOG_ERROR, "Could not alloc buffer.\n");
|
||||
exit_program(1);
|
||||
}
|
||||
memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size);
|
||||
*size = new_size;
|
||||
return tmp;
|
||||
}
|
||||
return array;
|
||||
}
|
||||
|
||||
54
cmdutils.h
54
cmdutils.h
@ -112,6 +112,16 @@ double parse_number_or_die(const char *context, const char *numstr, int type, do
|
||||
*/
|
||||
int64_t parse_time_or_die(const char *context, const char *timestr, int is_duration);
|
||||
|
||||
typedef struct SpecifierOpt {
|
||||
char *specifier; /**< stream/chapter/program/... specifier */
|
||||
union {
|
||||
uint8_t *str;
|
||||
int i;
|
||||
int64_t i64;
|
||||
float f;
|
||||
} u;
|
||||
} SpecifierOpt;
|
||||
|
||||
typedef struct {
|
||||
const char *name;
|
||||
int flags;
|
||||
@ -128,12 +138,17 @@ typedef struct {
|
||||
#define OPT_INT64 0x0400
|
||||
#define OPT_EXIT 0x0800
|
||||
#define OPT_DATA 0x1000
|
||||
#define OPT_FUNC2 0x2000
|
||||
#define OPT_OFFSET 0x4000 /* option is specified as an offset in a passed optctx */
|
||||
#define OPT_SPEC 0x8000 /* option is to be stored in an array of SpecifierOpt.
|
||||
Implies OPT_OFFSET. Next element after the offset is
|
||||
an int containing element count in the array. */
|
||||
#define OPT_TIME 0x10000
|
||||
union {
|
||||
int *int_arg;
|
||||
char **str_arg;
|
||||
float *float_arg;
|
||||
void *dst_ptr;
|
||||
int (*func_arg)(const char *, const char *);
|
||||
int64_t *int64_arg;
|
||||
int (*func2_arg)(void *, const char *, const char *);
|
||||
size_t off;
|
||||
} u;
|
||||
const char *help;
|
||||
const char *argname;
|
||||
@ -143,14 +158,23 @@ void show_help_options(const OptionDef *options, const char *msg, int mask, int
|
||||
|
||||
/**
|
||||
* Parse the command line arguments.
|
||||
*
|
||||
* @param optctx an opaque options context
|
||||
* @param options Array with the definitions required to interpret every
|
||||
* option of the form: -option_name [argument]
|
||||
* @param parse_arg_function Name of the function called to process every
|
||||
* argument without a leading option name flag. NULL if such arguments do
|
||||
* not have to be processed.
|
||||
*/
|
||||
void parse_options(int argc, char **argv, const OptionDef *options,
|
||||
int (* parse_arg_function)(const char *opt, const char *arg));
|
||||
void parse_options(void *optctx, int argc, char **argv, const OptionDef *options,
|
||||
void (* parse_arg_function)(void *optctx, const char*));
|
||||
|
||||
/**
|
||||
* Parse one given option.
|
||||
*
|
||||
* @return on success 1 if arg was consumed, 0 otherwise; negative number on error
|
||||
*/
|
||||
int parse_option(void *optctx, const char *opt, const char *arg, const OptionDef *options);
|
||||
|
||||
/**
|
||||
* Check if the given stream matches a stream specifier.
|
||||
@ -301,4 +325,20 @@ int read_file(const char *filename, char **bufptr, size_t *size);
|
||||
FILE *get_preset_file(char *filename, size_t filename_size,
|
||||
const char *preset_name, int is_path, const char *codec_name);
|
||||
|
||||
#endif /* FFMPEG_CMDUTILS_H */
|
||||
/**
|
||||
* Do all the necessary cleanup and abort.
|
||||
* This function is implemented in the avtools, not cmdutils.
|
||||
*/
|
||||
void exit_program(int ret);
|
||||
|
||||
/**
|
||||
* Realloc array to hold new_size elements of elem_size.
|
||||
* Calls exit_program() on failure.
|
||||
*
|
||||
* @param elem_size size in bytes of each element
|
||||
* @param size new element count will be written here
|
||||
* @return reallocated array
|
||||
*/
|
||||
void *grow_array(void *array, int elem_size, int *size, int new_size);
|
||||
|
||||
#endif /* LIBAV_CMDUTILS_H */
|
||||
|
||||
221
ffmpeg.c
221
ffmpeg.c
@ -110,12 +110,8 @@ typedef struct MetadataMap {
|
||||
static const OptionDef options[];
|
||||
|
||||
#define MAX_STREAMS 1024 /* arbitrary sanity check value */
|
||||
static const char *last_asked_format = NULL;
|
||||
static AVDictionary *ts_scale;
|
||||
|
||||
static StreamMap *stream_maps = NULL;
|
||||
static int nb_stream_maps;
|
||||
|
||||
static AVDictionary *codec_names;
|
||||
|
||||
/* first item specifies output metadata, second is input */
|
||||
@ -182,9 +178,6 @@ static unsigned int data_codec_tag = 0;
|
||||
static float mux_preload= 0.5;
|
||||
static float mux_max_delay= 0.7;
|
||||
|
||||
static int64_t recording_time = INT64_MAX;
|
||||
static int64_t start_time = 0;
|
||||
static int64_t input_ts_offset = 0;
|
||||
static int file_overwrite = 0;
|
||||
static AVDictionary *metadata;
|
||||
static int do_benchmark = 0;
|
||||
@ -220,7 +213,6 @@ static int64_t extra_size = 0;
|
||||
static int nb_frames_dup = 0;
|
||||
static int nb_frames_drop = 0;
|
||||
static int input_sync;
|
||||
static uint64_t limit_filesize = UINT64_MAX;
|
||||
static int force_fps = 0;
|
||||
static char *forced_key_frames = NULL;
|
||||
|
||||
@ -348,6 +340,56 @@ static int nb_output_streams = 0;
|
||||
static OutputFile *output_files = NULL;
|
||||
static int nb_output_files = 0;
|
||||
|
||||
typedef struct OptionsContext {
|
||||
/* input/output options */
|
||||
int64_t start_time;
|
||||
const char *format;
|
||||
|
||||
/* input options */
|
||||
int64_t input_ts_offset;
|
||||
|
||||
/* output options */
|
||||
StreamMap *stream_maps;
|
||||
int nb_stream_maps;
|
||||
|
||||
int64_t recording_time;
|
||||
uint64_t limit_filesize;
|
||||
} OptionsContext;
|
||||
|
||||
static void reset_options(OptionsContext *o)
|
||||
{
|
||||
const OptionDef *po = options;
|
||||
|
||||
/* all OPT_SPEC and OPT_STRING can be freed in generic way */
|
||||
while (po->name) {
|
||||
void *dst = (uint8_t*)o + po->u.off;
|
||||
|
||||
if (po->flags & OPT_SPEC) {
|
||||
SpecifierOpt **so = dst;
|
||||
int i, *count = (int*)(so + 1);
|
||||
for (i = 0; i < *count; i++) {
|
||||
av_freep(&(*so)[i].specifier);
|
||||
if (po->flags & OPT_STRING)
|
||||
av_freep(&(*so)[i].u.str);
|
||||
}
|
||||
av_freep(so);
|
||||
*count = 0;
|
||||
} else if (po->flags & OPT_OFFSET && po->flags & OPT_STRING)
|
||||
av_freep(dst);
|
||||
po++;
|
||||
}
|
||||
|
||||
av_freep(&o->stream_maps);
|
||||
|
||||
memset(o, 0, sizeof(*o));
|
||||
|
||||
o->recording_time = INT64_MAX;
|
||||
o->limit_filesize = UINT64_MAX;
|
||||
|
||||
uninit_opts();
|
||||
init_opts();
|
||||
}
|
||||
|
||||
#if CONFIG_AVFILTER
|
||||
|
||||
static int configure_video_filters(InputStream *ist, OutputStream *ost)
|
||||
@ -547,7 +589,7 @@ static int decode_interrupt_cb(void)
|
||||
return q_pressed > 1;
|
||||
}
|
||||
|
||||
static int exit_program(int ret)
|
||||
void exit_program(int ret)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -599,7 +641,6 @@ static int exit_program(int ret)
|
||||
}
|
||||
|
||||
exit(ret); /* not all OS-es handle main() return value */
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void assert_avoptions(AVDictionary *m)
|
||||
@ -628,26 +669,6 @@ static void assert_codec_experimental(AVCodecContext *c, int encoder)
|
||||
}
|
||||
}
|
||||
|
||||
/* similar to ff_dynarray_add() and av_fast_realloc() */
|
||||
static void *grow_array(void *array, int elem_size, int *size, int new_size)
|
||||
{
|
||||
if (new_size >= INT_MAX / elem_size) {
|
||||
fprintf(stderr, "Array too big.\n");
|
||||
exit_program(1);
|
||||
}
|
||||
if (*size < new_size) {
|
||||
uint8_t *tmp = av_realloc(array, new_size*elem_size);
|
||||
if (!tmp) {
|
||||
fprintf(stderr, "Could not alloc buffer.\n");
|
||||
exit_program(1);
|
||||
}
|
||||
memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size);
|
||||
*size = new_size;
|
||||
return tmp;
|
||||
}
|
||||
return array;
|
||||
}
|
||||
|
||||
static void choose_sample_fmt(AVStream *st, AVCodec *codec)
|
||||
{
|
||||
if(codec && codec->sample_fmts){
|
||||
@ -1715,8 +1736,9 @@ static int output_packet(InputStream *ist, int ist_index,
|
||||
|
||||
#if CONFIG_AVFILTER
|
||||
if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
|
||||
if (start_time == 0 || ist->pts >= start_time) {
|
||||
for(i=0;i<nb_ostreams;i++) {
|
||||
for(i=0;i<nb_ostreams;i++) {
|
||||
OutputFile *of = &output_files[ost_table[i].file_index];
|
||||
if (of->start_time == 0 || ist->pts >= of->start_time) {
|
||||
ost = &ost_table[i];
|
||||
if (ost->input_video_filter && ost->source_index == ist_index) {
|
||||
if (!picture.sample_aspect_ratio.num)
|
||||
@ -2614,12 +2636,6 @@ static int transcode(OutputFile *output_files,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int opt_format(const char *opt, const char *arg)
|
||||
{
|
||||
last_asked_format = arg;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_video_rc_override_string(const char *opt, const char *arg)
|
||||
{
|
||||
video_rc_override_string = arg;
|
||||
@ -2839,7 +2855,7 @@ static int opt_codec_tag(const char *opt, const char *arg)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_map(const char *opt, const char *arg)
|
||||
static int opt_map(OptionsContext *o, const char *opt, const char *arg)
|
||||
{
|
||||
StreamMap *m = NULL;
|
||||
int i, negative = 0, file_idx;
|
||||
@ -2884,8 +2900,8 @@ static int opt_map(const char *opt, const char *arg)
|
||||
}
|
||||
if (negative)
|
||||
/* disable some already defined maps */
|
||||
for (i = 0; i < nb_stream_maps; i++) {
|
||||
m = &stream_maps[i];
|
||||
for (i = 0; i < o->nb_stream_maps; i++) {
|
||||
m = &o->stream_maps[i];
|
||||
if (check_stream_specifier(input_files[m->file_index].ctx,
|
||||
input_files[m->file_index].ctx->streams[m->stream_index],
|
||||
*p == ':' ? p + 1 : p) > 0)
|
||||
@ -2896,8 +2912,9 @@ static int opt_map(const char *opt, const char *arg)
|
||||
if (check_stream_specifier(input_files[file_idx].ctx, input_files[file_idx].ctx->streams[i],
|
||||
*p == ':' ? p + 1 : p) <= 0)
|
||||
continue;
|
||||
stream_maps = grow_array(stream_maps, sizeof(*stream_maps), &nb_stream_maps, nb_stream_maps + 1);
|
||||
m = &stream_maps[nb_stream_maps - 1];
|
||||
o->stream_maps = grow_array(o->stream_maps, sizeof(*o->stream_maps),
|
||||
&o->nb_stream_maps, o->nb_stream_maps + 1);
|
||||
m = &o->stream_maps[o->nb_stream_maps - 1];
|
||||
|
||||
m->file_index = file_idx;
|
||||
m->stream_index = i;
|
||||
@ -2981,18 +2998,6 @@ static int opt_input_ts_scale(const char *opt, const char *arg)
|
||||
return av_dict_set(&ts_scale, opt, arg, 0);
|
||||
}
|
||||
|
||||
static int opt_recording_time(const char *opt, const char *arg)
|
||||
{
|
||||
recording_time = parse_time_or_die(opt, arg, 1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_start_time(const char *opt, const char *arg)
|
||||
{
|
||||
start_time = parse_time_or_die(opt, arg, 1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_recording_timestamp(const char *opt, const char *arg)
|
||||
{
|
||||
char buf[128];
|
||||
@ -3006,12 +3011,6 @@ static int opt_recording_timestamp(const char *opt, const char *arg)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_input_ts_offset(const char *opt, const char *arg)
|
||||
{
|
||||
input_ts_offset = parse_time_or_die(opt, arg, 1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static enum CodecID find_codec_or_die(const char *name, enum AVMediaType type, int encoder)
|
||||
{
|
||||
const char *codec_string = encoder ? "encoder" : "decoder";
|
||||
@ -3152,7 +3151,7 @@ static void add_input_streams(AVFormatContext *ic)
|
||||
}
|
||||
}
|
||||
|
||||
static int opt_input_file(const char *opt, const char *filename)
|
||||
static int opt_input_file(OptionsContext *o, const char *opt, const char *filename)
|
||||
{
|
||||
AVFormatContext *ic;
|
||||
AVInputFormat *file_iformat = NULL;
|
||||
@ -3162,12 +3161,11 @@ static int opt_input_file(const char *opt, const char *filename)
|
||||
AVDictionary **opts;
|
||||
int orig_nb_streams; // number of streams before avformat_find_stream_info
|
||||
|
||||
if (last_asked_format) {
|
||||
if (!(file_iformat = av_find_input_format(last_asked_format))) {
|
||||
fprintf(stderr, "Unknown input format: '%s'\n", last_asked_format);
|
||||
if (o->format) {
|
||||
if (!(file_iformat = av_find_input_format(o->format))) {
|
||||
fprintf(stderr, "Unknown input format: '%s'\n", o->format);
|
||||
exit_program(1);
|
||||
}
|
||||
last_asked_format = NULL;
|
||||
}
|
||||
|
||||
if (!strcmp(filename, "-"))
|
||||
@ -3257,20 +3255,18 @@ static int opt_input_file(const char *opt, const char *filename)
|
||||
exit_program(1);
|
||||
}
|
||||
|
||||
timestamp = start_time;
|
||||
timestamp = o->start_time;
|
||||
/* add the stream start time */
|
||||
if (ic->start_time != AV_NOPTS_VALUE)
|
||||
timestamp += ic->start_time;
|
||||
|
||||
/* if seeking requested, we execute it */
|
||||
if (start_time != 0) {
|
||||
if (o->start_time != 0) {
|
||||
ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD);
|
||||
if (ret < 0) {
|
||||
fprintf(stderr, "%s: could not seek to position %0.3f\n",
|
||||
filename, (double)timestamp / AV_TIME_BASE);
|
||||
}
|
||||
/* reset seek info */
|
||||
start_time = 0;
|
||||
}
|
||||
|
||||
/* update the current parameters so that they match the one of the input stream */
|
||||
@ -3283,7 +3279,7 @@ static int opt_input_file(const char *opt, const char *filename)
|
||||
input_files = grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1);
|
||||
input_files[nb_input_files - 1].ctx = ic;
|
||||
input_files[nb_input_files - 1].ist_index = nb_input_streams - ic->nb_streams;
|
||||
input_files[nb_input_files - 1].ts_offset = input_ts_offset - (copy_ts ? 0 : timestamp);
|
||||
input_files[nb_input_files - 1].ts_offset = o->input_ts_offset - (copy_ts ? 0 : timestamp);
|
||||
input_files[nb_input_files - 1].nb_streams = ic->nb_streams;
|
||||
|
||||
top_field_first = -1;
|
||||
@ -3295,14 +3291,13 @@ static int opt_input_file(const char *opt, const char *filename)
|
||||
audio_channels = 0;
|
||||
audio_sample_fmt = AV_SAMPLE_FMT_NONE;
|
||||
av_dict_free(&ts_scale);
|
||||
input_ts_offset = 0;
|
||||
|
||||
for (i = 0; i < orig_nb_streams; i++)
|
||||
av_dict_free(&opts[i]);
|
||||
av_freep(&opts);
|
||||
av_dict_free(&codec_names);
|
||||
uninit_opts();
|
||||
init_opts();
|
||||
|
||||
reset_options(o);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -3633,18 +3628,18 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename)
|
||||
}
|
||||
|
||||
|
||||
static int copy_chapters(int infile, int outfile)
|
||||
static int copy_chapters(InputFile *ifile, OutputFile *ofile)
|
||||
{
|
||||
AVFormatContext *is = input_files[infile].ctx;
|
||||
AVFormatContext *os = output_files[outfile].ctx;
|
||||
AVFormatContext *is = ifile->ctx;
|
||||
AVFormatContext *os = ofile->ctx;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < is->nb_chapters; i++) {
|
||||
AVChapter *in_ch = is->chapters[i], *out_ch;
|
||||
int64_t ts_off = av_rescale_q(start_time - input_files[infile].ts_offset,
|
||||
int64_t ts_off = av_rescale_q(ofile->start_time - ifile->ts_offset,
|
||||
AV_TIME_BASE_Q, in_ch->time_base);
|
||||
int64_t rt = (recording_time == INT64_MAX) ? INT64_MAX :
|
||||
av_rescale_q(recording_time, AV_TIME_BASE_Q, in_ch->time_base);
|
||||
int64_t rt = (ofile->recording_time == INT64_MAX) ? INT64_MAX :
|
||||
av_rescale_q(ofile->recording_time, AV_TIME_BASE_Q, in_ch->time_base);
|
||||
|
||||
|
||||
if (in_ch->end < ts_off)
|
||||
@ -3673,8 +3668,9 @@ static int copy_chapters(int infile, int outfile)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_output_file(const char *opt, const char *filename)
|
||||
static void opt_output_file(void *optctx, const char *filename)
|
||||
{
|
||||
OptionsContext *o = optctx;
|
||||
AVFormatContext *oc;
|
||||
int i, err;
|
||||
AVOutputFormat *file_oformat;
|
||||
@ -3684,8 +3680,7 @@ static int opt_output_file(const char *opt, const char *filename)
|
||||
if (!strcmp(filename, "-"))
|
||||
filename = "pipe:";
|
||||
|
||||
err = avformat_alloc_output_context2(&oc, NULL, last_asked_format, filename);
|
||||
last_asked_format = NULL;
|
||||
err = avformat_alloc_output_context2(&oc, NULL, o->format, filename);
|
||||
if (!oc) {
|
||||
print_error(filename, err);
|
||||
exit_program(1);
|
||||
@ -3701,7 +3696,7 @@ static int opt_output_file(const char *opt, const char *filename)
|
||||
print_error(filename, err);
|
||||
exit_program(1);
|
||||
}
|
||||
} else if (!nb_stream_maps) {
|
||||
} else if (!o->nb_stream_maps) {
|
||||
/* pick the "best" stream of each type */
|
||||
#define NEW_STREAM(type, index)\
|
||||
if (index >= 0) {\
|
||||
@ -3749,8 +3744,8 @@ static int opt_output_file(const char *opt, const char *filename)
|
||||
}
|
||||
/* do something with data? */
|
||||
} else {
|
||||
for (i = 0; i < nb_stream_maps; i++) {
|
||||
StreamMap *map = &stream_maps[i];
|
||||
for (i = 0; i < o->nb_stream_maps; i++) {
|
||||
StreamMap *map = &o->stream_maps[i];
|
||||
|
||||
if (map->disabled)
|
||||
continue;
|
||||
@ -3781,9 +3776,9 @@ static int opt_output_file(const char *opt, const char *filename)
|
||||
output_files = grow_array(output_files, sizeof(*output_files), &nb_output_files, nb_output_files + 1);
|
||||
output_files[nb_output_files - 1].ctx = oc;
|
||||
output_files[nb_output_files - 1].ost_index = nb_output_streams - oc->nb_streams;
|
||||
output_files[nb_output_files - 1].recording_time = recording_time;
|
||||
output_files[nb_output_files - 1].start_time = start_time;
|
||||
output_files[nb_output_files - 1].limit_filesize = limit_filesize;
|
||||
output_files[nb_output_files - 1].recording_time = o->recording_time;
|
||||
output_files[nb_output_files - 1].start_time = o->start_time;
|
||||
output_files[nb_output_files - 1].limit_filesize = o->limit_filesize;
|
||||
av_dict_copy(&output_files[nb_output_files - 1].opts, format_opts, 0);
|
||||
|
||||
/* check filename in case of an image number is expected */
|
||||
@ -3848,7 +3843,7 @@ static int opt_output_file(const char *opt, const char *filename)
|
||||
}
|
||||
}
|
||||
if (chapters_input_file >= 0)
|
||||
copy_chapters(chapters_input_file, nb_output_files - 1);
|
||||
copy_chapters(&input_files[chapters_input_file], &output_files[nb_output_files - 1]);
|
||||
|
||||
/* copy metadata */
|
||||
for (i = 0; i < nb_meta_data_maps; i++) {
|
||||
@ -3913,26 +3908,19 @@ static int opt_output_file(const char *opt, const char *filename)
|
||||
audio_channels = 0;
|
||||
audio_sample_fmt = AV_SAMPLE_FMT_NONE;
|
||||
chapters_input_file = INT_MAX;
|
||||
recording_time = INT64_MAX;
|
||||
start_time = 0;
|
||||
limit_filesize = UINT64_MAX;
|
||||
|
||||
av_freep(&meta_data_maps);
|
||||
nb_meta_data_maps = 0;
|
||||
metadata_global_autocopy = 1;
|
||||
metadata_streams_autocopy = 1;
|
||||
metadata_chapters_autocopy = 1;
|
||||
av_freep(&stream_maps);
|
||||
nb_stream_maps = 0;
|
||||
av_freep(&streamid_map);
|
||||
nb_streamid_map = 0;
|
||||
|
||||
av_dict_free(&codec_names);
|
||||
|
||||
av_freep(&forced_key_frames);
|
||||
uninit_opts();
|
||||
init_opts();
|
||||
return 0;
|
||||
reset_options(o);
|
||||
}
|
||||
|
||||
/* same option as mencoder */
|
||||
@ -4087,7 +4075,7 @@ static int opt_help(const char *opt, const char *arg)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_target(const char *opt, const char *arg)
|
||||
static int opt_target(OptionsContext *o, const char *opt, const char *arg)
|
||||
{
|
||||
enum { PAL, NTSC, FILM, UNKNOWN } norm = UNKNOWN;
|
||||
static const char *const frame_rates[] = {"25", "30000/1001", "24000/1001"};
|
||||
@ -4146,7 +4134,7 @@ static int opt_target(const char *opt, const char *arg)
|
||||
if(!strcmp(arg, "vcd")) {
|
||||
opt_codec("c:v", "mpeg1video");
|
||||
opt_codec("c:a", "mp2");
|
||||
opt_format("f", "vcd");
|
||||
parse_option(o, "f", "vcd", options);
|
||||
|
||||
opt_frame_size("s", norm == PAL ? "352x288" : "352x240");
|
||||
opt_frame_rate("r", frame_rates[norm]);
|
||||
@ -4174,7 +4162,7 @@ static int opt_target(const char *opt, const char *arg)
|
||||
|
||||
opt_codec("c:v", "mpeg2video");
|
||||
opt_codec("c:a", "mp2");
|
||||
opt_format("f", "svcd");
|
||||
parse_option(o, "f", "svcd", options);
|
||||
|
||||
opt_frame_size("s", norm == PAL ? "480x576" : "480x480");
|
||||
opt_frame_rate("r", frame_rates[norm]);
|
||||
@ -4197,7 +4185,7 @@ static int opt_target(const char *opt, const char *arg)
|
||||
|
||||
opt_codec("c:v", "mpeg2video");
|
||||
opt_codec("c:a", "ac3");
|
||||
opt_format("f", "dvd");
|
||||
parse_option(o, "f", "dvd", options);
|
||||
|
||||
opt_frame_size("vcodec", norm == PAL ? "720x576" : "720x480");
|
||||
opt_frame_rate("r", frame_rates[norm]);
|
||||
@ -4217,7 +4205,7 @@ static int opt_target(const char *opt, const char *arg)
|
||||
|
||||
} else if(!strncmp(arg, "dv", 2)) {
|
||||
|
||||
opt_format("f", "dv");
|
||||
parse_option(o, "f", "dv", options);
|
||||
|
||||
opt_frame_size("s", norm == PAL ? "720x576" : "720x480");
|
||||
opt_frame_pix_fmt("pix_fmt", !strncmp(arg, "dv50", 4) ? "yuv422p" :
|
||||
@ -4328,24 +4316,25 @@ static int opt_passlogfile(const char *opt, const char *arg)
|
||||
#endif
|
||||
}
|
||||
|
||||
#define OFFSET(x) offsetof(OptionsContext, x)
|
||||
static const OptionDef options[] = {
|
||||
/* main options */
|
||||
#include "cmdutils_common_opts.h"
|
||||
{ "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" },
|
||||
{ "i", HAS_ARG, {(void*)opt_input_file}, "input file name", "filename" },
|
||||
{ "f", HAS_ARG | OPT_STRING | OPT_OFFSET, {.off = OFFSET(format)}, "force format", "fmt" },
|
||||
{ "i", HAS_ARG | OPT_FUNC2, {(void*)opt_input_file}, "input file name", "filename" },
|
||||
{ "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" },
|
||||
{ "c", HAS_ARG, {(void*)opt_codec}, "codec name", "codec" },
|
||||
{ "codec", HAS_ARG, {(void*)opt_codec}, "codec name", "codec" },
|
||||
{ "map", HAS_ARG | OPT_EXPERT, {(void*)opt_map}, "set input stream mapping", "file.stream[:syncfile.syncstream]" },
|
||||
{ "map", HAS_ARG | OPT_EXPERT | OPT_FUNC2, {(void*)opt_map}, "set input stream mapping", "file.stream[:syncfile.syncstream]" },
|
||||
{ "map_meta_data", HAS_ARG | OPT_EXPERT, {(void*)opt_map_meta_data}, "DEPRECATED set meta data information of outfile from infile",
|
||||
"outfile[,metadata]:infile[,metadata]" },
|
||||
{ "map_metadata", HAS_ARG | OPT_EXPERT, {(void*)opt_map_metadata}, "set metadata information of outfile from infile",
|
||||
"outfile[,metadata]:infile[,metadata]" },
|
||||
{ "map_chapters", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&chapters_input_file}, "set chapters mapping", "input_file_index" },
|
||||
{ "t", HAS_ARG, {(void*)opt_recording_time}, "record or transcode \"duration\" seconds of audio/video", "duration" },
|
||||
{ "fs", HAS_ARG | OPT_INT64, {(void*)&limit_filesize}, "set the limit file size in bytes", "limit_size" }, //
|
||||
{ "ss", HAS_ARG, {(void*)opt_start_time}, "set the start time offset", "time_off" },
|
||||
{ "itsoffset", HAS_ARG, {(void*)opt_input_ts_offset}, "set the input ts offset", "time_off" },
|
||||
{ "t", HAS_ARG | OPT_TIME | OPT_OFFSET, {.off = OFFSET(recording_time)}, "record or transcode \"duration\" seconds of audio/video", "duration" },
|
||||
{ "fs", HAS_ARG | OPT_INT64 | OPT_OFFSET, {.off = OFFSET(limit_filesize)}, "set the limit file size in bytes", "limit_size" }, //
|
||||
{ "ss", HAS_ARG | OPT_TIME | OPT_OFFSET, {.off = OFFSET(start_time)}, "set the start time offset", "time_off" },
|
||||
{ "itsoffset", HAS_ARG | OPT_TIME | OPT_OFFSET, {.off = OFFSET(input_ts_offset)}, "set the input ts offset", "time_off" },
|
||||
{ "itsscale", HAS_ARG, {(void*)opt_input_ts_scale}, "set the input ts scale", "scale" },
|
||||
{ "timestamp", HAS_ARG, {(void*)opt_recording_timestamp}, "set the recording timestamp ('now' to set the current time)", "time" },
|
||||
{ "metadata", HAS_ARG, {(void*)opt_metadata}, "add metadata", "string=string" },
|
||||
@ -4361,7 +4350,7 @@ static const OptionDef options[] = {
|
||||
{ "loop_input", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "deprecated, use -loop" },
|
||||
{ "loop_output", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&loop_output}, "deprecated, use -loop", "" },
|
||||
{ "v", HAS_ARG, {(void*)opt_verbose}, "set the verbosity level", "number" },
|
||||
{ "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
|
||||
{ "target", HAS_ARG | OPT_FUNC2, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
|
||||
{ "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
|
||||
{ "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" },
|
||||
{ "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" },
|
||||
@ -4464,8 +4453,11 @@ static const OptionDef options[] = {
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
OptionsContext o = { 0 };
|
||||
int64_t ti;
|
||||
|
||||
reset_options(&o);
|
||||
|
||||
av_log_set_flags(AV_LOG_SKIP_REPEATED);
|
||||
|
||||
if(argc>1 && !strcmp(argv[1], "-d")){
|
||||
@ -4490,13 +4482,11 @@ int main(int argc, char **argv)
|
||||
avio_set_interrupt_cb(decode_interrupt_cb);
|
||||
#endif
|
||||
|
||||
init_opts();
|
||||
|
||||
if(verbose>=0)
|
||||
show_banner();
|
||||
|
||||
/* parse options */
|
||||
parse_options(argc, argv, options, opt_output_file);
|
||||
parse_options(&o, argc, argv, options, opt_output_file);
|
||||
|
||||
if(nb_output_files <= 0 && nb_input_files == 0) {
|
||||
show_usage();
|
||||
@ -4524,5 +4514,6 @@ int main(int argc, char **argv)
|
||||
printf("bench: utime=%0.3fs maxrss=%ikB\n", ti / 1000000.0, maxrss);
|
||||
}
|
||||
|
||||
return exit_program(0);
|
||||
exit_program(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
16
ffplay.c
16
ffplay.c
@ -277,6 +277,11 @@ static AVPacket flush_pkt;
|
||||
|
||||
static SDL_Surface *screen;
|
||||
|
||||
void exit_program(int ret)
|
||||
{
|
||||
exit(ret);
|
||||
}
|
||||
|
||||
static int packet_queue_put(PacketQueue *q, AVPacket *pkt)
|
||||
{
|
||||
AVPacketList *pkt1;
|
||||
@ -2891,19 +2896,20 @@ static int opt_show_mode(const char *opt, const char *arg)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_input_file(const char *opt, const char *filename)
|
||||
static void opt_input_file(void *optctx, const char *filename)
|
||||
{
|
||||
if (input_filename) {
|
||||
fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
|
||||
filename, input_filename);
|
||||
exit(1);
|
||||
exit_program(1);
|
||||
}
|
||||
if (!strcmp(filename, "-"))
|
||||
filename = "pipe:";
|
||||
input_filename = filename;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dummy;
|
||||
|
||||
static const OptionDef options[] = {
|
||||
#include "cmdutils_common_opts.h"
|
||||
{ "x", HAS_ARG, {(void*)opt_width}, "force displayed width", "width" },
|
||||
@ -2947,7 +2953,7 @@ static const OptionDef options[] = {
|
||||
{ "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, {(void*)&rdftspeed}, "rdft speed", "msecs" },
|
||||
{ "showmode", HAS_ARG, {(void*)opt_show_mode}, "select show mode (0 = video, 1 = waves, 2 = RDFT)", "mode" },
|
||||
{ "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
|
||||
{ "i", HAS_ARG, {(void *)opt_input_file}, "read specified file", "input_file"},
|
||||
{ "i", OPT_BOOL, {(void *)&dummy}, "read specified file", "input_file"},
|
||||
{ NULL, },
|
||||
};
|
||||
|
||||
@ -3038,7 +3044,7 @@ int main(int argc, char **argv)
|
||||
|
||||
show_banner();
|
||||
|
||||
parse_options(argc, argv, options, opt_input_file);
|
||||
parse_options(NULL, argc, argv, options, opt_input_file);
|
||||
|
||||
if (!input_filename) {
|
||||
show_usage();
|
||||
|
||||
10
ffprobe.c
10
ffprobe.c
@ -58,6 +58,11 @@ static const char *unit_hertz_str = "Hz" ;
|
||||
static const char *unit_byte_str = "byte" ;
|
||||
static const char *unit_bit_per_second_str = "bit/s";
|
||||
|
||||
void exit_program(int ret)
|
||||
{
|
||||
exit(ret);
|
||||
}
|
||||
|
||||
static char *value_string(char *buf, int buf_size, double val, const char *unit)
|
||||
{
|
||||
if (unit == unit_second_str && use_value_sexagesimal_format) {
|
||||
@ -455,7 +460,7 @@ static int opt_format(const char *opt, const char *arg)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_input_file(const char *opt, const char *arg)
|
||||
static void opt_input_file(void *optctx, const char *arg)
|
||||
{
|
||||
if (input_filename) {
|
||||
fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
|
||||
@ -465,7 +470,6 @@ static int opt_input_file(const char *opt, const char *arg)
|
||||
if (!strcmp(arg, "-"))
|
||||
arg = "pipe:";
|
||||
input_filename = arg;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int opt_help(const char *opt, const char *arg)
|
||||
@ -519,7 +523,7 @@ int main(int argc, char **argv)
|
||||
#endif
|
||||
|
||||
show_banner();
|
||||
parse_options(argc, argv, options, opt_input_file);
|
||||
parse_options(NULL, argc, argv, options, opt_input_file);
|
||||
|
||||
if (!input_filename) {
|
||||
show_usage();
|
||||
|
||||
@ -321,6 +321,11 @@ static AVLFG random_state;
|
||||
static FILE *logfile = NULL;
|
||||
|
||||
/* FIXME: make ffserver work with IPv6 */
|
||||
void exit_program(int ret)
|
||||
{
|
||||
exit(ret);
|
||||
}
|
||||
|
||||
/* resolve host with also IP address parsing */
|
||||
static int resolve_host(struct in_addr *sin_addr, const char *hostname)
|
||||
{
|
||||
@ -4672,7 +4677,7 @@ int main(int argc, char **argv)
|
||||
my_program_dir = getcwd(0, 0);
|
||||
ffserver_daemon = 1;
|
||||
|
||||
parse_options(argc, argv, options, NULL);
|
||||
parse_options(NULL, argc, argv, options, NULL);
|
||||
|
||||
unsetenv("http_proxy"); /* Kill the http_proxy */
|
||||
|
||||
|
||||
@ -483,7 +483,7 @@ static const AVOption options[]={
|
||||
{"lpc_passes", "deprecated, use flac-specific options", OFFSET(lpc_passes), FF_OPT_TYPE_INT, {.dbl = -1 }, INT_MIN, INT_MAX, A|E},
|
||||
#endif
|
||||
{"slices", "number of slices, used in parallelized decoding", OFFSET(slices), FF_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, V|E},
|
||||
{"thread_type", "select multithreading type", OFFSET(thread_type), FF_OPT_TYPE_INT, {.dbl = FF_THREAD_SLICE|FF_THREAD_FRAME }, 0, INT_MAX, V|E|D, "thread_type"},
|
||||
{"thread_type", "select multithreading type", OFFSET(thread_type), FF_OPT_TYPE_FLAGS, {.dbl = FF_THREAD_SLICE|FF_THREAD_FRAME }, 0, INT_MAX, V|E|D, "thread_type"},
|
||||
{"slice", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_THREAD_SLICE }, INT_MIN, INT_MAX, V|E|D, "thread_type"},
|
||||
{"frame", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_THREAD_FRAME }, INT_MIN, INT_MAX, V|E|D, "thread_type"},
|
||||
{"audio_service_type", "audio service type", OFFSET(audio_service_type), FF_OPT_TYPE_INT, {.dbl = AV_AUDIO_SERVICE_TYPE_MAIN }, 0, AV_AUDIO_SERVICE_TYPE_NB-1, A|E, "audio_service_type"},
|
||||
|
||||
@ -265,7 +265,7 @@ static int process_line(URLContext *h, char *line, int line_count,
|
||||
s->filesize = atoll(slash+1);
|
||||
}
|
||||
h->is_streamed = 0; /* we _can_ in fact seek */
|
||||
} else if (!strcasecmp (tag, "Accept-Ranges") && !strncmp (p, "bytes", 5)) {
|
||||
} else if (!strcasecmp(tag, "Accept-Ranges") && !strncmp(p, "bytes", 5)) {
|
||||
h->is_streamed = 0;
|
||||
} else if (!strcasecmp (tag, "Transfer-Encoding") && !strncasecmp(p, "chunked", 7)) {
|
||||
s->filesize = -1;
|
||||
|
||||
@ -580,7 +580,7 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc){
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int write_header(AVFormatContext *s){
|
||||
static int nut_write_header(AVFormatContext *s){
|
||||
NUTContext *nut = s->priv_data;
|
||||
AVIOContext *bc = s->pb;
|
||||
int i, j, ret;
|
||||
@ -692,7 +692,7 @@ static int find_best_header_idx(NUTContext *nut, AVPacket *pkt){
|
||||
return best_i;
|
||||
}
|
||||
|
||||
static int write_packet(AVFormatContext *s, AVPacket *pkt){
|
||||
static int nut_write_packet(AVFormatContext *s, AVPacket *pkt){
|
||||
NUTContext *nut = s->priv_data;
|
||||
StreamContext *nus= &nut->stream[pkt->stream_index];
|
||||
AVIOContext *bc = s->pb, *dyn_bc;
|
||||
@ -846,7 +846,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt){
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int write_trailer(AVFormatContext *s){
|
||||
static int nut_write_trailer(AVFormatContext *s){
|
||||
NUTContext *nut= s->priv_data;
|
||||
AVIOContext *bc= s->pb;
|
||||
|
||||
@ -875,9 +875,9 @@ AVOutputFormat ff_nut_muxer = {
|
||||
.audio_codec = CODEC_ID_MP2,
|
||||
#endif
|
||||
.video_codec = CODEC_ID_MPEG4,
|
||||
.write_header = write_header,
|
||||
.write_packet = write_packet,
|
||||
.write_trailer = write_trailer,
|
||||
.write_header = nut_write_header,
|
||||
.write_packet = nut_write_packet,
|
||||
.write_trailer = nut_write_trailer,
|
||||
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
|
||||
.codec_tag = (const AVCodecTag * const []){ ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 },
|
||||
};
|
||||
|
||||
@ -35,7 +35,7 @@ fate-bink-demux-video: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik
|
||||
FATE_TESTS += fate-caf
|
||||
fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf
|
||||
FATE_TESTS += fate-cdgraphics
|
||||
fate-cdgraphics: CMD = framecrc -t 1 -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24
|
||||
fate-cdgraphics: CMD = framecrc -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1
|
||||
FATE_TESTS += fate-cljr
|
||||
fate-cljr: CMD = framecrc -i $(SAMPLES)/cljr/testcljr-partial.avi
|
||||
FATE_TESTS += fate-corepng
|
||||
@ -129,7 +129,7 @@ fate-id-cin-video: CMD = framecrc -i $(SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rg
|
||||
FATE_TESTS += fate-idroq-video-dpcm
|
||||
fate-idroq-video-dpcm: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq
|
||||
FATE_TESTS += fate-idroq-video-encode
|
||||
fate-idroq-video-encode: CMD = md5 -t 0.2 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f RoQ
|
||||
fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f RoQ -t 0.2
|
||||
FATE_TESTS += fate-iff-byterun1
|
||||
fate-iff-byterun1: CMD = framecrc -i $(SAMPLES)/iff/ASH.LBM -pix_fmt rgb24
|
||||
FATE_TESTS += fate-iff-fibonacci
|
||||
|
||||
@ -4,32 +4,32 @@ fate-mp3-float-conf-compl: CMP = stddev
|
||||
fate-mp3-float-conf-compl: REF = $(SAMPLES)/mp3-conformance/compl.pcm
|
||||
|
||||
FATE_MP3 += fate-mp3-float-conf-he_32khz
|
||||
fate-mp3-float-conf-he_32khz: CMD = pcm -acodec mp3float -fs 343296 -i $(SAMPLES)/mp3-conformance/he_32khz.bit
|
||||
fate-mp3-float-conf-he_32khz: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/he_32khz.bit -fs 343296
|
||||
fate-mp3-float-conf-he_32khz: CMP = stddev
|
||||
fate-mp3-float-conf-he_32khz: REF = $(SAMPLES)/mp3-conformance/he_32khz.pcm
|
||||
|
||||
FATE_MP3 += fate-mp3-float-conf-he_44khz
|
||||
fate-mp3-float-conf-he_44khz: CMD = pcm -acodec mp3float -fs 942336 -i $(SAMPLES)/mp3-conformance/he_44khz.bit
|
||||
fate-mp3-float-conf-he_44khz: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/he_44khz.bit -fs 942336
|
||||
fate-mp3-float-conf-he_44khz: CMP = stddev
|
||||
fate-mp3-float-conf-he_44khz: REF = $(SAMPLES)/mp3-conformance/he_44khz.pcm
|
||||
|
||||
FATE_MP3 += fate-mp3-float-conf-he_48khz
|
||||
fate-mp3-float-conf-he_48khz: CMD = pcm -acodec mp3float -fs 343296 -i $(SAMPLES)/mp3-conformance/he_48khz.bit
|
||||
fate-mp3-float-conf-he_48khz: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/he_48khz.bit -fs 343296
|
||||
fate-mp3-float-conf-he_48khz: CMP = stddev
|
||||
fate-mp3-float-conf-he_48khz: REF = $(SAMPLES)/mp3-conformance/he_48khz.pcm
|
||||
|
||||
FATE_MP3 += fate-mp3-float-conf-hecommon
|
||||
fate-mp3-float-conf-hecommon: CMD = pcm -acodec mp3float -fs 133632 -i $(SAMPLES)/mp3-conformance/hecommon.bit
|
||||
fate-mp3-float-conf-hecommon: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/hecommon.bit -fs 133632
|
||||
fate-mp3-float-conf-hecommon: CMP = stddev
|
||||
fate-mp3-float-conf-hecommon: REF = $(SAMPLES)/mp3-conformance/hecommon.pcm
|
||||
|
||||
FATE_MP3 += fate-mp3-float-conf-si
|
||||
fate-mp3-float-conf-si: CMD = pcm -acodec mp3float -fs 269568 -i $(SAMPLES)/mp3-conformance/si.bit
|
||||
fate-mp3-float-conf-si: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/si.bit -fs 269568
|
||||
fate-mp3-float-conf-si: CMP = stddev
|
||||
fate-mp3-float-conf-si: REF = $(SAMPLES)/mp3-conformance/si.pcm
|
||||
|
||||
FATE_MP3 += fate-mp3-float-conf-si_block
|
||||
fate-mp3-float-conf-si_block: CMD = pcm -acodec mp3float -fs 145152 -i $(SAMPLES)/mp3-conformance/si_block.bit
|
||||
fate-mp3-float-conf-si_block: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/si_block.bit -fs 145152
|
||||
fate-mp3-float-conf-si_block: CMP = stddev
|
||||
fate-mp3-float-conf-si_block: REF = $(SAMPLES)/mp3-conformance/si_block.pcm
|
||||
|
||||
|
||||
@ -125,7 +125,7 @@ fate-atrac3-3: CMP = oneoff
|
||||
fate-atrac3-3: REF = $(SAMPLES)/atrac3/mc_sich_at3_132_small.pcm
|
||||
|
||||
FATE_TESTS += fate-gsm
|
||||
fate-gsm: CMD = framecrc -t 10 -i $(SAMPLES)/gsm/sample-gsm-8000.mov
|
||||
fate-gsm: CMD = framecrc -i $(SAMPLES)/gsm/sample-gsm-8000.mov -t 10
|
||||
|
||||
FATE_TESTS += fate-gsm-ms
|
||||
fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav
|
||||
|
||||
@ -227,8 +227,8 @@ conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
|
||||
monob yuv440p yuvj440p"
|
||||
for pix_fmt in $conversions ; do
|
||||
file=${outfile}${pix_fmt}.yuv
|
||||
run_avconv $DEC_OPTS -r 1 -t 1 -f image2 -vcodec pgmyuv -i $raw_src \
|
||||
$ENC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst
|
||||
run_avconv $DEC_OPTS -r 1 -f image2 -vcodec pgmyuv -i $raw_src \
|
||||
$ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst
|
||||
do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i $target_path/$raw_dst \
|
||||
$ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
|
||||
done
|
||||
|
||||
Loading…
Reference in New Issue
Block a user