X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=f3e1e41b203b68671c570dd85fcb44e6aa560ef2;hb=ff862be5ed2d7d6799ee23e04c5fbee0c1e1f987;hp=a8d9527178dafb8805cef21dff7641f468067d84;hpb=d4ad24c17ddf296aadfe34404caa461244babb27;p=ffmpeg diff --git a/ffmpeg.c b/ffmpeg.c index a8d9527178d..f3e1e41b203 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1,6 +1,6 @@ /* * FFmpeg main - * Copyright (c) 2000, 2001, 2002 Fabrice Bellard + * Copyright (c) 2000-2003 Fabrice Bellard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +30,7 @@ #include #include #include +#include #endif #ifdef CONFIG_OS2 #include @@ -39,28 +40,14 @@ #include #include +#include "cmdutils.h" + #if !defined(INFINITY) && defined(HUGE_VAL) #define INFINITY HUGE_VAL #endif #define MAXINT64 int64_t_C(0x7fffffffffffffff) -typedef struct { - const char *name; - int flags; -#define HAS_ARG 0x0001 -#define OPT_BOOL 0x0002 -#define OPT_EXPERT 0x0004 -#define OPT_STRING 0x0008 - union { - void (*func_arg)(const char *); - int *int_arg; - char **str_arg; - } u; - const char *help; - const char *argname; -} OptionDef; - /* select an input stream for an output stream */ typedef struct AVStreamMap { int file_index; @@ -87,6 +74,8 @@ static AVOutputFormat *file_oformat; static AVImageFormat *image_format; static int frame_width = 160; static int frame_height = 128; +static float frame_aspect_ratio = 0; +static enum PixelFormat frame_pix_fmt = PIX_FMT_YUV420P; static int frame_topBand = 0; static int frame_bottomBand = 0; static int frame_leftBand = 0; @@ -130,7 +119,6 @@ static int use_4mv = 0; static int use_aic = 0; static int use_umv = 0; /* /Fx */ -static int use_h263p_extra = 0; static int do_deinterlace = 0; static int workaround_bugs = FF_BUG_AUTODETECT; static int error_resilience = 2; @@ -158,7 +146,6 @@ static char *str_copyright = NULL; static char *str_comment = NULL; static int do_benchmark = 0; static int do_hex_dump = 0; -static int do_play = 0; static int do_psnr = 0; static int do_vstats = 0; static int do_pass = 0; @@ -172,6 +159,7 @@ static int rate_emu = 0; static char *video_grab_format = "video4linux"; static char *video_device = NULL; static int video_channel = 0; +static char *video_standard = "ntsc"; static char *audio_grab_format = "audio_device"; static char *audio_device = NULL; @@ -217,6 +205,7 @@ typedef struct AVInputStream { int64_t start; /* time when read started */ unsigned long frame; /* current frame */ + AVFrac pts; /* synthetic pts for cases where pkt.pts == 0 */ } AVInputStream; typedef struct AVInputFile { @@ -238,6 +227,15 @@ static void term_exit(void) tcsetattr (0, TCSANOW, &oldtty); } +static volatile sig_atomic_t received_sigterm = 0; + +static void +sigterm_handler(int sig) +{ + received_sigterm = sig; + term_exit(); +} + static void term_init(void) { struct termios tty; @@ -256,6 +254,12 @@ static void term_init(void) tcsetattr (0, TCSANOW, &tty); + signal(SIGINT , sigterm_handler); /* Interrupt (ANSI). */ + signal(SIGQUIT, sigterm_handler); /* Quit (POSIX). */ + signal(SIGTERM, sigterm_handler); /* Termination (ANSI). */ + /* + register a function to be called at normal program termination + */ atexit(term_exit); #ifdef CONFIG_BEOS_NETSERVER fcntl(0, F_SETFL, fcntl(0, F_GETFL) | O_NONBLOCK); @@ -318,7 +322,7 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename) for(i=0;inb_streams;i++) { AVStream *st; - st = av_mallocz(sizeof(AVFormatContext)); + st = av_mallocz(sizeof(AVStream)); memcpy(st, ic->streams[i], sizeof(AVStream)); s->streams[i] = st; } @@ -335,11 +339,22 @@ static void do_audio_out(AVFormatContext *s, unsigned char *buf, int size) { uint8_t *buftmp; - uint8_t audio_buf[2*MAX_AUDIO_PACKET_SIZE]; /* XXX: allocate it */ - uint8_t audio_out[4*MAX_AUDIO_PACKET_SIZE]; /* XXX: allocate it - yep really WMA */ + static uint8_t *audio_buf = NULL; + static uint8_t *audio_out = NULL; + const int audio_out_size= 4*MAX_AUDIO_PACKET_SIZE; + int size_out, frame_bytes, ret; AVCodecContext *enc; + /* SC: dynamic allocation of buffers */ + if (!audio_buf) + audio_buf = av_malloc(2*MAX_AUDIO_PACKET_SIZE); + if (!audio_out) + audio_out = av_malloc(audio_out_size); + if (!audio_buf || !audio_out) + return; /* Should signal an error ! */ + + enc = &ost->st->codec; if (ost->audio_resample) { @@ -363,7 +378,7 @@ static void do_audio_out(AVFormatContext *s, while (fifo_read(&ost->fifo, audio_buf, frame_bytes, &ost->fifo.rptr) == 0) { - ret = avcodec_encode_audio(enc, audio_out, sizeof(audio_out), + ret = avcodec_encode_audio(enc, audio_out, audio_out_size, (short *)audio_buf); av_write_frame(s, ost->index, audio_out, ret); } @@ -386,102 +401,6 @@ static void do_audio_out(AVFormatContext *s, } } -/* write a picture to a raw mux */ -static void write_picture(AVFormatContext *s, int index, AVPicture *picture, - int pix_fmt, int w, int h) -{ - uint8_t *buf, *src, *dest; - int size, j, i; - - /* XXX: not efficient, should add test if we can take - directly the AVPicture */ - switch(pix_fmt) { - case PIX_FMT_YUV420P: - size = avpicture_get_size(pix_fmt, w, h); - buf = av_malloc(size); - if (!buf) - return; - dest = buf; - for(i=0;i<3;i++) { - if (i == 1) { - w >>= 1; - h >>= 1; - } - src = picture->data[i]; - for(j=0;jlinesize[i]; - } - } - break; - case PIX_FMT_YUV422P: - size = (w * h) * 2; - buf = av_malloc(size); - if (!buf) - return; - dest = buf; - for(i=0;i<3;i++) { - if (i == 1) { - w >>= 1; - } - src = picture->data[i]; - for(j=0;jlinesize[i]; - } - } - break; - case PIX_FMT_YUV444P: - size = (w * h) * 3; - buf = av_malloc(size); - if (!buf) - return; - dest = buf; - for(i=0;i<3;i++) { - src = picture->data[i]; - for(j=0;jlinesize[i]; - } - } - break; - case PIX_FMT_YUV422: - size = (w * h) * 2; - buf = av_malloc(size); - if (!buf) - return; - dest = buf; - src = picture->data[0]; - for(j=0;jlinesize[0]; - } - break; - case PIX_FMT_RGB24: - case PIX_FMT_BGR24: - size = (w * h) * 3; - buf = av_malloc(size); - if (!buf) - return; - dest = buf; - src = picture->data[0]; - for(j=0;jlinesize[0]; - } - break; - default: - return; - } - av_write_frame(s, index, buf, size); - av_free(buf); -} - static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void **bufp) { AVCodecContext *dec; @@ -589,16 +508,21 @@ static void do_video_out(AVFormatContext *s, ost->sync_ipts_offset = 0.000001; /* one microsecond */ } -#if defined(PJSG) - { - static char *action[] = { "drop frame", "copy frame", "dup frame" }; - printf("Input PTS %12.6f, output PTS %12.6f: %s\n", - (double) ost->sync_ipts, (double) ost->st->pts.val * s->pts_num / s->pts_den, - action[nb_frames]); - } -#endif } } + +#if defined(AVSYNC_DEBUG) + static char *action[] = { "drop frame", "copy frame", "dup frame" }; + if (audio_sync) + fprintf(stderr, "Input APTS %12.6f, output APTS %12.6f, ", + (double) audio_sync->sync_ipts, + (double) audio_sync->st->pts.val * s->pts_num / s->pts_den); + fprintf(stderr, "Input VPTS %12.6f, output VPTS %12.6f: %s\n", + (double) ost->sync_ipts, + (double) ost->st->pts.val * s->pts_num / s->pts_den, + action[nb_frames]); +#endif + if (nb_frames <= 0) return; @@ -657,7 +581,13 @@ static void do_video_out(AVFormatContext *s, /* duplicates frame if needed */ /* XXX: pb because no interleaving */ for(i=0;icodec_id != CODEC_ID_RAWVIDEO) { + if (s->oformat->flags & AVFMT_RAWPICTURE) { + /* raw pictures are written as AVPicture structure to + avoid any copies. We support temorarily the older + method. */ + av_write_frame(s, ost->index, + (uint8_t *)final_picture, sizeof(AVPicture)); + } else { AVFrame big_picture; memset(&big_picture, 0, sizeof(AVFrame)); @@ -683,17 +613,6 @@ static void do_video_out(AVFormatContext *s, if (ost->logfile && enc->stats_out) { fprintf(ost->logfile, "%s", enc->stats_out); } - } else { - if (s->oformat->flags & AVFMT_RAWPICTURE) { - /* raw pictures are written as AVPicture structure to - avoid any copies. We support temorarily the older - method. */ - av_write_frame(s, ost->index, - (uint8_t *)final_picture, sizeof(AVPicture)); - } else { - write_picture(s, ost->index, final_picture, enc->pix_fmt, - enc->width, enc->height); - } } ost->frame_number++; } @@ -752,7 +671,7 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, avg_bitrate = (double)(total_size * 8) / ti1 / 1000.0; fprintf(fvstats, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ", (double)total_size / 1024, ti1, bitrate, avg_bitrate); - fprintf(fvstats,"type= %s\n", enc->coded_frame->key_frame == 1 ? "I" : "P"); + fprintf(fvstats,"type= %c\n", av_get_pict_type_char(enc->coded_frame->pict_type)); } } @@ -838,7 +757,7 @@ static int av_encode(AVFormatContext **output_files, int nb_input_files, AVStreamMap *stream_maps, int nb_stream_maps) { - int ret, i, j, k, n, nb_istreams = 0, nb_ostreams = 0, pts_set; + int ret, i, j, k, n, nb_istreams = 0, nb_ostreams = 0; AVFormatContext *is, *os; AVCodecContext *codec, *icodec; AVOutputStream *ost, **ost_table = NULL; @@ -900,6 +819,18 @@ static int av_encode(AVFormatContext **output_files, exit(1); } + /* Sanity check the mapping args -- do the input files & streams exist? */ + for(i=0;i nb_input_files - 1 || + si < 0 || si > file_table[fi].nb_streams - 1) { + fprintf(stderr,"Could not find input stream #%d.%d\n", fi, si); + exit(1); + } + } + ost_table = av_mallocz(sizeof(AVOutputStream *) * nb_ostreams); if (!ost_table) goto fail; @@ -922,6 +853,15 @@ static int av_encode(AVFormatContext **output_files, if (nb_stream_maps > 0) { ost->source_index = file_table[stream_maps[n-1].file_index].ist_index + stream_maps[n-1].stream_index; + + /* Sanity check that the stream types match */ + if (ist_table[ost->source_index]->st->codec.codec_type != ost->st->codec.codec_type) { + fprintf(stderr, "Codec type mismatch for mapping #%d.%d -> #%d.%d\n", + stream_maps[n-1].file_index, stream_maps[n-1].stream_index, + ost->file_index, ost->index); + exit(1); + } + } else { /* get corresponding input stream index : we select the first one with the right type */ found = 0; @@ -1167,6 +1107,19 @@ static int av_encode(AVFormatContext **output_files, /* init pts */ for(i=0;ifile_index]; + switch (ist->st->codec.codec_type) { + case CODEC_TYPE_AUDIO: + av_frac_init(&ist->pts, + 0, 0, is->pts_num * ist->st->codec.sample_rate); + break; + case CODEC_TYPE_VIDEO: + av_frac_init(&ist->pts, + 0, 0, is->pts_num * ist->st->codec.frame_rate); + break; + default: + break; + } } /* compute buffer size max (should use a complete heuristic) */ @@ -1185,11 +1138,7 @@ static int av_encode(AVFormatContext **output_files, } #ifndef CONFIG_WIN32 - if (!do_play) { - fprintf(stderr, "Press [q] to stop encoding\n"); - } else { - fprintf(stderr, "Press [q] to stop playing\n"); - } + fprintf(stderr, "Press [q] to stop encoding\n"); #endif term_init(); @@ -1270,7 +1219,6 @@ static int av_encode(AVFormatContext **output_files, len = pkt.size; ptr = pkt.data; - pts_set = 0; while (len > 0) { int64_t ipts; @@ -1284,12 +1232,10 @@ static int av_encode(AVFormatContext **output_files, frame has begun (MPEG semantics) */ /* NOTE2: even if the fraction is not initialized, av_frac_set can be used to set the integer part */ - if (ist->frame_decoded && - pkt.pts != AV_NOPTS_VALUE && - !pts_set) { - ipts = pkt.pts; + if (ist->frame_decoded) { + /* If pts is unavailable -- we have to use synthetic one */ + ipts = (pkt.pts == AV_NOPTS_VALUE) ? ist->pts.val : pkt.pts; ist->frame_decoded = 0; - pts_set = 1; } switch(ist->st->codec.codec_type) { @@ -1309,18 +1255,11 @@ static int av_encode(AVFormatContext **output_files, continue; } data_buf = (uint8_t *)samples; + av_frac_add(&ist->pts, + is->pts_den * data_size / (2 * ist->st->codec.channels)); break; case CODEC_TYPE_VIDEO: - if (ist->st->codec.codec_id == CODEC_ID_RAWVIDEO) { - int size; - - size = (ist->st->codec.width * ist->st->codec.height); - avpicture_fill(&picture, ptr, - ist->st->codec.pix_fmt, - ist->st->codec.width, - ist->st->codec.height); - ret = len; - } else { + { AVFrame big_picture; data_size = (ist->st->codec.width * ist->st->codec.height * 3) / 2; @@ -1341,7 +1280,8 @@ static int av_encode(AVFormatContext **output_files, len -= ret; continue; } - + av_frac_add(&ist->pts, + is->pts_den * ist->st->codec.frame_rate_base); } break; default: @@ -1446,9 +1386,9 @@ static int av_encode(AVFormatContext **output_files, /* no reencoding needed : output the packet directly */ /* force the input stream PTS */ - //XXX/FIXME set keyframe flag from demuxer (or optionally from decoder) memset(&avframe, 0, sizeof(AVFrame)); ost->st->codec.coded_frame= &avframe; + avframe.key_frame = pkt.flags & PKT_FLAG_KEY; av_write_frame(os, ost->index, data_buf, data_size); ost->st->codec.frame_number++; @@ -1676,12 +1616,12 @@ static void opt_debug(const char *arg) static void opt_frame_rate(const char *arg) { - frame_rate_base = DEFAULT_FRAME_RATE_BASE; //FIXME not optimal - frame_rate = (int)(strtod(arg, 0) * frame_rate_base + 0.5); - //FIXME parse fractions + if (parse_frame_rate(&frame_rate, &frame_rate_base, arg) < 0) { + fprintf(stderr, "Incorrect frame rate\n"); + exit(1); + } } - static void opt_frame_crop_top(const char *arg) { frame_topBand = atoi(arg); @@ -1756,8 +1696,7 @@ static void opt_frame_crop_right(const char *arg) static void opt_frame_size(const char *arg) { - parse_image_size(&frame_width, &frame_height, arg); - if (frame_width <= 0 || frame_height <= 0) { + if (parse_image_size(&frame_width, &frame_height, arg) < 0) { fprintf(stderr, "Incorrect frame size\n"); exit(1); } @@ -1767,6 +1706,34 @@ static void opt_frame_size(const char *arg) } } +static void opt_frame_pix_fmt(const char *arg) +{ + frame_pix_fmt = avcodec_get_pix_fmt(arg); +} + +static void opt_frame_aspect_ratio(const char *arg) +{ + int x = 0, y = 0; + double ar = 0; + const char *p; + + p = strchr(arg, ':'); + if (p) { + x = strtol(arg, (char **)&arg, 10); + if (arg == p) + y = strtol(arg+1, (char **)&arg, 10); + if (x > 0 && y > 0) + ar = (double)x / (double)y; + } else + ar = strtod(arg, (char **)&arg); + + if (!ar) { + fprintf(stderr, "Incorrect aspect ratio specification.\n"); + exit(1); + } + frame_aspect_ratio = ar; +} + static void opt_gop_size(const char *arg) { gop_size = atoi(arg); @@ -1910,6 +1877,11 @@ static void opt_video_channel(const char *arg) video_channel = strtol(arg, NULL, 0); } +static void opt_video_standard(const char *arg) +{ + video_standard = av_strdup(arg); +} + static void opt_audio_device(const char *arg) { audio_device = av_strdup(arg); @@ -2030,28 +2002,6 @@ static void opt_recording_time(const char *arg) recording_time = parse_date(arg, 1); } -static void print_error(const char *filename, int err) -{ - switch(err) { - case AVERROR_NUMEXPECTED: - fprintf(stderr, "%s: Incorrect image filename syntax.\n" - "Use '%%d' to specify the image number:\n" - " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n" - " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n", - filename); - break; - case AVERROR_INVALIDDATA: - fprintf(stderr, "%s: Error while parsing header\n", filename); - break; - case AVERROR_NOFMT: - fprintf(stderr, "%s: Unknown format\n", filename); - break; - default: - fprintf(stderr, "%s: Error while opening file\n", filename); - break; - } -} - static void opt_input_file(const char *filename) { AVFormatContext *ic; @@ -2070,6 +2020,7 @@ static void opt_input_file(const char *filename) ap->width = frame_width; ap->height = frame_height; ap->image_format = image_format; + ap->pix_fmt = frame_pix_fmt; /* open the input file with generic libav function */ err = av_open_input_file(&ic, filename, file_iformat, 0, ap); @@ -2098,6 +2049,8 @@ static void opt_input_file(const char *filename) case CODEC_TYPE_VIDEO: frame_height = enc->height; frame_width = enc->width; + frame_aspect_ratio = enc->aspect_ratio; + frame_pix_fmt = enc->pix_fmt; rfps = ic->streams[i]->r_frame_rate; rfps_base = ic->streams[i]->r_frame_rate_base; enc->workaround_bugs = workaround_bugs; @@ -2107,7 +2060,7 @@ static void opt_input_file(const char *filename) enc->debug= debug; /* if(enc->codec->capabilities & CODEC_CAP_TRUNCATED) enc->flags|= CODEC_FLAG_TRUNCATED; */ - if(/*enc->codec_id==CODEC_ID_MPEG4 || */enc->codec_id==CODEC_ID_MPEG1VIDEO) + if(/*enc->codec_id==CODEC_ID_MPEG4 || */enc->codec_id==CODEC_ID_MPEG1VIDEO || enc->codec_id==CODEC_ID_H264) enc->flags|= CODEC_FLAG_TRUNCATED; if(bitexact) @@ -2254,6 +2207,8 @@ static void opt_output_file(const char *filename) video_enc->width = frame_width; video_enc->height = frame_height; + video_enc->aspect_ratio = frame_aspect_ratio; + video_enc->pix_fmt = frame_pix_fmt; if (!intra_only) video_enc->gop_size = gop_size; @@ -2526,6 +2481,7 @@ static void prepare_grab(void) fmt1 = av_find_input_format(video_grab_format); vp->device = video_device; vp->channel = video_channel; + vp->standard = video_standard; if (av_open_input_file(&ic, "", fmt1, 0, vp) < 0) { fprintf(stderr, "Could not find video grab device\n"); exit(1); @@ -2551,40 +2507,6 @@ static void prepare_grab(void) } } -/* open the necessary output devices for playing */ -static void prepare_play(void) -{ - int has_video, has_audio; - - check_audio_video_inputs(&has_video, &has_audio); - - /* manual disable */ - if (audio_disable) { - has_audio = 0; - } - if (video_disable) { - has_video = 0; - } - - if (has_audio) { - file_oformat = guess_format("audio_device", NULL, NULL); - if (!file_oformat) { - fprintf(stderr, "Could not find audio device\n"); - exit(1); - } - opt_output_file(audio_device?audio_device:"/dev/dsp"); - } - - if (has_video) { - file_oformat = guess_format("framebuffer_device", NULL, NULL); - if (!file_oformat) { - fprintf(stderr, "Could not find framebuffer device\n"); - exit(1); - } - opt_output_file(""); - } -} - /* same option as mencoder */ static void opt_pass(const char *pass_str) { @@ -2678,7 +2600,7 @@ static void show_formats(void) printf(" %s:", up->name); printf("\n"); - printf("Frame size abbreviations: sqcif qcif cif 4cif\n"); + printf("Frame size, frame rate abbreviations: ntsc pal film ntsc-film sqcif qcif cif 4cif\n"); printf("Motion estimation methods:"); pp = motion_str; while (*pp) { @@ -2695,47 +2617,6 @@ static void show_formats(void) exit(1); } -void show_help(void) -{ - const char *prog; - const OptionDef *po; - int i, expert; - - prog = do_play ? "ffplay" : "ffmpeg"; - - printf("%s version " FFMPEG_VERSION ", Copyright (c) 2000, 2001, 2002 Fabrice Bellard\n", - prog); - - if (!do_play) { - printf("usage: ffmpeg [[options] -i input_file]... {[options] outfile}...\n" - "Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder\n"); - } else { - printf("usage: ffplay [options] input_file...\n" - "Simple audio player\n"); - } - - printf("\n" - "Main options are:\n"); - for(i=0;i<2;i++) { - if (i == 1) - printf("\nAdvanced options are:\n"); - for(po = options; po->name != NULL; po++) { - char buf[64]; - expert = (po->flags & OPT_EXPERT) != 0; - if (expert == i) { - strcpy(buf, po->name); - if (po->flags & HAS_ARG) { - strcat(buf, " "); - strcat(buf, po->argname); - } - printf("-%-17s %s\n", buf, po->help); - } - } - } - - exit(1); -} - const OptionDef options[] = { { "L", 0, {(void*)show_licence}, "show license" }, { "h", 0, {(void*)show_help}, "show help" }, @@ -2754,9 +2635,11 @@ const OptionDef options[] = { { "passlogfile", HAS_ARG | OPT_STRING, {(void*)&pass_logfilename}, "select two pass log file name", "file" }, /* video options */ { "b", HAS_ARG, {(void*)opt_video_bitrate}, "set video bitrate (in kbit/s)", "bitrate" }, - { "r", HAS_ARG, {(void*)opt_frame_rate}, "set frame rate (in Hz)", "rate" }, + { "r", HAS_ARG, {(void*)opt_frame_rate}, "set frame rate (Hz value, fraction or abbreviation)", "rate" }, { "re", OPT_BOOL|OPT_EXPERT, {(void*)&rate_emu}, "read input at native frame rate" }, { "s", HAS_ARG, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" }, + { "aspect", HAS_ARG, {(void*)opt_frame_aspect_ratio}, "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" }, + { "pix_fmt", HAS_ARG | OPT_EXPERT, {(void*)opt_frame_pix_fmt}, "set pixel format", "format" }, { "croptop", HAS_ARG, {(void*)opt_frame_crop_top}, "set top crop band size (in pixels)", "size" }, { "cropbottom", HAS_ARG, {(void*)opt_frame_crop_bottom}, "set bottom crop band size (in pixels)", "size" }, { "cropleft", HAS_ARG, {(void*)opt_frame_crop_left}, "set left crop band size (in pixels)", "size" }, @@ -2786,6 +2669,7 @@ const OptionDef options[] = { { "bufsize", HAS_ARG, {(void*)opt_video_buffer_size}, "set ratecontrol buffere size (in kbit)", "size" }, { "vd", HAS_ARG | OPT_EXPERT, {(void*)opt_video_device}, "set video grab device", "device" }, { "vc", HAS_ARG | OPT_EXPERT, {(void*)opt_video_channel}, "set video grab channel (DV1394 only)", "channel" }, + { "tvstd", HAS_ARG | OPT_EXPERT, {(void*)opt_video_standard}, "set television standard (NTSC, PAL (SECAM))", "standard" }, { "dv1394", OPT_EXPERT, {(void*)opt_dv1394}, "set DV1394 grab", "" }, { "vcodec", HAS_ARG | OPT_EXPERT, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" }, { "me", HAS_ARG | OPT_EXPERT, {(void*)opt_motion_estimation}, "set motion estimation method", @@ -2828,83 +2712,42 @@ const OptionDef options[] = { { NULL, }, }; +void show_help(void) +{ + printf("ffmpeg version " FFMPEG_VERSION ", Copyright (c) 2000, 2001, 2002 Fabrice Bellard\n"); + printf("usage: ffmpeg [[options] -i input_file]... {[options] outfile}...\n" + "Hyper fast Audio and Video encoder\n"); + printf("\n"); + show_help_options(options); + exit(1); +} + +void parse_arg_file(const char *filename) +{ + opt_output_file(filename); +} + int main(int argc, char **argv) { - int optindex, i; - const char *opt, *arg; - const OptionDef *po; + int i; int64_t ti; av_register_all(); - /* detect if invoked as player */ - i = strlen(argv[0]); - if (i >= 6 && !strcmp(argv[0] + i - 6, "ffplay")) - do_play = 1; - if (argc <= 1) show_help(); /* parse options */ - optindex = 1; - while (optindex < argc) { - opt = argv[optindex++]; - - if (opt[0] == '-' && opt[1] != '\0') { - po = options; - while (po->name != NULL) { - if (!strcmp(opt + 1, po->name)) - break; - po++; - } - if (!po->name) { - 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 = 1; - } else { - po->u.func_arg(arg); - } - } else { - if (!do_play) { - opt_output_file(opt); - } else { - opt_input_file(opt); - } - } - } - + parse_options(argc, argv, options); - if (!do_play) { - /* file converter / grab */ - if (nb_output_files <= 0) { - fprintf(stderr, "Must supply at least one output file\n"); - exit(1); - } - - if (nb_input_files == 0) { - prepare_grab(); - } - } else { - /* player */ - if (nb_input_files <= 0) { - fprintf(stderr, "Must supply at least one input file\n"); - exit(1); - } - prepare_play(); + /* file converter / grab */ + if (nb_output_files <= 0) { + fprintf(stderr, "Must supply at least one output file\n"); + exit(1); + } + + if (nb_input_files == 0) { + prepare_grab(); } ti = getutime(); @@ -2932,10 +2775,19 @@ int main(int argc, char **argv) av_free_static(); -#ifdef POWERPC_TBL_PERFORMANCE_REPORT +#ifdef POWERPC_PERFORMANCE_REPORT extern void powerpc_display_perf_report(void); powerpc_display_perf_report(); -#endif /* POWERPC_TBL_PERFORMANCE_REPORT */ +#endif /* POWERPC_PERFORMANCE_REPORT */ +#ifndef CONFIG_WIN32 + if (received_sigterm) { + fprintf(stderr, + "Received signal %d: terminating.\n", + (int) received_sigterm); + exit (255); + } +#endif + exit(0); /* not all OS-es handle main() return value */ return 0; }