X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=2974edd1770c8b56df082b011e00e538af470867;hb=e4637d6a60af0c414f8953826a51d77e5aee508f;hp=1c734c3f846da65b5f23c102eae1c0b651a7ce39;hpb=aa9b754ffcaf03910ca95735325ec116c137c7bd;p=ffmpeg diff --git a/ffmpeg.c b/ffmpeg.c index 1c734c3f846..2974edd1770 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -91,6 +91,7 @@ static const OptionDef options[]; #define MAX_FILES 20 +static const char *last_asked_format = NULL; static AVFormatContext *input_files[MAX_FILES]; static int64_t input_files_ts_offset[MAX_FILES]; static double input_files_ts_scale[MAX_FILES][MAX_STREAMS]; @@ -109,8 +110,6 @@ static int nb_stream_maps; static AVMetaDataMap meta_data_maps[MAX_FILES]; static int nb_meta_data_maps; -static AVInputFormat *file_iformat; -static AVOutputFormat *file_oformat; static int frame_width = 0; static int frame_height = 0; static float frame_aspect_ratio = 0; @@ -130,11 +129,6 @@ static AVRational frame_rate; static float video_qscale = 0; static uint16_t *intra_matrix = NULL; static uint16_t *inter_matrix = NULL; -#if 0 //experimental, (can be removed) -static float video_rc_qsquish=1.0; -static float video_rc_qmod_amp=0; -static int video_rc_qmod_freq=0; -#endif static const char *video_rc_override_string=NULL; static int video_disable = 0; static int video_discard = 0; @@ -225,7 +219,7 @@ static int64_t timer_start; static uint8_t *audio_buf; static uint8_t *audio_out; -static uint8_t *audio_out2; +unsigned int allocated_audio_out_size, allocated_audio_buf_size; static short *samples; @@ -255,13 +249,29 @@ typedef struct AVOutputStream { AVFrame pict_tmp; /* temporary image for resampling */ struct SwsContext *img_resample_ctx; /* for image resampling */ int resample_height; + int resample_width; + int resample_pix_fmt; + + /* full frame size of first frame */ + int original_height; + int original_width; + /* cropping area sizes */ int video_crop; - int topBand; /* cropping area sizes */ + int topBand; + int bottomBand; int leftBand; + int rightBand; + + /* cropping area of first frame */ + int original_topBand; + int original_bottomBand; + int original_leftBand; + int original_rightBand; + /* padding area sizes */ int video_pad; - int padtop; /* padding area sizes */ + int padtop; int padbottom; int padleft; int padright; @@ -310,7 +320,7 @@ static void term_exit(void) #endif } -static volatile sig_atomic_t received_sigterm = 0; +static volatile int received_sigterm = 0; static void sigterm_handler(int sig) @@ -440,7 +450,7 @@ static int av_exit(int ret) av_free(sws_opts); av_free(audio_buf); av_free(audio_out); - av_free(audio_out2); + allocated_audio_buf_size= allocated_audio_out_size= 0; av_free(samples); if (received_sigterm) { @@ -472,6 +482,10 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename) st = av_mallocz(sizeof(AVStream)); memcpy(st, ic->streams[i], sizeof(AVStream)); st->codec = avcodec_alloc_context(); + if (!st->codec) { + print_error(filename, AVERROR(ENOMEM)); + av_exit(1); + } memcpy(st->codec, ic->streams[i]->codec, sizeof(AVCodecContext)); s->streams[i] = st; @@ -543,21 +557,36 @@ static void do_audio_out(AVFormatContext *s, unsigned char *buf, int size) { uint8_t *buftmp; - const int audio_out_size= 4*MAX_AUDIO_PACKET_SIZE; + int64_t audio_out_size, audio_buf_size; int size_out, frame_bytes, ret; AVCodecContext *enc= ost->st->codec; AVCodecContext *dec= ist->st->codec; int osize= av_get_bits_per_sample_format(enc->sample_fmt)/8; int isize= av_get_bits_per_sample_format(dec->sample_fmt)/8; + const int coded_bps = av_get_bits_per_sample(enc->codec->id); - /* 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 ! */ + audio_buf_size= (size + isize*dec->channels - 1) / (isize*dec->channels); + audio_buf_size= (audio_buf_size*enc->sample_rate + dec->sample_rate) / dec->sample_rate; + audio_buf_size= audio_buf_size*2 + 10000; //saftey factors for the deprecated resampling API + audio_buf_size*= osize*enc->channels; + + audio_out_size= FFMAX(audio_buf_size, enc->frame_size * osize * enc->channels); + if(coded_bps > 8*osize) + audio_out_size= audio_out_size * coded_bps / (8*osize); + audio_out_size += FF_MIN_BUFFER_SIZE; + + if(audio_out_size > INT_MAX || audio_buf_size > INT_MAX){ + fprintf(stderr, "Buffer sizes too large\n"); + av_exit(1); + } + + av_fast_malloc(&audio_buf, &allocated_audio_buf_size, audio_buf_size); + av_fast_malloc(&audio_out, &allocated_audio_out_size, audio_out_size); + if (!audio_buf || !audio_out){ + fprintf(stderr, "Out of memory in do_audio_out\n"); + av_exit(1); + } if (enc->channels != dec->channels) ost->audio_resample = 1; @@ -580,10 +609,6 @@ static void do_audio_out(AVFormatContext *s, #define MAKE_SFMT_PAIR(a,b) ((a)+SAMPLE_FMT_NB*(b)) if (!ost->audio_resample && dec->sample_fmt!=enc->sample_fmt && MAKE_SFMT_PAIR(enc->sample_fmt,dec->sample_fmt)!=ost->reformat_pair) { - if (!audio_out2) - audio_out2 = av_malloc(audio_out_size); - if (!audio_out2) - av_exit(1); if (ost->reformat_ctx) av_audio_convert_free(ost->reformat_ctx); ost->reformat_ctx = av_audio_convert_alloc(enc->sample_fmt, 1, @@ -657,7 +682,7 @@ static void do_audio_out(AVFormatContext *s, if (!ost->audio_resample && dec->sample_fmt!=enc->sample_fmt) { const void *ibuf[6]= {buftmp}; - void *obuf[6]= {audio_out2}; + void *obuf[6]= {audio_buf}; int istride[6]= {isize}; int ostride[6]= {osize}; int len= size_out/istride[0]; @@ -667,7 +692,7 @@ static void do_audio_out(AVFormatContext *s, av_exit(1); return; } - buftmp = audio_out2; + buftmp = audio_buf; size_out = len*osize; } @@ -709,7 +734,6 @@ static void do_audio_out(AVFormatContext *s, } } else { AVPacket pkt; - int coded_bps = av_get_bits_per_sample(enc->codec->id)/8; av_init_packet(&pkt); ost->sync_opts += size_out / (osize * enc->channels); @@ -718,7 +742,12 @@ static void do_audio_out(AVFormatContext *s, /* determine the size of the coded buffer */ size_out /= osize; if (coded_bps) - size_out *= coded_bps; + size_out = size_out*coded_bps/8; + + if(size_out > audio_out_size){ + fprintf(stderr, "Internal error, buffer size too small\n"); + av_exit(1); + } //FIXME pass ost->sync_opts as AVFrame.pts in avcodec_encode_audio() ret = avcodec_encode_audio(enc, audio_out, size_out, @@ -787,7 +816,7 @@ static void do_subtitle_out(AVFormatContext *s, int64_t pts) { static uint8_t *subtitle_out = NULL; - int subtitle_out_max_size = 65536; + int subtitle_out_max_size = 1024 * 1024; int subtitle_out_size, nb, i; AVCodecContext *enc; AVPacket pkt; @@ -814,14 +843,23 @@ static void do_subtitle_out(AVFormatContext *s, nb = 1; for(i = 0; i < nb; i++) { + sub->pts = av_rescale_q(pts, ist->st->time_base, AV_TIME_BASE_Q); + // start_display_time is required to be 0 + sub->pts += av_rescale_q(sub->start_display_time, (AVRational){1, 1000}, AV_TIME_BASE_Q); + sub->end_display_time -= sub->start_display_time; + sub->start_display_time = 0; subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out, subtitle_out_max_size, sub); + if (subtitle_out_size < 0) { + fprintf(stderr, "Subtitle encoding failed\n"); + av_exit(1); + } av_init_packet(&pkt); pkt.stream_index = ost->index; pkt.data = subtitle_out; pkt.size = subtitle_out_size; - pkt.pts = av_rescale_q(pts, ist->st->time_base, ost->st->time_base); + pkt.pts = av_rescale_q(sub->pts, AV_TIME_BASE_Q, ost->st->time_base); if (enc->codec_id == CODEC_ID_DVB_SUBTITLE) { /* XXX: the pts correction is handled here. Maybe handling it in the codec would be better */ @@ -844,6 +882,7 @@ static void do_video_out(AVFormatContext *s, int *frame_size) { int nb_frames, i, ret; + int64_t topBand, bottomBand, leftBand, rightBand; AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src; AVFrame picture_crop_temp, picture_pad_temp; AVCodecContext *enc, *dec; @@ -859,7 +898,7 @@ static void do_video_out(AVFormatContext *s, *frame_size = 0; - if(video_sync_method>0 || (video_sync_method && av_q2d(enc->time_base) > 0.001)){ + if(video_sync_method){ double vdelta; vdelta = get_sync_ipts(ost) / av_q2d(enc->time_base) - ost->sync_opts; //FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c @@ -917,9 +956,59 @@ static void do_video_out(AVFormatContext *s, } } + if( (ost->resample_height != (ist->st->codec->height - (ost->topBand + ost->bottomBand))) + || (ost->resample_width != (ist->st->codec->width - (ost->leftBand + ost->rightBand))) + || (ost->resample_pix_fmt!= ist->st->codec->pix_fmt) ) { + + fprintf(stderr,"Input Stream #%d.%d frame size changed to %dx%d, %s\n", ist->file_index, ist->index, ist->st->codec->width, ist->st->codec->height,avcodec_get_pix_fmt_name(ist->st->codec->pix_fmt)); + if(!ost->video_resample) + av_exit(1); + } + if (ost->video_resample) { padding_src = NULL; final_picture = &ost->pict_tmp; + if( (ost->resample_height != (ist->st->codec->height - (ost->topBand + ost->bottomBand))) + || (ost->resample_width != (ist->st->codec->width - (ost->leftBand + ost->rightBand))) + || (ost->resample_pix_fmt!= ist->st->codec->pix_fmt) ) { + + /* keep bands proportional to the frame size */ + topBand = ((int64_t)ist->st->codec->height * ost->original_topBand / ost->original_height) & ~1; + bottomBand = ((int64_t)ist->st->codec->height * ost->original_bottomBand / ost->original_height) & ~1; + leftBand = ((int64_t)ist->st->codec->width * ost->original_leftBand / ost->original_width) & ~1; + rightBand = ((int64_t)ist->st->codec->width * ost->original_rightBand / ost->original_width) & ~1; + + /* sanity check to ensure no bad band sizes sneak in */ + assert(topBand <= INT_MAX && topBand >= 0); + assert(bottomBand <= INT_MAX && bottomBand >= 0); + assert(leftBand <= INT_MAX && leftBand >= 0); + assert(rightBand <= INT_MAX && rightBand >= 0); + + ost->topBand = topBand; + ost->bottomBand = bottomBand; + ost->leftBand = leftBand; + ost->rightBand = rightBand; + + ost->resample_height = ist->st->codec->height - (ost->topBand + ost->bottomBand); + ost->resample_width = ist->st->codec->width - (ost->leftBand + ost->rightBand); + ost->resample_pix_fmt= ist->st->codec->pix_fmt; + + /* initialize a new scaler context */ + sws_freeContext(ost->img_resample_ctx); + sws_flags = av_get_int(sws_opts, "sws_flags", NULL); + ost->img_resample_ctx = sws_getContext( + ist->st->codec->width - (ost->leftBand + ost->rightBand), + ist->st->codec->height - (ost->topBand + ost->bottomBand), + ist->st->codec->pix_fmt, + ost->st->codec->width - (ost->padleft + ost->padright), + ost->st->codec->height - (ost->padtop + ost->padbottom), + ost->st->codec->pix_fmt, + sws_flags, NULL, NULL, NULL); + if (ost->img_resample_ctx == NULL) { + fprintf(stderr, "Cannot get resampling context\n"); + av_exit(1); + } + } sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize, 0, ost->resample_height, resampling_dst->data, resampling_dst->linesize); } @@ -1190,6 +1279,7 @@ static int output_packet(AVInputStream *ist, int ist_index, AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; AVPacket avpkt; + int bps = av_get_bits_per_sample_format(ist->st->codec->sample_fmt)>>3; if(ist->next_pts == AV_NOPTS_VALUE) ist->next_pts= ist->pts; @@ -1212,7 +1302,8 @@ static int output_packet(AVInputStream *ist, int ist_index, handle_eof: ist->pts= ist->next_pts; - if(avpkt.size && avpkt.size != pkt->size && verbose>0) + if(avpkt.size && avpkt.size != pkt->size && + !(ist->st->codec->codec->capabilities & CODEC_CAP_SUBFRAMES) && verbose>0) fprintf(stderr, "Multiple frames in a packet from stream %d\n", pkt->stream_index); /* decode the packet if needed */ @@ -1243,7 +1334,7 @@ static int output_packet(AVInputStream *ist, int ist_index, continue; } data_buf = (uint8_t *)samples; - ist->next_pts += ((int64_t)AV_TIME_BASE/2 * data_size) / + ist->next_pts += ((int64_t)AV_TIME_BASE/bps * data_size) / (ist->st->codec->sample_rate * ist->st->codec->channels); break;} case CODEC_TYPE_VIDEO: @@ -1341,12 +1432,6 @@ static int output_packet(AVInputStream *ist, int ist_index, if (ost->source_index == ist_index) { os = output_files[ost->file_index]; -#if 0 - printf("%d: got pts=%0.3f %0.3f\n", i, - (double)pkt->pts / AV_TIME_BASE, - ((double)ist->pts / AV_TIME_BASE) - - ((double)ost->st->pts.val * ost->st->time_base.num / ost->st->time_base.den)); -#endif /* set the input output pts pairs */ //ost->sync_ipts = (double)(ist->pts + input_files_ts_offset[ist->file_index] - start_time)/ AV_TIME_BASE; @@ -1407,8 +1492,13 @@ static int output_packet(AVInputStream *ist, int ist_index, opkt.flags= pkt->flags; //FIXME remove the following 2 lines they shall be replaced by the bitstream filters + if(ost->st->codec->codec_id != CODEC_ID_H264) { 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; + } else { + opkt.data = data_buf; + opkt.size = data_size; + } write_frame(os, &opkt, ost->st->codec, bitstream_filters[ost->file_index][opkt.stream_index]); ost->st->codec->frame_number++; @@ -1818,6 +1908,10 @@ static int av_encode(AVFormatContext **output_files, ost->encoding_needed = 1; break; case CODEC_TYPE_VIDEO: + if (ost->st->codec->pix_fmt == PIX_FMT_NONE) { + fprintf(stderr, "Video pixel format is unknown, stream cannot be decoded\n"); + av_exit(1); + } ost->video_crop = ((frame_leftBand + frame_rightBand + frame_topBand + frame_bottomBand) != 0); ost->video_pad = ((frame_padleft + frame_padright + frame_padtop + frame_padbottom) != 0); ost->video_resample = ((codec->width != icodec->width - @@ -1828,8 +1922,10 @@ static int av_encode(AVFormatContext **output_files, (frame_padtop + frame_padbottom)) || (codec->pix_fmt != icodec->pix_fmt)); if (ost->video_crop) { - ost->topBand = frame_topBand; - ost->leftBand = frame_leftBand; + ost->topBand = ost->original_topBand = frame_topBand; + ost->bottomBand = ost->original_bottomBand = frame_bottomBand; + ost->leftBand = ost->original_leftBand = frame_leftBand; + ost->rightBand = ost->original_rightBand = frame_rightBand; } if (ost->video_pad) { ost->padtop = frame_padtop; @@ -1863,9 +1959,15 @@ static int av_encode(AVFormatContext **output_files, fprintf(stderr, "Cannot get resampling context\n"); av_exit(1); } - ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand); + + ost->original_height = icodec->height; + ost->original_width = icodec->width; + codec->bits_per_raw_sample= 0; } + ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand); + ost->resample_width = icodec->width - (frame_leftBand + frame_rightBand); + ost->resample_pix_fmt= icodec->pix_fmt; ost->encoding_needed = 1; ist->decoding_needed = 1; break; @@ -1926,6 +2028,8 @@ static int av_encode(AVFormatContext **output_files, if (!bit_buffer) bit_buffer = av_malloc(bit_buffer_size); if (!bit_buffer) { + fprintf(stderr, "Cannot allocate %d bytes output buffer\n", + bit_buffer_size); ret = AVERROR(ENOMEM); goto fail; } @@ -1938,13 +2042,13 @@ static int av_encode(AVFormatContext **output_files, if (!codec) codec = avcodec_find_encoder(ost->st->codec->codec_id); if (!codec) { - snprintf(error, sizeof(error), "Unsupported codec for output stream #%d.%d", - ost->file_index, ost->index); + snprintf(error, sizeof(error), "Encoder (codec id %d) not found for output stream #%d.%d", + ost->st->codec->codec_id, ost->file_index, ost->index); ret = AVERROR(EINVAL); goto dump_format; } if (avcodec_open(ost->st->codec, codec) < 0) { - snprintf(error, sizeof(error), "Error while opening codec for output stream #%d.%d - maybe incorrect parameters such as bit_rate, rate, width or height", + snprintf(error, sizeof(error), "Error while opening encoder for output stream #%d.%d - maybe incorrect parameters such as bit_rate, rate, width or height", ost->file_index, ost->index); ret = AVERROR(EINVAL); goto dump_format; @@ -1961,13 +2065,13 @@ static int av_encode(AVFormatContext **output_files, if (!codec) codec = avcodec_find_decoder(ist->st->codec->codec_id); if (!codec) { - snprintf(error, sizeof(error), "Unsupported codec (id=%d) for input stream #%d.%d", + snprintf(error, sizeof(error), "Decoder (codec id %d) not found for input stream #%d.%d", ist->st->codec->codec_id, ist->file_index, ist->index); ret = AVERROR(EINVAL); goto dump_format; } if (avcodec_open(ist->st->codec, codec) < 0) { - snprintf(error, sizeof(error), "Error while opening codec for input stream #%d.%d", + snprintf(error, sizeof(error), "Error while opening decoder for input stream #%d.%d", ist->file_index, ist->index); ret = AVERROR(EINVAL); goto dump_format; @@ -2292,28 +2396,6 @@ static int av_encode(AVFormatContext **output_files, return ret; } -#if 0 -int file_read(const char *filename) -{ - URLContext *h; - unsigned char buffer[1024]; - int len, i; - - if (url_open(&h, filename, O_RDONLY) < 0) { - printf("could not open '%s'\n", filename); - return -1; - } - for(;;) { - len = url_read(h, buffer, sizeof(buffer)); - if (len <= 0) - break; - for(i=0;iprealloced_context = 1; @@ -2883,7 +2949,11 @@ static void opt_input_file(const char *filename) frame_pix_fmt = enc->pix_fmt; rfps = ic->streams[i]->r_frame_rate.num; rfps_base = ic->streams[i]->r_frame_rate.den; - if(enc->lowres) enc->flags |= CODEC_FLAG_EMU_EDGE; + if(enc->lowres) { + enc->flags |= CODEC_FLAG_EMU_EDGE; + frame_height >>= enc->lowres; + frame_width >>= enc->lowres; + } if(me_threshold) enc->debug |= FF_DEBUG_MV; @@ -2928,8 +2998,6 @@ static void opt_input_file(const char *filename) dump_format(ic, nb_input_files, filename, 0); nb_input_files++; - file_iformat = NULL; - file_oformat = NULL; video_channel = 0; @@ -2979,7 +3047,7 @@ static void new_video_stream(AVFormatContext *oc) { AVStream *st; AVCodecContext *video_enc; - int codec_id; + enum CodecID codec_id; st = av_new_stream(oc, oc->nb_streams); if (!st) { @@ -3121,7 +3189,7 @@ static void new_audio_stream(AVFormatContext *oc) { AVStream *st; AVCodecContext *audio_enc; - int codec_id; + enum CodecID codec_id; st = av_new_stream(oc, oc->nb_streams); if (!st) { @@ -3280,13 +3348,25 @@ static void opt_output_file(const char *filename) int use_video, use_audio, use_subtitle; int input_has_video, input_has_audio, input_has_subtitle; AVFormatParameters params, *ap = ¶ms; + AVOutputFormat *file_oformat; if (!strcmp(filename, "-")) filename = "pipe:"; oc = avformat_alloc_context(); + if (!oc) { + print_error(filename, AVERROR(ENOMEM)); + av_exit(1); + } - if (!file_oformat) { + if (last_asked_format) { + file_oformat = guess_format(last_asked_format, NULL, NULL); + if (!file_oformat) { + fprintf(stderr, "Requested output format '%s' is not a suitable output format\n", last_asked_format); + av_exit(1); + } + last_asked_format = NULL; + } else { file_oformat = guess_format(NULL, filename, NULL); if (!file_oformat) { fprintf(stderr, "Unable to find a suitable output format for '%s'\n", @@ -3409,10 +3489,6 @@ static void opt_output_file(const char *filename) oc->flags |= AVFMT_FLAG_NONBLOCK; set_context_opts(oc, avformat_opts, AV_OPT_FLAG_ENCODING_PARAM); - - /* reset some options */ - file_oformat = NULL; - file_iformat = NULL; } /* same option as mencoder */ @@ -3584,7 +3660,7 @@ static void opt_target(const char *arg) opt_frame_size(norm ? "352x240" : "352x288"); opt_frame_rate(NULL, frame_rates[norm]); - opt_default("gop", norm ? "18" : "15"); + opt_default("g", norm ? "18" : "15"); opt_default("b", "1150000"); opt_default("maxrate", "1150000"); @@ -3612,7 +3688,7 @@ static void opt_target(const char *arg) opt_frame_size(norm ? "480x480" : "480x576"); opt_frame_rate(NULL, frame_rates[norm]); - opt_default("gop", norm ? "18" : "15"); + opt_default("g", norm ? "18" : "15"); opt_default("b", "2040000"); opt_default("maxrate", "2516000"); @@ -3634,7 +3710,7 @@ static void opt_target(const char *arg) opt_frame_size(norm ? "720x480" : "720x576"); opt_frame_rate(NULL, frame_rates[norm]); - opt_default("gop", norm ? "18" : "15"); + opt_default("g", norm ? "18" : "15"); opt_default("b", "6000000"); opt_default("maxrate", "9000000"); @@ -3712,19 +3788,19 @@ static int opt_preset(const char *opt, const char *arg) FFMPEG_DATADIR, }; - for(i=!base[0]; i<2 && !f; i++){ - snprintf(filename, sizeof(filename), "%s%s/%s.ffpreset", base[i], i ? "" : "/.ffmpeg", arg); - f= fopen(filename, "r"); - if(!f){ - char *codec_name= *opt == 'v' ? video_codec_name : - *opt == 'a' ? audio_codec_name : - subtitle_codec_name; - snprintf(filename, sizeof(filename), "%s%s/%s-%s.ffpreset", base[i], i ? "" : "/.ffmpeg", codec_name, arg); + if (*opt != 'f') { + for(i=!base[0]; i<2 && !f; i++){ + snprintf(filename, sizeof(filename), "%s%s/%s.ffpreset", base[i], i ? "" : "/.ffmpeg", arg); f= fopen(filename, "r"); + if(!f){ + char *codec_name= *opt == 'v' ? video_codec_name : + *opt == 'a' ? audio_codec_name : + subtitle_codec_name; + snprintf(filename, sizeof(filename), "%s%s/%s-%s.ffpreset", base[i], i ? "" : "/.ffmpeg", codec_name, arg); + f= fopen(filename, "r"); + } } - } - if(!f && ((arg[0]=='.' && arg[1]=='/') || arg[0]=='/' || - is_dos_path(arg))){ + } else { av_strlcpy(filename, arg, sizeof(filename)); f= fopen(filename, "r"); } @@ -3762,10 +3838,7 @@ static int opt_preset(const char *opt, const char *arg) static const OptionDef options[] = { /* main options */ - { "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*)show_formats}, "show available formats, codecs, protocols, ..." }, +#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" }, { "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" }, @@ -3789,7 +3862,6 @@ static const OptionDef options[] = { { "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 | OPT_FUNC2, {(void*)opt_verbose}, "set ffmpeg verbosity level", "number" }, - { "loglevel", HAS_ARG | OPT_FUNC2, {(void*)opt_loglevel}, "set libav* logging level", "number" }, { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" }, { "threads", OPT_FUNC2 | 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", "" }, @@ -3882,6 +3954,7 @@ static const OptionDef options[] = { { "apre", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_EXPERT, {(void*)opt_preset}, "set the audio options to the indicated preset", "preset" }, { "vpre", OPT_FUNC2 | HAS_ARG | OPT_VIDEO | OPT_EXPERT, {(void*)opt_preset}, "set the video options to the indicated preset", "preset" }, { "spre", OPT_FUNC2 | HAS_ARG | OPT_SUBTITLE | OPT_EXPERT, {(void*)opt_preset}, "set the subtitle options to the indicated preset", "preset" }, + { "fpre", OPT_FUNC2 | HAS_ARG | OPT_EXPERT, {(void*)opt_preset}, "set options from indicated preset file", "filename" }, { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, @@ -3896,8 +3969,10 @@ int main(int argc, char **argv) avdevice_register_all(); av_register_all(); +#if HAVE_ISATTY if(isatty(STDIN_FILENO)) url_set_interrupt_cb(decode_interrupt_cb); +#endif for(i=0; i