X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=995a775458b85b3f8094998cfc607eede5b0db51;hb=20176cbc737a4896f10d199d5c02ae13cc74d34b;hp=7a8dcac3854e4d0e19198baa6b79b4815e704a5c;hpb=84be6e723930e540ee105949af1a7a498164560c;p=ffmpeg diff --git a/ffmpeg.c b/ffmpeg.c index 7a8dcac3854..995a775458b 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -27,16 +27,19 @@ #include #include #include -#include "avformat.h" -#include "avdevice.h" -#include "swscale.h" -#include "framehook.h" -#include "opt.h" -#include "fifo.h" -#include "avstring.h" -#include "os_support.h" - -#if !defined(HAVE_GETRUSAGE) && defined(HAVE_GETPROCESSTIMES) +#include "libavformat/avformat.h" +#include "libavdevice/avdevice.h" +#include "libswscale/swscale.h" +#include "libavformat/framehook.h" +#include "libavcodec/opt.h" +#include "libavutil/fifo.h" +#include "libavutil/avstring.h" +#include "libavformat/os_support.h" + +#ifdef HAVE_SYS_RESOURCE_H +#include +#include +#elif defined(HAVE_GETPROCESSTIMES) #include #endif @@ -46,7 +49,6 @@ #include #include #include -#include #elif defined(HAVE_CONIO_H) #include #endif @@ -59,13 +61,9 @@ #undef NDEBUG #include -#if !defined(INFINITY) && defined(HUGE_VAL) -#define INFINITY HUGE_VAL -#endif - #undef exit -static const char program_name[] = "FFmpeg"; +const char program_name[] = "FFmpeg"; static const int program_birth_year = 2000; /* select an input stream for an output stream */ @@ -82,7 +80,7 @@ typedef struct AVMetaDataMap { int in_file; } AVMetaDataMap; -extern const OptionDef options[]; +static const OptionDef options[]; #define MAX_FILES 20 @@ -115,7 +113,7 @@ static int frame_bottomBand = 0; static int frame_leftBand = 0; static int frame_rightBand = 0; static int max_frames[4] = {INT_MAX, INT_MAX, INT_MAX, INT_MAX}; -static AVRational frame_rate = (AVRational) {25,1}; +static AVRational frame_rate = (AVRational) {0,0}; static float video_qscale = 0; static int video_qdiff = 3; static uint16_t *intra_matrix = NULL; @@ -125,7 +123,7 @@ static float video_rc_qsquish=1.0; static float video_rc_qmod_amp=0; static int video_rc_qmod_freq=0; #endif -static char *video_rc_override_string=NULL; +static const char *video_rc_override_string=NULL; static int video_disable = 0; static int video_discard = 0; static char *video_codec_name = NULL; @@ -166,6 +164,7 @@ static char *str_title = NULL; static char *str_author = NULL; static char *str_copyright = NULL; static char *str_comment = NULL; +static char *str_genre = NULL; static char *str_album = NULL; static int do_benchmark = 0; static int do_hex_dump = 0; @@ -209,7 +208,7 @@ static uint64_t limit_filesize = 0; // static int pgmyuv_compatibility_hack=0; static float dts_delta_threshold = 10; -static int sws_flags = SWS_BICUBIC; +static unsigned int sws_flags = SWS_BICUBIC; static const char **opt_names; static int opt_name_count; @@ -220,6 +219,7 @@ static int64_t timer_start; static AVBitStreamFilterContext *video_bitstream_filters=NULL; static AVBitStreamFilterContext *audio_bitstream_filters=NULL; +static AVBitStreamFilterContext *subtitle_bitstream_filters=NULL; static AVBitStreamFilterContext *bitstream_filters[MAX_FILES][MAX_STREAMS]; #define DEFAULT_PASS_LOGFILENAME "ffmpeg2pass" @@ -373,6 +373,59 @@ static int decode_interrupt_cb(void) return q_pressed || (q_pressed = read_key() == 'q'); } +static int av_exit(int ret) +{ + int i; + + /* close files */ + for(i=0;ioformat->flags & AVFMT_NOFILE) && s->pb) + url_fclose(s->pb); + for(j=0;jnb_streams;j++) { + av_free(s->streams[j]->codec); + av_free(s->streams[j]); + } + av_free(s); + } + for(i=0;idata, pkt->size, pkt->flags & PKT_FLAG_KEY); - if(a){ + if(a>0){ av_free_packet(pkt); new_pkt.destruct= av_destruct_packet; + } else if(a<0){ + fprintf(stderr, "%s failed for stream %d, codec %s", + bsfc->filter->name, pkt->stream_index, + avctx->codec ? avctx->codec->name : "copy"); + print_error("", a); } *pkt= new_pkt; @@ -426,7 +484,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext *avctx ret= av_interleaved_write_frame(s, pkt); if(ret < 0){ print_error("av_interleaved_write_frame()", ret); - exit(1); + av_exit(1); } } @@ -444,6 +502,7 @@ static void do_audio_out(AVFormatContext *s, int size_out, frame_bytes, ret; AVCodecContext *enc= ost->st->codec; + AVCodecContext *dec= ist->st->codec; /* SC: dynamic allocation of buffers */ if (!audio_buf) @@ -453,6 +512,20 @@ static void do_audio_out(AVFormatContext *s, if (!audio_buf || !audio_out) return; /* Should signal an error ! */ + if (enc->channels != dec->channels) + ost->audio_resample = 1; + + if (ost->audio_resample && !ost->resample) { + ost->resample = audio_resample_init(enc->channels, dec->channels, + enc->sample_rate, dec->sample_rate); + if (!ost->resample) { + fprintf(stderr, "Can not resample %d channels @ %d Hz to %d channels @ %d Hz\n", + dec->channels, dec->sample_rate, + enc->channels, enc->sample_rate); + av_exit(1); + } + } + if(audio_sync_method){ double delta = get_sync_ipts(ost) * enc->sample_rate - ost->sync_opts - av_fifo_size(&ost->fifo)/(ost->st->codec->channels * 2); @@ -514,6 +587,7 @@ static void do_audio_out(AVFormatContext *s, /* now encode as many frames as possible */ if (enc->frame_size > 1) { /* output resampled raw samples */ + av_fifo_realloc(&ost->fifo, av_fifo_size(&ost->fifo) + size_out + 1); av_fifo_write(&ost->fifo, buftmp, size_out); frame_bytes = enc->frame_size * 2 * enc->channels; @@ -522,6 +596,8 @@ static void do_audio_out(AVFormatContext *s, AVPacket pkt; av_init_packet(&pkt); + //FIXME pass ost->sync_opts as AVFrame.pts in avcodec_encode_audio() + ret = avcodec_encode_audio(enc, audio_out, audio_out_size, (short *)audio_buf); audio_size += ret; @@ -566,6 +642,7 @@ static void do_audio_out(AVFormatContext *s, size_out = size_out >> 1; break; } + //FIXME pass ost->sync_opts as AVFrame.pts in avcodec_encode_audio() ret = avcodec_encode_audio(enc, audio_out, size_out, (short *)buftmp); audio_size += ret; @@ -711,6 +788,8 @@ static void do_video_out(AVFormatContext *s, //FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c if (vdelta < -1.1) nb_frames = 0; + else if (video_sync_method == 2) + ost->sync_opts= lrintf(get_sync_ipts(ost) / av_q2d(enc->time_base)); else if (vdelta > 1.1) nb_frames = lrintf(vdelta); //fprintf(stderr, "vdelta:%f, ost->sync_opts:%"PRId64", ost->sync_ipts:%f nb_frames:%d\n", vdelta, ost->sync_opts, ost->sync_ipts, nb_frames); @@ -781,10 +860,8 @@ static void do_video_out(AVFormatContext *s, enc->coded_frame = dec->coded_frame; //FIXME/XXX remove this hack pkt.data= (uint8_t *)final_picture; pkt.size= sizeof(AVPicture); - if(dec->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE) - pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); - if(dec->coded_frame && dec->coded_frame->key_frame) - pkt.flags |= PKT_FLAG_KEY; + pkt.pts= av_rescale_q(ost->sync_opts, enc->time_base, ost->st->time_base); + pkt.flags |= PKT_FLAG_KEY; write_frame(s, &pkt, ost->st->codec, bitstream_filters[ost->file_index][pkt.stream_index]); enc->coded_frame = old_frame; @@ -819,7 +896,7 @@ static void do_video_out(AVFormatContext *s, &big_picture); if (ret == -1) { fprintf(stderr, "Video encoding failed\n"); - exit(1); + av_exit(1); } //enc->frame_number = enc->real_pict_num; if(ret>0){ @@ -850,7 +927,6 @@ static void do_video_out(AVFormatContext *s, } static double psnr(double d){ - if(d==0) return INFINITY; return -10.0*log(d)/log(10.0); } @@ -866,7 +942,7 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, vstats_file = fopen(vstats_filename, "w"); if (!vstats_file) { perror("fopen"); - exit(1); + av_exit(1); } } @@ -934,7 +1010,8 @@ static void print_report(AVFormatContext **output_files, enc = ost->st->codec; if (vid && enc->codec_type == CODEC_TYPE_VIDEO) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "q=%2.1f ", - enc->coded_frame->quality/(float)FF_QP2LAMBDA); + enc->coded_frame && !ost->st->stream_copy ? + enc->coded_frame->quality/(float)FF_QP2LAMBDA : -1); } if (!vid && enc->codec_type == CODEC_TYPE_VIDEO) { float t = (av_gettime()-timer_start) / 1000000.0; @@ -942,7 +1019,8 @@ static void print_report(AVFormatContext **output_files, frame_number = ost->frame_number; snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "frame=%5d fps=%3d q=%3.1f ", frame_number, (t>1)?(int)(frame_number/t+0.5) : 0, - enc->coded_frame ? enc->coded_frame->quality/(float)FF_QP2LAMBDA : -1); + enc->coded_frame && !ost->st->stream_copy ? + enc->coded_frame->quality/(float)FF_QP2LAMBDA : -1); if(is_last_report) snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "L"); if(qp_hist && enc->coded_frame){ @@ -988,7 +1066,7 @@ static void print_report(AVFormatContext **output_files, bitrate = (double)(total_size * 8) / ti1 / 1000.0; snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), - "size=%8.0fkB time=%0.1f bitrate=%6.1fkbits/s", + "size=%8.0fkB time=%0.2f bitrate=%6.1fkbits/s", (double)total_size / 1024, ti1, bitrate); if (verbose > 1) @@ -1031,13 +1109,8 @@ static int output_packet(AVInputStream *ist, int ist_index, AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; - if(!pkt){ - ist->pts= ist->next_pts; // needed for last packet if vsync=0 - } else if (pkt->dts != AV_NOPTS_VALUE) { //FIXME seems redundant, as libavformat does this too - ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); - } else { -// assert(ist->pts == ist->next_pts); - } + if(ist->next_pts == AV_NOPTS_VALUE) + ist->next_pts= ist->pts; if (pkt == NULL) { /* EOF handling */ @@ -1046,10 +1119,18 @@ static int output_packet(AVInputStream *ist, int ist_index, goto handle_eof; } + if(pkt->dts != AV_NOPTS_VALUE) + ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); + len = pkt->size; ptr = pkt->data; while (len > 0) { handle_eof: + ist->pts= ist->next_pts; + + if(len && len != pkt->size && verbose>0) + fprintf(stderr, "Multiple frames in a packet from stream %d\n", pkt->stream_index); + /* decode the packet if needed */ data_buf = NULL; /* fail safe */ data_size = 0; @@ -1253,7 +1334,7 @@ static int output_packet(AVInputStream *ist, int ist_index, if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & PKT_FLAG_KEY)) opkt.destruct= av_destruct_packet; - write_frame(os, &opkt, ost->st->codec, bitstream_filters[ost->file_index][pkt->stream_index]); + write_frame(os, &opkt, ost->st->codec, bitstream_filters[ost->file_index][opkt.stream_index]); ost->st->codec->frame_number++; ost->frame_number++; av_free_packet(&opkt); @@ -1446,13 +1527,13 @@ static int av_encode(AVFormatContext **output_files, os = output_files[i]; if (!os->nb_streams) { fprintf(stderr, "Output file does not contain any stream\n"); - exit(1); + av_exit(1); } nb_ostreams += os->nb_streams; } if (nb_stream_maps > 0 && nb_stream_maps != nb_ostreams) { fprintf(stderr, "Number of stream maps must match number of output streams\n"); - exit(1); + av_exit(1); } /* Sanity check the mapping args -- do the input files & streams exist? */ @@ -1463,14 +1544,14 @@ static int av_encode(AVFormatContext **output_files, if (fi < 0 || fi > 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); + av_exit(1); } fi = stream_maps[i].sync_file_index; si = stream_maps[i].sync_stream_index; if (fi < 0 || fi > nb_input_files - 1 || si < 0 || si > file_table[fi].nb_streams - 1) { fprintf(stderr,"Could not find sync stream #%d.%d\n", fi, si); - exit(1); + av_exit(1); } } @@ -1502,7 +1583,7 @@ static int av_encode(AVFormatContext **output_files, 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); + av_exit(1); } } else { @@ -1541,7 +1622,7 @@ static int av_encode(AVFormatContext **output_files, if (!found) { fprintf(stderr, "Could not find input stream matching output stream #%d.%d\n", ost->file_index, ost->index); - exit(1); + av_exit(1); } } } @@ -1566,6 +1647,8 @@ static int av_encode(AVFormatContext **output_files, av_strlcpy(ost->st->language, ist->st->language, sizeof(ost->st->language)); + ost->st->disposition = ist->st->disposition; + if (ost->st->stream_copy) { /* if stream_copy is selected, no need to decode or encode */ codec->codec_id = icodec->codec_id; @@ -1597,7 +1680,7 @@ static int av_encode(AVFormatContext **output_files, case CODEC_TYPE_VIDEO: if(using_vhook) { fprintf(stderr,"-vcodec copy and -vhook are incompatible (frames are not decoded)\n"); - exit(1); + av_exit(1); } codec->pix_fmt = icodec->pix_fmt; codec->width = icodec->width; @@ -1612,40 +1695,10 @@ static int av_encode(AVFormatContext **output_files, } else { switch(codec->codec_type) { case CODEC_TYPE_AUDIO: - if (av_fifo_init(&ost->fifo, 2 * MAX_AUDIO_PACKET_SIZE)) + if (av_fifo_init(&ost->fifo, 1024)) goto fail; - - if (codec->channels == icodec->channels && - codec->sample_rate == icodec->sample_rate) { - ost->audio_resample = 0; - } else { - if (codec->channels != icodec->channels && - (icodec->codec_id == CODEC_ID_AC3 || - icodec->codec_id == CODEC_ID_DTS)) { - /* Special case for 5:1 AC3 and DTS input */ - /* and mono or stereo output */ - /* Request specific number of channels */ - icodec->channels = codec->channels; - if (codec->sample_rate == icodec->sample_rate) - ost->audio_resample = 0; - else { - ost->audio_resample = 1; - } - } else { - ost->audio_resample = 1; - } - } - if(audio_sync_method>1) - ost->audio_resample = 1; - - if(ost->audio_resample){ - ost->resample = audio_resample_init(codec->channels, icodec->channels, - codec->sample_rate, icodec->sample_rate); - if(!ost->resample){ - printf("Can't resample. Aborting.\n"); - abort(); - } - } + ost->audio_resample = codec->sample_rate != icodec->sample_rate || audio_sync_method > 1; + icodec->request_channels = codec->channels; ist->decoding_needed = 1; ost->encoding_needed = 1; break; @@ -1680,7 +1733,7 @@ static int av_encode(AVFormatContext **output_files, if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, codec->pix_fmt, codec->width, codec->height ) ) { fprintf(stderr, "Cannot allocate temp picture, check pix fmt\n"); - exit(1); + av_exit(1); } sws_flags = av_get_int(sws_opts, "sws_flags", NULL); ost->img_resample_ctx = sws_getContext( @@ -1693,7 +1746,7 @@ static int av_encode(AVFormatContext **output_files, sws_flags, NULL, NULL, NULL); if (ost->img_resample_ctx == NULL) { fprintf(stderr, "Cannot get resampling context\n"); - exit(1); + av_exit(1); } ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand); } @@ -1723,7 +1776,7 @@ static int av_encode(AVFormatContext **output_files, f = fopen(logfilename, "w"); if (!f) { perror(logfilename); - exit(1); + av_exit(1); } ost->logfile = f; } else { @@ -1731,7 +1784,7 @@ static int av_encode(AVFormatContext **output_files, f = fopen(logfilename, "r"); if (!f) { perror(logfilename); - exit(1); + av_exit(1); } fseek(f, 0, SEEK_END); size = ftell(f); @@ -1739,7 +1792,7 @@ static int av_encode(AVFormatContext **output_files, logbuffer = av_malloc(size + 1); if (!logbuffer) { fprintf(stderr, "Could not allocate log buffer\n"); - exit(1); + av_exit(1); } size = fread(logbuffer, 1, size, f); fclose(f); @@ -1792,12 +1845,12 @@ static int av_encode(AVFormatContext **output_files, if (!codec) { fprintf(stderr, "Unsupported codec for output stream #%d.%d\n", ost->file_index, ost->index); - exit(1); + av_exit(1); } if (avcodec_open(ost->st->codec, codec) < 0) { fprintf(stderr, "Error while opening codec for output stream #%d.%d - maybe incorrect parameters such as bit_rate, rate, width or height\n", ost->file_index, ost->index); - exit(1); + av_exit(1); } extra_size += ost->st->codec->extradata_size; } @@ -1812,12 +1865,12 @@ static int av_encode(AVFormatContext **output_files, if (!codec) { fprintf(stderr, "Unsupported codec (id=%d) for input stream #%d.%d\n", ist->st->codec->codec_id, ist->file_index, ist->index); - exit(1); + av_exit(1); } if (avcodec_open(ist->st->codec, codec) < 0) { fprintf(stderr, "Error while opening codec for input stream #%d.%d\n", ist->file_index, ist->index); - exit(1); + av_exit(1); } //if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO) // ist->st->codec->flags |= CODEC_FLAG_REPEAT_FIELD; @@ -1829,10 +1882,7 @@ static int av_encode(AVFormatContext **output_files, ist = ist_table[i]; is = input_files[ist->file_index]; ist->pts = 0; - ist->next_pts=0; - if( input_files_ts_offset[ist->file_index] != -is->start_time - && !(is->start_time == AV_NOPTS_VALUE && input_files_ts_offset[ist->file_index]==0)) - ist->next_pts= AV_NOPTS_VALUE; + ist->next_pts = AV_NOPTS_VALUE; ist->is_start = 1; } @@ -2074,7 +2124,7 @@ static int av_encode(AVFormatContext **output_files, av_free(ost->pict_tmp.data[0]); if (ost->video_resample) sws_freeContext(ost->img_resample_ctx); - if (ost->audio_resample) + if (ost->resample) audio_resample_close(ost->resample); av_free(ost); } @@ -2123,13 +2173,11 @@ static void opt_format(const char *arg) file_oformat = guess_format(arg, NULL, NULL); if (!file_iformat && !file_oformat) { fprintf(stderr, "Unknown input or output format: %s\n", arg); - exit(1); + av_exit(1); } } -#if defined(CONFIG_FFM_DEMUXER) || defined(CONFIG_FFM_MUXER) extern int ffm_nopts; -#endif static int opt_default(const char *opt, const char *arg){ int type; @@ -2169,35 +2217,37 @@ static int opt_default(const char *opt, const char *arg){ #endif if(avctx_opts[0]->debug) - av_log_level = AV_LOG_DEBUG; + av_log_set_level(AV_LOG_DEBUG); return 0; } -static void opt_video_rc_override_string(char *arg) +static void opt_video_rc_override_string(const char *arg) { video_rc_override_string = arg; } -static void opt_me_threshold(const char *arg) +static int opt_me_threshold(const char *opt, const char *arg) { - me_threshold = atoi(arg); + me_threshold = parse_number_or_die(opt, arg, OPT_INT64, INT_MIN, INT_MAX); + return 0; } -static void opt_verbose(const char *arg) +static int opt_verbose(const char *opt, const char *arg) { - verbose = atoi(arg); - av_log_level = atoi(arg); + verbose = parse_number_or_die(opt, arg, OPT_INT64, AV_LOG_QUIET, AV_LOG_DEBUG); + av_log_set_level(verbose); + return 0; } static void opt_frame_rate(const char *arg) { if (av_parse_video_frame_rate(&frame_rate, arg) < 0) { fprintf(stderr, "Incorrect frame rate\n"); - exit(1); + av_exit(1); } } -static void opt_bitrate(const char *opt, const char *arg) +static int opt_bitrate(const char *opt, const char *arg) { int codec_type = opt[0]=='a' ? CODEC_TYPE_AUDIO : CODEC_TYPE_VIDEO; @@ -2205,6 +2255,8 @@ static void opt_bitrate(const char *opt, const char *arg) if (av_get_int(avctx_opts[codec_type], "b", NULL) < 1000) fprintf(stderr, "WARNING: The bitrate parameter is set too low. It takes bits/s as argument, not kbits/s\n"); + + return 0; } static void opt_frame_crop_top(const char *arg) @@ -2212,15 +2264,15 @@ static void opt_frame_crop_top(const char *arg) frame_topBand = atoi(arg); if (frame_topBand < 0) { fprintf(stderr, "Incorrect top crop size\n"); - exit(1); + av_exit(1); } if ((frame_topBand % 2) != 0) { fprintf(stderr, "Top crop size must be a multiple of 2\n"); - exit(1); + av_exit(1); } if ((frame_topBand) >= frame_height){ fprintf(stderr, "Vertical crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n"); - exit(1); + av_exit(1); } frame_height -= frame_topBand; } @@ -2230,15 +2282,15 @@ static void opt_frame_crop_bottom(const char *arg) frame_bottomBand = atoi(arg); if (frame_bottomBand < 0) { fprintf(stderr, "Incorrect bottom crop size\n"); - exit(1); + av_exit(1); } if ((frame_bottomBand % 2) != 0) { fprintf(stderr, "Bottom crop size must be a multiple of 2\n"); - exit(1); + av_exit(1); } if ((frame_bottomBand) >= frame_height){ fprintf(stderr, "Vertical crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n"); - exit(1); + av_exit(1); } frame_height -= frame_bottomBand; } @@ -2248,15 +2300,15 @@ static void opt_frame_crop_left(const char *arg) frame_leftBand = atoi(arg); if (frame_leftBand < 0) { fprintf(stderr, "Incorrect left crop size\n"); - exit(1); + av_exit(1); } if ((frame_leftBand % 2) != 0) { fprintf(stderr, "Left crop size must be a multiple of 2\n"); - exit(1); + av_exit(1); } if ((frame_leftBand) >= frame_width){ fprintf(stderr, "Horizontal crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n"); - exit(1); + av_exit(1); } frame_width -= frame_leftBand; } @@ -2266,15 +2318,15 @@ static void opt_frame_crop_right(const char *arg) frame_rightBand = atoi(arg); if (frame_rightBand < 0) { fprintf(stderr, "Incorrect right crop size\n"); - exit(1); + av_exit(1); } if ((frame_rightBand % 2) != 0) { fprintf(stderr, "Right crop size must be a multiple of 2\n"); - exit(1); + av_exit(1); } if ((frame_rightBand) >= frame_width){ fprintf(stderr, "Horizontal crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n"); - exit(1); + av_exit(1); } frame_width -= frame_rightBand; } @@ -2283,11 +2335,11 @@ static void opt_frame_size(const char *arg) { if (av_parse_video_frame_size(&frame_width, &frame_height, arg) < 0) { fprintf(stderr, "Incorrect frame size\n"); - exit(1); + av_exit(1); } if ((frame_width % 2) != 0 || (frame_height % 2) != 0) { fprintf(stderr, "Frame size must be a multiple of 2\n"); - exit(1); + av_exit(1); } } @@ -2328,11 +2380,11 @@ static void opt_frame_pad_top(const char *arg) frame_padtop = atoi(arg); if (frame_padtop < 0) { fprintf(stderr, "Incorrect top pad size\n"); - exit(1); + av_exit(1); } if ((frame_padtop % 2) != 0) { fprintf(stderr, "Top pad size must be a multiple of 2\n"); - exit(1); + av_exit(1); } } @@ -2341,11 +2393,11 @@ static void opt_frame_pad_bottom(const char *arg) frame_padbottom = atoi(arg); if (frame_padbottom < 0) { fprintf(stderr, "Incorrect bottom pad size\n"); - exit(1); + av_exit(1); } if ((frame_padbottom % 2) != 0) { fprintf(stderr, "Bottom pad size must be a multiple of 2\n"); - exit(1); + av_exit(1); } } @@ -2355,11 +2407,11 @@ static void opt_frame_pad_left(const char *arg) frame_padleft = atoi(arg); if (frame_padleft < 0) { fprintf(stderr, "Incorrect left pad size\n"); - exit(1); + av_exit(1); } if ((frame_padleft % 2) != 0) { fprintf(stderr, "Left pad size must be a multiple of 2\n"); - exit(1); + av_exit(1); } } @@ -2369,15 +2421,15 @@ static void opt_frame_pad_right(const char *arg) frame_padright = atoi(arg); if (frame_padright < 0) { fprintf(stderr, "Incorrect right pad size\n"); - exit(1); + av_exit(1); } if ((frame_padright % 2) != 0) { fprintf(stderr, "Right pad size must be a multiple of 2\n"); - exit(1); + av_exit(1); } } -void list_pix_fmts(void) +static void list_pix_fmts(void) { int i; char pix_fmt_str[128]; @@ -2393,7 +2445,7 @@ static void opt_frame_pix_fmt(const char *arg) frame_pix_fmt = avcodec_get_pix_fmt(arg); else { list_pix_fmts(); - exit(0); + av_exit(0); } } @@ -2402,20 +2454,21 @@ static void opt_frame_aspect_ratio(const char *arg) int x = 0, y = 0; double ar = 0; const char *p; + char *end; p = strchr(arg, ':'); if (p) { - x = strtol(arg, (char **)&arg, 10); - if (arg == p) - y = strtol(arg+1, (char **)&arg, 10); + x = strtol(arg, &end, 10); + if (end == p) + y = strtol(end+1, &end, 10); if (x > 0 && y > 0) ar = (double)x / (double)y; } else - ar = strtod(arg, (char **)&arg); + ar = strtod(arg, NULL); if (!ar) { fprintf(stderr, "Incorrect aspect ratio specification.\n"); - exit(1); + av_exit(1); } frame_aspect_ratio = ar; } @@ -2426,7 +2479,7 @@ static void opt_qscale(const char *arg) if (video_qscale <= 0 || video_qscale > 255) { fprintf(stderr, "qscale must be > 0.0 and <= 255\n"); - exit(1); + av_exit(1); } } @@ -2436,7 +2489,7 @@ static void opt_qdiff(const char *arg) if (video_qdiff < 0 || video_qdiff > 31) { fprintf(stderr, "qdiff must be >= 1 and <= 31\n"); - exit(1); + av_exit(1); } } @@ -2459,14 +2512,16 @@ static void opt_thread_count(const char *arg) #endif } -static void opt_audio_rate(const char *arg) +static int opt_audio_rate(const char *opt, const char *arg) { - audio_sample_rate = atoi(arg); + audio_sample_rate = parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX); + return 0; } -static void opt_audio_channels(const char *arg) +static int opt_audio_channels(const char *opt, const char *arg) { - audio_channels = atoi(arg); + audio_channels = parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX); + return 0; } static void opt_video_channel(const char *arg) @@ -2531,7 +2586,7 @@ static void add_frame_hooker(const char *arg) if (i != 0) { fprintf(stderr, "Failed to add video hook function: %s\n", arg); - exit(1); + av_exit(1); } } #endif @@ -2549,22 +2604,21 @@ static void opt_subtitle_codec(const char *arg) static void opt_map(const char *arg) { AVStreamMap *m; - const char *p; + char *p; - p = arg; m = &stream_maps[nb_stream_maps++]; - m->file_index = strtol(arg, (char **)&p, 0); + m->file_index = strtol(arg, &p, 0); if (*p) p++; - m->stream_index = strtol(p, (char **)&p, 0); + m->stream_index = strtol(p, &p, 0); if (*p) { p++; - m->sync_file_index = strtol(p, (char **)&p, 0); + m->sync_file_index = strtol(p, &p, 0); if (*p) p++; - m->sync_stream_index = strtol(p, (char **)&p, 0); + m->sync_stream_index = strtol(p, &p, 0); } else { m->sync_file_index = m->file_index; m->sync_stream_index = m->stream_index; @@ -2574,52 +2628,44 @@ static void opt_map(const char *arg) static void opt_map_meta_data(const char *arg) { AVMetaDataMap *m; - const char *p; + char *p; - p = arg; m = &meta_data_maps[nb_meta_data_maps++]; - m->out_file = strtol(arg, (char **)&p, 0); + m->out_file = strtol(arg, &p, 0); if (*p) p++; - m->in_file = strtol(p, (char **)&p, 0); -} - -static int64_t parse_time_or_die(const char *timestr, int is_duration) -{ - int64_t us = parse_date(timestr, is_duration); - if (us == INT64_MIN) { - fprintf(stderr, "Invalid %s specification: %s\n", - is_duration ? "duration" : "date", timestr); - exit(1); - } - return us; + m->in_file = strtol(p, &p, 0); } -static void opt_recording_time(const char *arg) +static int opt_recording_time(const char *opt, const char *arg) { - recording_time = parse_time_or_die(arg, 1); + recording_time = parse_time_or_die(opt, arg, 1); + return 0; } -static void opt_start_time(const char *arg) +static int opt_start_time(const char *opt, const char *arg) { - start_time = parse_time_or_die(arg, 1); + start_time = parse_time_or_die(opt, arg, 1); + return 0; } -static void opt_rec_timestamp(const char *arg) +static int opt_rec_timestamp(const char *opt, const char *arg) { - rec_timestamp = parse_time_or_die(arg, 0) / 1000000; + rec_timestamp = parse_time_or_die(opt, arg, 0) / 1000000; + return 0; } -static void opt_input_ts_offset(const char *arg) +static int opt_input_ts_offset(const char *opt, const char *arg) { - input_ts_offset = parse_time_or_die(arg, 1); + input_ts_offset = parse_time_or_die(opt, arg, 1); + return 0; } static enum CodecID find_codec_or_die(const char *name, int type, int encoder) { - char *codec_string = encoder ? "encoder" : "decoder"; + const char *codec_string = encoder ? "encoder" : "decoder"; AVCodec *codec; if(!name) @@ -2629,11 +2675,11 @@ static enum CodecID find_codec_or_die(const char *name, int type, int encoder) avcodec_find_decoder_by_name(name); if(!codec) { av_log(NULL, AV_LOG_ERROR, "Unknown %s '%s'\n", codec_string, name); - exit(1); + av_exit(1); } if(codec->type != type) { av_log(NULL, AV_LOG_ERROR, "Invalid %s type '%s'\n", codec_string, name); - exit(1); + av_exit(1); } return codec->id; } @@ -2677,11 +2723,16 @@ static void opt_input_file(const char *filename) if(str && (opt->flags & AV_OPT_FLAG_DECODING_PARAM)) av_set_string(ic, opt_names[i], str); } + + ic->video_codec_id = find_codec_or_die(video_codec_name , CODEC_TYPE_VIDEO , 0); + ic->audio_codec_id = find_codec_or_die(audio_codec_name , CODEC_TYPE_AUDIO , 0); + ic->subtitle_codec_id= find_codec_or_die(subtitle_codec_name, CODEC_TYPE_SUBTITLE, 0); + /* open the input file with generic libav function */ err = av_open_input_file(&ic, filename, file_iformat, 0, ap); if (err < 0) { print_error(filename, err); - exit(1); + av_exit(1); } if(opt_programid) { int i; @@ -2697,7 +2748,7 @@ static void opt_input_file(const char *filename) ret = av_find_stream_info(ic); if (ret < 0 && verbose >= 0) { fprintf(stderr, "%s: could not find codec parameters\n", filename); - exit(1); + av_exit(1); } timestamp = start_time; @@ -2780,6 +2831,7 @@ static void opt_input_file(const char *filename) if(subtitle_disable) ic->streams[i]->discard = AVDISCARD_ALL; break; + case CODEC_TYPE_ATTACHMENT: case CODEC_TYPE_UNKNOWN: break; default: @@ -2800,6 +2852,9 @@ static void opt_input_file(const char *filename) video_channel = 0; rate_emu = 0; + av_freep(&video_codec_name); + av_freep(&audio_codec_name); + av_freep(&subtitle_codec_name); } static void check_audio_video_sub_inputs(int *has_video_ptr, int *has_audio_ptr, @@ -2826,6 +2881,7 @@ static void check_audio_video_sub_inputs(int *has_video_ptr, int *has_audio_ptr, has_subtitle = 1; break; case CODEC_TYPE_DATA: + case CODEC_TYPE_ATTACHMENT: case CODEC_TYPE_UNKNOWN: break; default: @@ -2847,7 +2903,7 @@ static void new_video_stream(AVFormatContext *oc) st = av_new_stream(oc, oc->nb_streams); if (!st) { fprintf(stderr, "Could not alloc stream\n"); - exit(1); + av_exit(1); } avcodec_get_context_defaults2(st->codec, CODEC_TYPE_VIDEO); bitstream_filters[nb_output_files][oc->nb_streams - 1]= video_bitstream_filters; @@ -2875,9 +2931,10 @@ static void new_video_stream(AVFormatContext *oc) st->stream_copy = 1; video_enc->codec_type = CODEC_TYPE_VIDEO; } else { - char *p; + const char *p; int i; AVCodec *codec; + AVRational fps= frame_rate.num ? frame_rate : (AVRational){25,1}; codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO); if (video_codec_name) @@ -2894,15 +2951,14 @@ static void new_video_stream(AVFormatContext *oc) av_set_string(video_enc, opt_names[i], str); } - video_enc->time_base.den = frame_rate.num; - video_enc->time_base.num = frame_rate.den; + video_enc->time_base.den = fps.num; + video_enc->time_base.num = fps.den; if(codec && codec->supported_framerates){ const AVRational *p= codec->supported_framerates; - AVRational req= (AVRational){frame_rate.num, frame_rate.den}; const AVRational *best=NULL; AVRational best_error= (AVRational){INT_MAX, 1}; for(; p->den!=0; p++){ - AVRational error= av_sub_q(req, *p); + AVRational error= av_sub_q(fps, *p); if(error.num <0) error.num *= -1; if(av_cmp_q(error, best_error) < 0){ best_error= error; @@ -2949,7 +3005,7 @@ static void new_video_stream(AVFormatContext *oc) int e=sscanf(p, "%d,%d,%d", &start, &end, &q); if(e!=3){ fprintf(stderr, "error parsing rc_override\n"); - exit(1); + av_exit(1); } video_enc->rc_override= av_realloc(video_enc->rc_override, @@ -3002,7 +3058,7 @@ static void new_audio_stream(AVFormatContext *oc) st = av_new_stream(oc, oc->nb_streams); if (!st) { fprintf(stderr, "Could not alloc stream\n"); - exit(1); + av_exit(1); } avcodec_get_context_defaults2(st->codec, CODEC_TYPE_AUDIO); @@ -3071,10 +3127,13 @@ static void new_subtitle_stream(AVFormatContext *oc) st = av_new_stream(oc, oc->nb_streams); if (!st) { fprintf(stderr, "Could not alloc stream\n"); - exit(1); + av_exit(1); } avcodec_get_context_defaults2(st->codec, CODEC_TYPE_SUBTITLE); + bitstream_filters[nb_output_files][oc->nb_streams - 1]= subtitle_bitstream_filters; + subtitle_bitstream_filters= NULL; + subtitle_enc = st->codec; subtitle_enc->codec_type = CODEC_TYPE_SUBTITLE; if (subtitle_stream_copy) { @@ -3106,7 +3165,7 @@ static void opt_new_audio_stream(void) AVFormatContext *oc; if (nb_output_files <= 0) { fprintf(stderr, "At least one output file must be specified\n"); - exit(1); + av_exit(1); } oc = output_files[nb_output_files - 1]; new_audio_stream(oc); @@ -3117,7 +3176,7 @@ static void opt_new_video_stream(void) AVFormatContext *oc; if (nb_output_files <= 0) { fprintf(stderr, "At least one output file must be specified\n"); - exit(1); + av_exit(1); } oc = output_files[nb_output_files - 1]; new_video_stream(oc); @@ -3128,7 +3187,7 @@ static void opt_new_subtitle_stream(void) AVFormatContext *oc; if (nb_output_files <= 0) { fprintf(stderr, "At least one output file must be specified\n"); - exit(1); + av_exit(1); } oc = output_files[nb_output_files - 1]; new_subtitle_stream(oc); @@ -3151,7 +3210,7 @@ static void opt_output_file(const char *filename) if (!file_oformat) { fprintf(stderr, "Unable to find a suitable output format for '%s'\n", filename); - exit(1); + av_exit(1); } } @@ -3164,7 +3223,7 @@ static void opt_output_file(const char *filename) parameters from ffserver */ if (read_ffserver_streams(oc, filename) < 0) { fprintf(stderr, "Could not read stream parameters from '%s'\n", filename); - exit(1); + av_exit(1); } } else { use_video = file_oformat->video_codec != CODEC_ID_NONE || video_stream_copy || video_codec_name; @@ -3219,6 +3278,8 @@ static void opt_output_file(const char *filename) av_strlcpy(oc->comment, str_comment, sizeof(oc->comment)); if (str_album) av_strlcpy(oc->album, str_album, sizeof(oc->album)); + if (str_genre) + av_strlcpy(oc->genre, str_genre, sizeof(oc->genre)); } output_files[nb_output_files++] = oc; @@ -3227,7 +3288,7 @@ static void opt_output_file(const char *filename) if (oc->oformat->flags & AVFMT_NEEDNUMBER) { if (!av_filename_number_test(oc->filename)) { print_error(oc->filename, AVERROR_NUMEXPECTED); - exit(1); + av_exit(1); } } @@ -3235,6 +3296,7 @@ static void opt_output_file(const char *filename) /* test if it already exists to avoid loosing precious files */ if (!file_overwrite && (strchr(filename, ':') == NULL || + filename[1] == ':' || av_strstart(filename, "file:", NULL))) { if (url_exist(filename)) { int c; @@ -3245,12 +3307,12 @@ static void opt_output_file(const char *filename) c = getchar(); if (toupper(c) != 'Y') { fprintf(stderr, "Not overwriting - exiting\n"); - exit(1); + av_exit(1); } } else { fprintf(stderr,"File '%s' already exists. Exiting.\n", filename); - exit(1); + av_exit(1); } } } @@ -3258,7 +3320,7 @@ static void opt_output_file(const char *filename) /* open the file */ if (url_fopen(&oc->pb, filename, URL_WRONLY) < 0) { fprintf(stderr, "Could not open '%s'\n", filename); - exit(1); + av_exit(1); } } @@ -3266,7 +3328,7 @@ static void opt_output_file(const char *filename) if (av_set_parameters(oc, ap) < 0) { fprintf(stderr, "%s: Invalid encoding parameters\n", oc->filename); - exit(1); + av_exit(1); } oc->preload= (int)(mux_preload*AV_TIME_BASE); @@ -3293,7 +3355,7 @@ static void opt_pass(const char *pass_str) pass = atoi(pass_str); if (pass != 1 && pass != 2) { fprintf(stderr, "pass number can be only 1 or 2\n"); - exit(1); + av_exit(1); } do_pass = pass; } @@ -3333,7 +3395,7 @@ static void opt_show_formats(void) const char *name=NULL; const char *long_name=NULL; - while(ofmt= av_oformat_next(ofmt)) { + while((ofmt= av_oformat_next(ofmt))) { if((name == NULL || strcmp(ofmt->name, name)<0) && strcmp(ofmt->name, last_name)>0){ name= ofmt->name; @@ -3341,7 +3403,7 @@ static void opt_show_formats(void) encode=1; } } - while(ifmt= av_iformat_next(ifmt)) { + while((ifmt= av_iformat_next(ifmt))) { if((name == NULL || strcmp(ifmt->name, name)<0) && strcmp(ifmt->name, last_name)>0){ name= ifmt->name; @@ -3373,7 +3435,7 @@ static void opt_show_formats(void) const char *type_str; p2=NULL; - while(p= av_codec_next(p)) { + while((p= av_codec_next(p))) { if((p2==NULL || strcmp(p->name, p2->name)<0) && strcmp(p->name, last_name)>0){ p2= p; @@ -3404,14 +3466,15 @@ static void opt_show_formats(void) break; } printf( - " %s%s%s%s%s%s %s", + " %s%s%s%s%s%s %-15s %s", decode ? "D": (/*p2->decoder ? "d":*/" "), encode ? "E":" ", type_str, cap & CODEC_CAP_DRAW_HORIZ_BAND ? "S":" ", cap & CODEC_CAP_DR1 ? "D":" ", cap & CODEC_CAP_TRUNCATED ? "T":" ", - p2->name); + p2->name, + p2->long_name ? p2->long_name : ""); /* if(p2->decoder && decode==0) printf(" use %s for decoding", p2->decoder->name);*/ printf("\n"); @@ -3419,12 +3482,12 @@ static void opt_show_formats(void) printf("\n"); printf("Bitstream filters:\n"); - while(bsf = av_bitstream_filter_next(bsf)) + while((bsf = av_bitstream_filter_next(bsf))) printf(" %s", bsf->name); printf("\n"); printf("Supported file protocols:\n"); - while(up = av_protocol_next(up)) + while((up = av_protocol_next(up))) printf(" %s:", up->name); printf("\n"); @@ -3436,7 +3499,6 @@ static void opt_show_formats(void) "even though both encoding and decoding are supported. For example, the h263\n" "decoder corresponds to the h263 and h263p encoders, for file formats it is even\n" "worse.\n"); - exit(0); } static void parse_matrix_coeffs(uint16_t *dest, const char *str) @@ -3450,7 +3512,7 @@ static void parse_matrix_coeffs(uint16_t *dest, const char *str) p = strchr(p, ','); if(!p) { fprintf(stderr, "Syntax error in matrix \"%s\" at coeff %d\n", str, i); - exit(1); + av_exit(1); } p++; } @@ -3511,12 +3573,6 @@ static void show_help(void) av_opt_show(sws_opts, NULL); } -static void opt_show_help(void) -{ - show_help(); - exit(0); -} - static void opt_target(const char *arg) { int norm = -1; @@ -3570,7 +3626,7 @@ static void opt_target(const char *arg) fprintf(stderr, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n"); fprintf(stderr, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n"); fprintf(stderr, "or set a framerate with \"-r xxx\".\n"); - exit(1); + av_exit(1); } if(!strcmp(arg, "vcd")) { @@ -3658,7 +3714,7 @@ static void opt_target(const char *arg) } else { fprintf(stderr, "Unknown target: %s\n", arg); - exit(1); + av_exit(1); } } @@ -3679,55 +3735,48 @@ static void opt_vstats (void) opt_vstats_file(filename); } -static void opt_bsf(const char *opt, const char *arg) +static int opt_bsf(const char *opt, const char *arg) { AVBitStreamFilterContext *bsfc= av_bitstream_filter_init(arg); //FIXME split name and args for filter at '=' AVBitStreamFilterContext **bsfp; if(!bsfc){ fprintf(stderr, "Unknown bitstream filter %s\n", arg); - exit(1); + av_exit(1); } - bsfp= *opt == 'v' ? &video_bitstream_filters : &audio_bitstream_filters; + bsfp= *opt == 'v' ? &video_bitstream_filters : + *opt == 'a' ? &audio_bitstream_filters : + &subtitle_bitstream_filters; while(*bsfp) bsfp= &(*bsfp)->next; *bsfp= bsfc; -} -static void opt_show_license(void) -{ - show_license(); - exit(0); -} - -static void opt_show_version(void) -{ - show_version(program_name); - exit(0); + return 0; } -const OptionDef options[] = { +static const OptionDef options[] = { /* main options */ - { "L", 0, {(void*)opt_show_license}, "show license" }, - { "h", 0, {(void*)opt_show_help}, "show help" }, - { "version", 0, {(void*)opt_show_version}, "show version" }, - { "formats", 0, {(void*)opt_show_formats}, "show available formats, codecs, protocols, ..." }, + { "L", OPT_EXIT, {(void*)show_license}, "show license" }, + { "h", OPT_EXIT, {(void*)show_help}, "show help" }, + { "version", OPT_EXIT, {(void*)show_version}, "show version" }, + { "formats", OPT_EXIT, {(void*)opt_show_formats}, "show available formats, codecs, protocols, ..." }, { "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" }, { "i", HAS_ARG, {(void*)opt_input_file}, "input file name", "filename" }, { "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" }, { "map", HAS_ARG | OPT_EXPERT, {(void*)opt_map}, "set input stream mapping", "file:stream[:syncfile:syncstream]" }, { "map_meta_data", HAS_ARG | OPT_EXPERT, {(void*)opt_map_meta_data}, "set meta data information of outfile from infile", "outfile:infile" }, - { "t", HAS_ARG, {(void*)opt_recording_time}, "record or transcode \"duration\" seconds of audio/video", "duration" }, + { "t", OPT_FUNC2 | 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" }, + { "ss", OPT_FUNC2 | HAS_ARG, {(void*)opt_start_time}, "set the start time offset", "time_off" }, + { "itsoffset", OPT_FUNC2 | HAS_ARG, {(void*)opt_input_ts_offset}, "set the input ts offset", "time_off" }, { "title", HAS_ARG | OPT_STRING, {(void*)&str_title}, "set the title", "string" }, - { "timestamp", HAS_ARG, {(void*)&opt_rec_timestamp}, "set the timestamp", "time" }, + { "timestamp", OPT_FUNC2 | HAS_ARG, {(void*)&opt_rec_timestamp}, "set the timestamp", "time" }, { "author", HAS_ARG | OPT_STRING, {(void*)&str_author}, "set the author", "string" }, { "copyright", HAS_ARG | OPT_STRING, {(void*)&str_copyright}, "set the copyright", "string" }, { "comment", HAS_ARG | OPT_STRING, {(void*)&str_comment}, "set the comment", "string" }, + { "genre", HAS_ARG | OPT_STRING, {(void*)&str_genre}, "set the genre", "string" }, { "album", HAS_ARG | OPT_STRING, {(void*)&str_album}, "set the album", "string" }, { "benchmark", OPT_BOOL | OPT_EXPERT, {(void*)&do_benchmark}, "add timings for benchmarking" }, @@ -3738,21 +3787,21 @@ const OptionDef options[] = { { "re", OPT_BOOL | OPT_EXPERT, {(void*)&rate_emu}, "read input at native frame rate", "" }, { "loop_input", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "loop (current only works with images)" }, { "loop_output", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&loop_output}, "number of times to loop output in formats that support looping (0 loops forever)", "" }, - { "v", HAS_ARG, {(void*)opt_verbose}, "control amount of logging", "verbose" }, + { "v", HAS_ARG | OPT_FUNC2, {(void*)opt_verbose}, "set the logging verbosity level", "number" }, { "target", HAS_ARG, {(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", "" }, - { "adrift_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&audio_drift_threshold}, "audio drift threshold", "" }, + { "adrift_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&audio_drift_threshold}, "audio drift threshold", "threshold" }, { "vglobal", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_global_header}, "video global header storage type", "" }, { "copyts", OPT_BOOL | OPT_EXPERT, {(void*)©_ts}, "copy timestamps" }, { "shortest", OPT_BOOL | OPT_EXPERT, {(void*)&opt_shortest}, "finish encoding within shortest input" }, // - { "dts_delta_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&dts_delta_threshold}, "timestamp discontinuity delta threshold", "" }, + { "dts_delta_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&dts_delta_threshold}, "timestamp discontinuity delta threshold", "threshold" }, { "programid", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&opt_programid}, "desired program number", "" }, /* video options */ - { "b", OPT_FUNC2 | HAS_ARG | OPT_VIDEO, {(void*)opt_bitrate}, "set bitrate (in bits/s)", "" }, - { "vb", OPT_FUNC2 | HAS_ARG | OPT_VIDEO, {(void*)opt_bitrate}, "set bitrate (in bits/s)", "" }, + { "b", OPT_FUNC2 | HAS_ARG | OPT_VIDEO, {(void*)opt_bitrate}, "set bitrate (in bits/s)", "bitrate" }, + { "vb", OPT_FUNC2 | HAS_ARG | OPT_VIDEO, {(void*)opt_bitrate}, "set bitrate (in bits/s)", "bitrate" }, { "vframes", OPT_INT | HAS_ARG | OPT_VIDEO, {(void*)&max_frames[CODEC_TYPE_VIDEO]}, "set the number of video frames to record", "number" }, { "dframes", OPT_INT | HAS_ARG, {(void*)&max_frames[CODEC_TYPE_DATA]}, "set the number of data frames to record", "number" }, { "r", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_rate}, "set frame rate (Hz value, fraction or abbreviation)", "rate" }, @@ -3775,7 +3824,7 @@ const OptionDef options[] = { { "qdiff", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qdiff}, "max difference between the quantizer scale (VBR)", "q" }, { "rc_override", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_override_string}, "rate control override for specific intervals", "override" }, { "vcodec", HAS_ARG | OPT_VIDEO, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" }, - { "me_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_threshold}, "motion estimaton threshold", "" }, + { "me_threshold", HAS_ARG | OPT_FUNC2 | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_threshold}, "motion estimaton threshold", "threshold" }, { "strict", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_strict}, "how strictly to follow the standards", "strictness" }, { "sameq", OPT_BOOL | OPT_VIDEO, {(void*)&same_quality}, "use same video quality as source (implies VBR)" }, @@ -3798,11 +3847,11 @@ const OptionDef options[] = { { "qphist", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&qp_hist }, "show QP histogram" }, /* audio options */ - { "ab", OPT_FUNC2 | HAS_ARG | OPT_AUDIO, {(void*)opt_bitrate}, "set bitrate (in bits/s)", "" }, + { "ab", OPT_FUNC2 | HAS_ARG | OPT_AUDIO, {(void*)opt_bitrate}, "set bitrate (in bits/s)", "bitrate" }, { "aframes", OPT_INT | HAS_ARG | OPT_AUDIO, {(void*)&max_frames[CODEC_TYPE_AUDIO]}, "set the number of audio frames to record", "number" }, { "aq", OPT_FLOAT | HAS_ARG | OPT_AUDIO, {(void*)&audio_qscale}, "set audio quality (codec-specific)", "quality", }, - { "ar", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_rate}, "set audio sampling rate (in Hz)", "rate" }, - { "ac", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_channels}, "set number of audio channels", "channels" }, + { "ar", HAS_ARG | OPT_FUNC2 | OPT_AUDIO, {(void*)opt_audio_rate}, "set audio sampling rate (in Hz)", "rate" }, + { "ac", HAS_ARG | OPT_FUNC2 | OPT_AUDIO, {(void*)opt_audio_channels}, "set number of audio channels", "channels" }, { "an", OPT_BOOL | OPT_AUDIO, {(void*)&audio_disable}, "disable audio" }, { "acodec", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_codec}, "force audio codec ('copy' to copy stream)", "codec" }, { "atag", HAS_ARG | OPT_EXPERT | OPT_AUDIO, {(void*)opt_audio_tag}, "force audio tag/fourcc", "fourcc/tag" }, @@ -3827,64 +3876,12 @@ const OptionDef options[] = { { "absf", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_EXPERT, {(void*)opt_bsf}, "", "bitstream filter" }, { "vbsf", OPT_FUNC2 | HAS_ARG | OPT_VIDEO | OPT_EXPERT, {(void*)opt_bsf}, "", "bitstream filter" }, + { "sbsf", OPT_FUNC2 | HAS_ARG | OPT_SUBTITLE | OPT_EXPERT, {(void*)opt_bsf}, "", "bitstream filter" }, { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; -static int av_exit() -{ - int i; - - /* close files */ - for(i=0;ioformat->flags & AVFMT_NOFILE)) - url_fclose(s->pb); - for(j=0;jnb_streams;j++) { - av_free(s->streams[j]->codec); - av_free(s->streams[j]); - } - av_free(s); - } - for(i=0;i