X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=3b2814a688dd80fd9bacbfd3279f6bb011da8707;hb=1855abe556d5000079bbbac58d13f5b5c1b42d4d;hp=e7fcf87a5e0f514e3e9c1abf26a0d5ab6ade7b0e;hpb=9a3fb64000d0ce0e7666f1c4942a9aca1eb2bfdf;p=ffmpeg diff --git a/ffmpeg.c b/ffmpeg.c index e7fcf87a5e0..3b2814a688d 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -28,11 +28,13 @@ #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 @@ -82,10 +84,6 @@ typedef struct AVMetaDataMap { extern const OptionDef options[]; -static void show_help(void); -static void opt_show_license(void); -static int opt_default(const char *opt, const char *arg); - #define MAX_FILES 20 static AVFormatContext *input_files[MAX_FILES]; @@ -117,7 +115,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; @@ -127,8 +125,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 char *video_rc_eq="tex^qComp"; +static const char *video_rc_override_string=NULL; static int video_disable = 0; static int video_discard = 0; static char *video_codec_name = NULL; @@ -169,6 +166,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; @@ -187,6 +185,7 @@ static int opt_shortest = 0; // static int video_global_header = 0; static char *vstats_filename; static FILE *vstats_file; +static int opt_programid = 0; static int rate_emu = 0; @@ -222,6 +221,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" @@ -408,22 +408,33 @@ get_sync_ipts(const AVOutputStream *ost) } static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext *avctx, AVBitStreamFilterContext *bsfc){ + int ret; + while(bsfc){ AVPacket new_pkt= *pkt; int a= av_bitstream_filter_filter(bsfc, avctx, NULL, &new_pkt.data, &new_pkt.size, pkt->data, 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; bsfc= bsfc->next; } - av_interleaved_write_frame(s, pkt); + ret= av_interleaved_write_frame(s, pkt); + if(ret < 0){ + print_error("av_interleaved_write_frame()", ret); + exit(1); + } } #define MAX_AUDIO_PACKET_SIZE (128 * 1024) @@ -440,6 +451,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) @@ -449,6 +461,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); + 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); @@ -777,10 +803,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; @@ -917,9 +941,9 @@ static void print_report(AVFormatContext **output_files, oc = output_files[0]; - total_size = url_fsize(&oc->pb); + total_size = url_fsize(oc->pb); if(total_size<0) // FIXME improve url_fsize() so it works with non seekable output too - total_size= url_ftell(&oc->pb); + total_size= url_ftell(oc->pb); buf[0] = '\0'; ti1 = 1e10; @@ -930,7 +954,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; @@ -938,7 +963,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){ @@ -1113,7 +1139,7 @@ static int output_packet(AVInputStream *ist, int ist_index, switch(ist->st->codec->codec_type) { case CODEC_TYPE_AUDIO: ist->next_pts += ((int64_t)AV_TIME_BASE * ist->st->codec->frame_size) / - (ist->st->codec->sample_rate * ist->st->codec->channels); + ist->st->codec->sample_rate; break; case CODEC_TYPE_VIDEO: if (ist->st->codec->time_base.num != 0) { @@ -1249,7 +1275,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); @@ -1350,6 +1376,32 @@ static void print_sdp(AVFormatContext **avc, int n) printf("SDP:\n%s\n", sdp); } +static int stream_index_from_inputs(AVFormatContext **input_files, + int nb_input_files, + AVInputFile *file_table, + AVInputStream **ist_table, + enum CodecType type, + int programid) +{ + int p, q, z; + for(z=0; znb_programs; p++) { + AVProgram *program = ic->programs[p]; + if(program->id != programid) + continue; + for(q=0; qnb_stream_indexes; q++) { + int sidx = program->stream_index[q]; + int ris = file_table[z].ist_index + sidx; + if(ist_table[ris]->discard && ic->streams[sidx]->codec->codec_type == type) + return ris; + } + } + } + + return -1; +} + /* * The following code is the main loop of the file converter */ @@ -1368,7 +1420,7 @@ static int av_encode(AVFormatContext **output_files, int key; int want_sdp = 1; - file_table= (AVInputFile*) av_mallocz(nb_input_files * sizeof(AVInputFile)); + file_table= av_mallocz(nb_input_files * sizeof(AVInputFile)); if (!file_table) goto fail; @@ -1476,25 +1528,36 @@ static int av_encode(AVFormatContext **output_files, } } else { - /* get corresponding input stream index : we select the first one with the right type */ - found = 0; - for(j=0;jdiscard && - ist->st->codec->codec_type == ost->st->codec->codec_type) { + if(opt_programid) { + found = 0; + j = stream_index_from_inputs(input_files, nb_input_files, file_table, ist_table, ost->st->codec->codec_type, opt_programid); + if(j != -1) { ost->source_index = j; found = 1; - break; } - } - - if (!found) { - /* try again and reuse existing stream */ + } else { + /* get corresponding input stream index : we select the first one with the right type */ + found = 0; for(j=0;jst->codec->codec_type == ost->st->codec->codec_type) { + if (ist->discard && + ist->st->codec->codec_type == ost->st->codec->codec_type) { ost->source_index = j; found = 1; + break; + } + } + } + + if (!found) { + if(! opt_programid) { + /* try again and reuse existing stream */ + for(j=0;jst->codec->codec_type == ost->st->codec->codec_type) { + ost->source_index = j; + found = 1; + } } } if (!found) { @@ -1573,38 +1636,8 @@ static int av_encode(AVFormatContext **output_files, case CODEC_TYPE_AUDIO: if (av_fifo_init(&ost->fifo, 2 * MAX_AUDIO_PACKET_SIZE)) 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; @@ -1908,7 +1941,7 @@ static int av_encode(AVFormatContext **output_files, break; /* finish if limit size exhausted */ - if (limit_filesize != 0 && limit_filesize < url_ftell(&output_files[0]->pb)) + if (limit_filesize != 0 && limit_filesize < url_ftell(output_files[0]->pb)) break; /* read a frame from it and output it in the fifo */ @@ -2033,7 +2066,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); } @@ -2086,12 +2119,53 @@ static void opt_format(const char *arg) } } -static void opt_video_rc_eq(char *arg) -{ - video_rc_eq = arg; +#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; + const AVOption *o= NULL; + int opt_types[]={AV_OPT_FLAG_VIDEO_PARAM, AV_OPT_FLAG_AUDIO_PARAM, 0, AV_OPT_FLAG_SUBTITLE_PARAM, 0}; + + for(type=0; typename; + +#if defined(CONFIG_FFM_DEMUXER) || defined(CONFIG_FFM_MUXER) + /* disable generate of real time pts in ffm (need to be supressed anyway) */ + if(avctx_opts[0]->flags & CODEC_FLAG_BITEXACT) + ffm_nopts = 1; +#endif + + if(avctx_opts[0]->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; } @@ -2104,7 +2178,7 @@ static void opt_me_threshold(const char *arg) static void opt_verbose(const char *arg) { verbose = atoi(arg); - av_log_level = atoi(arg); + av_log_set_level(atoi(arg)); } static void opt_frame_rate(const char *arg) @@ -2115,6 +2189,18 @@ static void opt_frame_rate(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; + + opt_default(opt, 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) { frame_topBand = atoi(arg); @@ -2579,17 +2665,29 @@ static void opt_input_file(const char *filename) ap->video_codec_id= CODEC_ID_PGMYUV; for(i=0; iflags&AV_OPT_FLAG_DECODING_PARAM)) - av_set_double(ic, opt_names[i], d); + const char *str= av_get_string(avformat_opts, opt_names[i], &opt, buf, sizeof(buf)); + 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); } + if(opt_programid) { + int i; + for(i=0; inb_programs; i++) + if(ic->programs[i]->id != opt_programid) + ic->programs[i]->discard = AVDISCARD_ALL; + } ic->loop_input = loop_input; @@ -2627,10 +2725,11 @@ static void opt_input_file(const char *filename) switch(enc->codec_type) { case CODEC_TYPE_AUDIO: for(j=0; jflags&AV_OPT_FLAG_AUDIO_PARAM) && (opt->flags&AV_OPT_FLAG_DECODING_PARAM)) - av_set_double(enc, opt_names[j], d); + const char *str= av_get_string(avctx_opts[CODEC_TYPE_AUDIO], opt_names[j], &opt, buf, sizeof(buf)); + if(str && (opt->flags & AV_OPT_FLAG_AUDIO_PARAM) && (opt->flags & AV_OPT_FLAG_DECODING_PARAM)) + av_set_string(enc, opt_names[j], str); } //fprintf(stderr, "\nInput Audio channels: %d", enc->channels); audio_channels = enc->channels; @@ -2640,10 +2739,11 @@ static void opt_input_file(const char *filename) break; case CODEC_TYPE_VIDEO: for(j=0; jflags&AV_OPT_FLAG_VIDEO_PARAM) && (opt->flags&AV_OPT_FLAG_DECODING_PARAM)) - av_set_double(enc, opt_names[j], d); + const char *str= av_get_string(avctx_opts[CODEC_TYPE_VIDEO], opt_names[j], &opt, buf, sizeof(buf)); + if(str && (opt->flags & AV_OPT_FLAG_VIDEO_PARAM) && (opt->flags & AV_OPT_FLAG_DECODING_PARAM)) + av_set_string(enc, opt_names[j], str); } frame_height = enc->height; frame_width = enc->width; @@ -2679,6 +2779,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: @@ -2699,6 +2800,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, @@ -2725,6 +2829,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: @@ -2774,9 +2879,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) @@ -2786,21 +2892,21 @@ static void new_video_stream(AVFormatContext *oc) codec = avcodec_find_encoder(codec_id); for(i=0; iflags&AV_OPT_FLAG_VIDEO_PARAM) && (opt->flags&AV_OPT_FLAG_ENCODING_PARAM)) - av_set_double(video_enc, opt_names[i], d); + char buf[256]; + const AVOption *opt; + const char *str= av_get_string(avctx_opts[CODEC_TYPE_VIDEO], opt_names[i], &opt, buf, sizeof(buf)); + if(str && (opt->flags & AV_OPT_FLAG_VIDEO_PARAM) && (opt->flags & AV_OPT_FLAG_ENCODING_PARAM)) + 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; @@ -2840,7 +2946,6 @@ static void new_video_stream(AVFormatContext *oc) video_enc->inter_matrix = inter_matrix; video_enc->max_qdiff = video_qdiff; - video_enc->rc_eq = video_rc_eq; video_enc->thread_count = thread_count; p= video_rc_override_string; for(i=0; p; i++){ @@ -2929,10 +3034,11 @@ static void new_audio_stream(AVFormatContext *oc) codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_AUDIO); for(i=0; iflags&AV_OPT_FLAG_AUDIO_PARAM) && (opt->flags&AV_OPT_FLAG_ENCODING_PARAM)) - av_set_double(audio_enc, opt_names[i], d); + const char *str= av_get_string(avctx_opts[CODEC_TYPE_AUDIO], opt_names[i], &opt, buf, sizeof(buf)); + if(str && (opt->flags & AV_OPT_FLAG_AUDIO_PARAM) && (opt->flags & AV_OPT_FLAG_ENCODING_PARAM)) + av_set_string(audio_enc, opt_names[i], str); } if (audio_codec_name) @@ -2973,16 +3079,20 @@ static void new_subtitle_stream(AVFormatContext *oc) } 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) { st->stream_copy = 1; } else { for(i=0; iflags&AV_OPT_FLAG_SUBTITLE_PARAM) && (opt->flags&AV_OPT_FLAG_ENCODING_PARAM)) - av_set_double(subtitle_enc, opt_names[i], d); + char buf[256]; + const AVOption *opt; + const char *str= av_get_string(avctx_opts[CODEC_TYPE_SUBTITLE], opt_names[i], &opt, buf, sizeof(buf)); + if(str && (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) && (opt->flags & AV_OPT_FLAG_ENCODING_PARAM)) + av_set_string(subtitle_enc, opt_names[i], str); } subtitle_enc->codec_id = find_codec_or_die(subtitle_codec_name, CODEC_TYPE_SUBTITLE, 1); } @@ -3116,6 +3226,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; @@ -3132,6 +3244,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; @@ -3171,10 +3284,11 @@ static void opt_output_file(const char *filename) oc->loop_output = loop_output; for(i=0; iflags&AV_OPT_FLAG_ENCODING_PARAM)) - av_set_double(oc, opt_names[i], d); + const char *str= av_get_string(avformat_opts, opt_names[i], &opt, buf, sizeof(buf)); + if(str && (opt->flags & AV_OPT_FLAG_ENCODING_PARAM)) + av_set_string(oc, opt_names[i], str); } /* reset some options */ @@ -3212,16 +3326,13 @@ static int64_t getutime(void) #endif } -#if defined(CONFIG_FFM_DEMUXER) || defined(CONFIG_FFM_MUXER) -extern int ffm_nopts; -#endif - static void opt_show_formats(void) { - AVInputFormat *ifmt; - AVOutputFormat *ofmt; - URLProtocol *up; - AVCodec *p, *p2; + AVInputFormat *ifmt=NULL; + AVOutputFormat *ofmt=NULL; + URLProtocol *up=NULL; + AVCodec *p=NULL, *p2; + AVBitStreamFilter *bsf=NULL; const char *last_name; printf("File formats:\n"); @@ -3232,7 +3343,7 @@ static void opt_show_formats(void) const char *name=NULL; const char *long_name=NULL; - for(ofmt = first_oformat; ofmt != NULL; ofmt = ofmt->next) { + while((ofmt= av_oformat_next(ofmt))) { if((name == NULL || strcmp(ofmt->name, name)<0) && strcmp(ofmt->name, last_name)>0){ name= ofmt->name; @@ -3240,7 +3351,7 @@ static void opt_show_formats(void) encode=1; } } - for(ifmt = first_iformat; ifmt != NULL; ifmt = ifmt->next) { + while((ifmt= av_iformat_next(ifmt))) { if((name == NULL || strcmp(ifmt->name, name)<0) && strcmp(ifmt->name, last_name)>0){ name= ifmt->name; @@ -3272,7 +3383,7 @@ static void opt_show_formats(void) const char *type_str; p2=NULL; - for(p = first_avcodec; p != NULL; p = p->next) { + while((p= av_codec_next(p))) { if((p2==NULL || strcmp(p->name, p2->name)<0) && strcmp(p->name, last_name)>0){ p2= p; @@ -3317,8 +3428,13 @@ static void opt_show_formats(void) } printf("\n"); + printf("Bitstream filters:\n"); + while((bsf = av_bitstream_filter_next(bsf))) + printf(" %s", bsf->name); + printf("\n"); + printf("Supported file protocols:\n"); - for(up = first_protocol; up != NULL; up = up->next) + while((up = av_protocol_next(up))) printf(" %s:", up->name); printf("\n"); @@ -3362,6 +3478,49 @@ static void opt_intra_matrix(const char *arg) parse_matrix_coeffs(intra_matrix, arg); } +/** + * Trivial log callback. + * Only suitable for show_help and similar since it lacks prefix handling. + */ +static void log_callback_help(void* ptr, int level, const char* fmt, va_list vl) +{ + vfprintf(stdout, fmt, vl); +} + +static void show_help(void) +{ + av_log_set_callback(log_callback_help); + printf("usage: ffmpeg [[infile options] -i infile]... {[outfile options] outfile}...\n" + "Hyper fast Audio and Video encoder\n"); + printf("\n"); + show_help_options(options, "Main options:\n", + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO, 0); + show_help_options(options, "\nVideo options:\n", + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_VIDEO); + show_help_options(options, "\nAdvanced Video options:\n", + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_VIDEO | OPT_EXPERT); + show_help_options(options, "\nAudio options:\n", + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_AUDIO); + show_help_options(options, "\nAdvanced Audio options:\n", + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_AUDIO | OPT_EXPERT); + show_help_options(options, "\nSubtitle options:\n", + OPT_SUBTITLE | OPT_GRAB, + OPT_SUBTITLE); + show_help_options(options, "\nAudio/Video grab options:\n", + OPT_GRAB, + OPT_GRAB); + show_help_options(options, "\nAdvanced options:\n", + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_EXPERT); + av_opt_show(avctx_opts[0], NULL); + av_opt_show(avformat_opts, NULL); + av_opt_show(sws_opts, NULL); +} + static void opt_show_help(void) { show_help(); @@ -3530,7 +3689,7 @@ 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; @@ -3540,59 +3699,27 @@ static void opt_bsf(const char *opt, const char *arg) 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; + + return 0; } -static void opt_show_version(void) +static void opt_show_license(void) { - show_version(program_name); + show_license(); exit(0); } -static int opt_default(const char *opt, const char *arg){ - int type; - const AVOption *o= NULL; - int opt_types[]={AV_OPT_FLAG_VIDEO_PARAM, AV_OPT_FLAG_AUDIO_PARAM, 0, AV_OPT_FLAG_SUBTITLE_PARAM, 0}; - - for(type=0; typename; - -#if defined(CONFIG_FFM_DEMUXER) || defined(CONFIG_FFM_MUXER) - /* disable generate of real time pts in ffm (need to be supressed anyway) */ - if(avctx_opts[0]->flags & CODEC_FLAG_BITEXACT) - ffm_nopts = 1; -#endif - - if(avctx_opts[0]->debug) - av_log_level = AV_LOG_DEBUG; - return 0; +static void opt_show_version(void) +{ + show_version(program_name); + exit(0); } const OptionDef options[] = { @@ -3615,6 +3742,7 @@ const OptionDef options[] = { { "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" }, @@ -3635,8 +3763,11 @@ const OptionDef options[] = { { "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", "" }, + { "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)", "" }, { "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" }, @@ -3657,7 +3788,6 @@ const OptionDef options[] = { { "vdt", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&video_discard}, "discard threshold", "n" }, { "qscale", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qscale}, "use fixed video quantizer scale (VBR)", "q" }, { "qdiff", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qdiff}, "max difference between the quantizer scale (VBR)", "q" }, - { "rc_eq", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_eq}, "set rate control equation", "equation" }, { "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", "" }, @@ -3683,6 +3813,7 @@ 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)", "" }, { "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" }, @@ -3711,60 +3842,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 void opt_show_license(void) -{ - show_license(); - exit(0); -} - -/** - * Trivial log callback. - * Only suitable for show_help and similar since it lacks prefix handling. - */ -static void log_callback_help(void* ptr, int level, const char* fmt, va_list vl) -{ - vfprintf(stdout, fmt, vl); -} - -static void show_help(void) -{ - av_log_set_callback(log_callback_help); - printf("usage: ffmpeg [[infile options] -i infile]... {[outfile options] outfile}...\n" - "Hyper fast Audio and Video encoder\n"); - printf("\n"); - show_help_options(options, "Main options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO, 0); - show_help_options(options, "\nVideo options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, - OPT_VIDEO); - show_help_options(options, "\nAdvanced Video options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, - OPT_VIDEO | OPT_EXPERT); - show_help_options(options, "\nAudio options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, - OPT_AUDIO); - show_help_options(options, "\nAdvanced Audio options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, - OPT_AUDIO | OPT_EXPERT); - show_help_options(options, "\nSubtitle options:\n", - OPT_SUBTITLE | OPT_GRAB, - OPT_SUBTITLE); - show_help_options(options, "\nAudio/Video grab options:\n", - OPT_GRAB, - OPT_GRAB); - show_help_options(options, "\nAdvanced options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, - OPT_EXPERT); - av_opt_show(avctx_opts[0], NULL); - av_opt_show(avformat_opts, NULL); - av_opt_show(sws_opts, NULL); -} - static int av_exit() { int i; @@ -3775,7 +3858,7 @@ static int av_exit() AVFormatContext *s = output_files[i]; int j; if (!(s->oformat->flags & AVFMT_NOFILE)) - url_fclose(&s->pb); + url_fclose(s->pb); for(j=0;jnb_streams;j++) { av_free(s->streams[j]->codec); av_free(s->streams[j]); @@ -3823,6 +3906,8 @@ int main(int argc, char **argv) int i; int64_t ti; + avcodec_register_all(); + avdevice_register_all(); av_register_all(); for(i=0; i