X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=c596c0058a10f979b97921daf8a7cc1541c7976f;hb=7d5aaa049cfdf3d0ab805c6dda722e4710f3adac;hp=da60772df3f44027a5011753ab3ad42d1b52455d;hpb=949b1a13bf4434ade235fdcd783c5fe0d27c0c3b;p=ffmpeg diff --git a/ffmpeg.c b/ffmpeg.c index da60772df3f..c596c0058a1 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -19,22 +19,23 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #define HAVE_AV_CONFIG_H +#include #include #include "avformat.h" #include "swscale.h" #include "framehook.h" -#include "dsputil.h" #include "opt.h" #include "fifo.h" -#ifndef __MINGW32__ +#ifdef __MINGW32__ +#include +#else #include #include #include #include #include #include -#include #endif #ifdef CONFIG_OS2 #include @@ -54,6 +55,8 @@ #define INFINITY HUGE_VAL #endif +#undef exit + /* select an input stream for an output stream */ typedef struct AVStreamMap { int file_index; @@ -91,7 +94,6 @@ static int nb_meta_data_maps; static AVInputFormat *file_iformat; static AVOutputFormat *file_oformat; -static AVImageFormat *image_format; static int frame_width = 0; static int frame_height = 0; static float frame_aspect_ratio = 0; @@ -126,7 +128,6 @@ static int video_codec_id = CODEC_ID_NONE; static int video_codec_tag = 0; static int same_quality = 0; static int do_deinterlace = 0; -static int packet_size = 0; static int strict = 0; static int top_field_first = -1; static int me_threshold = 0; @@ -137,7 +138,6 @@ static int qp_hist = 0; static int intra_only = 0; static int audio_sample_rate = 44100; -static int audio_bit_rate = 64000; #define QSCALE_NONE -99999 static float audio_qscale = QSCALE_NONE; static int audio_disable = 0; @@ -166,7 +166,6 @@ static int do_benchmark = 0; static int do_hex_dump = 0; static int do_pkt_dump = 0; static int do_psnr = 0; -static int do_vstats = 0; static int do_pass = 0; static char *pass_logfilename = NULL; static int audio_stream_copy = 0; @@ -177,25 +176,14 @@ static int audio_sync_method= 0; static int copy_ts= 0; static int opt_shortest = 0; // static int video_global_header = 0; +static char *vstats_filename; +static FILE *fvstats; static int rate_emu = 0; -#ifdef CONFIG_BKTR -static const char *video_grab_format = "bktr"; -#else -#ifdef CONFIG_VIDEO4LINUX2 -static const char *video_grab_format = "video4linux2"; -#else -static const char *video_grab_format = "video4linux"; -#endif -#endif -static char *video_device = NULL; -static char *grab_device = NULL; static int video_channel = 0; static char *video_standard = "ntsc"; -static const char *audio_grab_format = "audio_device"; -static char *audio_device = NULL; static int audio_volume = 256; static int using_stdin = 0; @@ -209,7 +197,7 @@ static int64_t extra_size = 0; static int nb_frames_dup = 0; static int nb_frames_drop = 0; static int input_sync; -static int limit_filesize = 0; // +static uint64_t limit_filesize = 0; // static int pgmyuv_compatibility_hack=0; static int dts_delta_threshold = 10; @@ -218,8 +206,9 @@ static int sws_flags = SWS_BICUBIC; const char **opt_names=NULL; int opt_name_count=0; -AVCodecContext *avctx_opts; +AVCodecContext *avctx_opts[CODEC_TYPE_NB]; AVFormatContext *avformat_opts; +static int64_t timer_start = 0; static AVBitStreamFilterContext *video_bitstream_filters=NULL; static AVBitStreamFilterContext *audio_bitstream_filters=NULL; @@ -284,8 +273,6 @@ typedef struct AVInputFile { int eof_reached; /* true if eof reached */ int ist_index; /* index of first stream in ist_table */ int buffer_size; /* current total buffer size */ - int buffer_size_max; /* buffer size at which we consider we can stop - buffering */ int nb_streams; /* nb streams we are aware of */ } AVInputFile; @@ -293,10 +280,13 @@ typedef struct AVInputFile { /* init terminal so that we can grab keys */ static struct termios oldtty; +#endif static void term_exit(void) { +#ifndef __MINGW32__ tcsetattr (0, TCSANOW, &oldtty); +#endif } static volatile sig_atomic_t received_sigterm = 0; @@ -310,6 +300,7 @@ sigterm_handler(int sig) static void term_init(void) { +#ifndef __MINGW32__ struct termios tty; tcgetattr (0, &tty); @@ -325,9 +316,10 @@ static void term_init(void) tty.c_cc[VTIME] = 0; tcsetattr (0, TCSANOW, &tty); + signal(SIGQUIT, sigterm_handler); /* Quit (POSIX). */ +#endif signal(SIGINT , sigterm_handler); /* Interrupt (ANSI). */ - signal(SIGQUIT, sigterm_handler); /* Quit (POSIX). */ signal(SIGTERM, sigterm_handler); /* Termination (ANSI). */ /* register a function to be called at normal program termination @@ -341,6 +333,10 @@ static void term_init(void) /* read a key without blocking */ static int read_key(void) { +#ifdef __MINGW32__ + if(kbhit()) + return(getch()); +#else int n = 1; unsigned char ch; #ifndef CONFIG_BEOS_NETSERVER @@ -360,6 +356,7 @@ static int read_key(void) return n; } +#endif return -1; } @@ -368,26 +365,6 @@ static int decode_interrupt_cb(void) return q_pressed || (q_pressed = read_key() == 'q'); } -#else - -static volatile int received_sigterm = 0; - -/* no interactive support */ -static void term_exit(void) -{ -} - -static void term_init(void) -{ -} - -static int read_key(void) -{ - return 0; -} - -#endif - static int read_ffserver_streams(AVFormatContext *s, const char *filename) { int i, err; @@ -497,7 +474,7 @@ static void do_audio_out(AVFormatContext *s, fprintf(stderr, "adding %d audio samples of silence\n", (int)delta); } }else if(audio_sync_method>1){ - int comp= clip(delta, -audio_sync_method, audio_sync_method); + int comp= av_clip(delta, -audio_sync_method, audio_sync_method); assert(ost->audio_resample); if(verbose > 2) fprintf(stderr, "compensating audio timestamp drift:%f compensation:%d in:%d\n", delta, comp, enc->sample_rate); @@ -619,13 +596,14 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void picture2 = picture; } } else { - img_copy(picture2, picture, dec->pix_fmt, dec->width, dec->height); + av_picture_copy(picture2, picture, dec->pix_fmt, dec->width, dec->height); } } else { picture2 = picture; } - frame_hook_process(picture2, dec->pix_fmt, dec->width, dec->height); + frame_hook_process(picture2, dec->pix_fmt, dec->width, dec->height, + 1000000 * ist->pts / AV_TIME_BASE); if (picture != picture2) *picture = *picture2; @@ -699,7 +677,6 @@ static void do_video_out(AVFormatContext *s, int nb_frames, i, ret; AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src; AVFrame picture_crop_temp, picture_pad_temp; - uint8_t *buf = NULL, *buf1 = NULL; AVCodecContext *enc, *dec; avcodec_get_frame_defaults(&picture_crop_temp); @@ -739,9 +716,9 @@ static void do_video_out(AVFormatContext *s, return; if (ost->video_crop) { - if (img_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { + if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { av_log(NULL, AV_LOG_ERROR, "error cropping picture\n"); - goto the_end; + return; } formatted_picture = &picture_crop_temp; } else { @@ -754,9 +731,9 @@ static void do_video_out(AVFormatContext *s, if (ost->video_pad) { final_picture = &ost->pict_tmp; if (ost->video_resample) { - if (img_crop((AVPicture *)&picture_pad_temp, (AVPicture *)final_picture, enc->pix_fmt, ost->padtop, ost->padleft) < 0) { + if (av_picture_crop((AVPicture *)&picture_pad_temp, (AVPicture *)final_picture, enc->pix_fmt, ost->padtop, ost->padleft) < 0) { av_log(NULL, AV_LOG_ERROR, "error padding picture\n"); - goto the_end; + return; } resampling_dst = &picture_pad_temp; } @@ -770,7 +747,7 @@ static void do_video_out(AVFormatContext *s, } if (ost->video_pad) { - img_pad((AVPicture*)final_picture, (AVPicture *)padding_src, + av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, enc->height, enc->width, enc->pix_fmt, ost->padtop, ost->padbottom, ost->padleft, ost->padright, padcolor); } @@ -803,7 +780,7 @@ static void do_video_out(AVFormatContext *s, /* better than nothing: use input picture interlaced settings */ big_picture.interlaced_frame = in_picture->interlaced_frame; - if(avctx_opts->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)){ + if(avctx_opts[CODEC_TYPE_VIDEO]->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)){ if(top_field_first == -1) big_picture.top_field_first = in_picture->top_field_first; else @@ -855,9 +832,6 @@ static void do_video_out(AVFormatContext *s, ost->sync_opts++; ost->frame_number++; } - the_end: - av_free(buf); - av_free(buf1); } static double psnr(double d){ @@ -868,29 +842,21 @@ static double psnr(double d){ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, int frame_size) { - static FILE *fvstats=NULL; - char filename[40]; - time_t today2; - struct tm *today; AVCodecContext *enc; int frame_number; int64_t ti; double ti1, bitrate, avg_bitrate; + /* this is executed just the first time do_video_stats is called */ if (!fvstats) { - today2 = time(NULL); - today = localtime(&today2); - snprintf(filename, sizeof(filename), "vstats_%02d%02d%02d.log", today->tm_hour, - today->tm_min, - today->tm_sec); - fvstats = fopen(filename,"w"); + fvstats = fopen(vstats_filename, "w"); if (!fvstats) { perror("fopen"); exit(1); } } - ti = MAXINT64; + ti = INT64_MAX; enc = ost->st->codec; if (enc->codec_type == CODEC_TYPE_VIDEO) { frame_number = ost->frame_number; @@ -942,7 +908,9 @@ static void print_report(AVFormatContext **output_files, oc = output_files[0]; - total_size = url_ftell(&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); buf[0] = '\0'; ti1 = 1e10; @@ -956,9 +924,12 @@ static void print_report(AVFormatContext **output_files, enc->coded_frame->quality/(float)FF_QP2LAMBDA); } if (!vid && enc->codec_type == CODEC_TYPE_VIDEO) { + float t = (av_gettime()-timer_start) / 1000000.0; + frame_number = ost->frame_number; - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "frame=%5d q=%3.1f ", - frame_number, enc->coded_frame ? enc->coded_frame->quality/(float)FF_QP2LAMBDA : -1); + 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); if(is_last_report) snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "L"); if(qp_hist && enc->coded_frame){ @@ -1074,10 +1045,11 @@ static int output_packet(AVInputStream *ist, int ist_index, switch(ist->st->codec->codec_type) { case CODEC_TYPE_AUDIO:{ if(pkt) - samples= av_fast_realloc(samples, &samples_size, FFMAX(pkt->size, AVCODEC_MAX_AUDIO_FRAME_SIZE)); + samples= av_fast_realloc(samples, &samples_size, FFMAX(pkt->size*sizeof(*samples), AVCODEC_MAX_AUDIO_FRAME_SIZE)); + data_size= samples_size; /* XXX: could avoid copy if PCM 16 bits with same endianness as CPU */ - ret = avcodec_decode_audio(ist->st->codec, samples, &data_size, + ret = avcodec_decode_audio2(ist->st->codec, samples, &data_size, ptr, len); if (ret < 0) goto fail_decode; @@ -1129,165 +1101,165 @@ static int output_packet(AVInputStream *ist, int ist_index, goto fail_decode; } } else { - 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); - break; - case CODEC_TYPE_VIDEO: - if (ist->st->codec->time_base.num != 0) { - ist->next_pts += ((int64_t)AV_TIME_BASE * - ist->st->codec->time_base.num) / - ist->st->codec->time_base.den; - } - break; + 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); + break; + case CODEC_TYPE_VIDEO: + if (ist->st->codec->time_base.num != 0) { + ist->next_pts += ((int64_t)AV_TIME_BASE * + ist->st->codec->time_base.num) / + ist->st->codec->time_base.den; } - data_buf = ptr; - data_size = len; - ret = len; - len = 0; - } - - buffer_to_free = NULL; - if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO) { - pre_process_video_frame(ist, (AVPicture *)&picture, - &buffer_to_free); + break; } - - // preprocess audio (volume) - if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { - if (audio_volume != 256) { - short *volp; - volp = samples; - for(i=0;i<(data_size / sizeof(short));i++) { - int v = ((*volp) * audio_volume + 128) >> 8; - if (v < -32768) v = -32768; - if (v > 32767) v = 32767; - *volp++ = v; - } + data_buf = ptr; + data_size = len; + ret = len; + len = 0; + } + + buffer_to_free = NULL; + if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO) { + pre_process_video_frame(ist, (AVPicture *)&picture, + &buffer_to_free); + } + + // preprocess audio (volume) + if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { + if (audio_volume != 256) { + short *volp; + volp = samples; + for(i=0;i<(data_size / sizeof(short));i++) { + int v = ((*volp) * audio_volume + 128) >> 8; + if (v < -32768) v = -32768; + if (v > 32767) v = 32767; + *volp++ = v; } } + } - /* frame rate emulation */ - if (ist->st->codec->rate_emu) { - int64_t pts = av_rescale((int64_t) ist->frame * ist->st->codec->time_base.num, 1000000, ist->st->codec->time_base.den); - int64_t now = av_gettime() - ist->start; - if (pts > now) - usleep(pts - now); + /* frame rate emulation */ + if (ist->st->codec->rate_emu) { + int64_t pts = av_rescale((int64_t) ist->frame * ist->st->codec->time_base.num, 1000000, ist->st->codec->time_base.den); + int64_t now = av_gettime() - ist->start; + if (pts > now) + usleep(pts - now); - ist->frame++; - } + ist->frame++; + } #if 0 - /* mpeg PTS deordering : if it is a P or I frame, the PTS - is the one of the next displayed one */ - /* XXX: add mpeg4 too ? */ - if (ist->st->codec->codec_id == CODEC_ID_MPEG1VIDEO) { - if (ist->st->codec->pict_type != B_TYPE) { - int64_t tmp; - tmp = ist->last_ip_pts; - ist->last_ip_pts = ist->frac_pts.val; - ist->frac_pts.val = tmp; - } + /* mpeg PTS deordering : if it is a P or I frame, the PTS + is the one of the next displayed one */ + /* XXX: add mpeg4 too ? */ + if (ist->st->codec->codec_id == CODEC_ID_MPEG1VIDEO) { + if (ist->st->codec->pict_type != B_TYPE) { + int64_t tmp; + tmp = ist->last_ip_pts; + ist->last_ip_pts = ist->frac_pts.val; + ist->frac_pts.val = tmp; } + } #endif - /* if output time reached then transcode raw format, - encode packets and output them */ - if (start_time == 0 || ist->pts >= start_time) - for(i=0;ipts >= start_time) + for(i=0;isource_index == ist_index) { - os = output_files[ost->file_index]; + ost = ost_table[i]; + 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)); + 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; - - if (ost->encoding_needed) { - switch(ost->st->codec->codec_type) { - case CODEC_TYPE_AUDIO: - do_audio_out(os, ost, ist, data_buf, data_size); - break; - case CODEC_TYPE_VIDEO: - do_video_out(os, ost, ist, &picture, &frame_size); - video_size += frame_size; - if (do_vstats && frame_size) - do_video_stats(os, ost, frame_size); - break; - case CODEC_TYPE_SUBTITLE: - do_subtitle_out(os, ost, ist, &subtitle, - pkt->pts); - break; - default: - av_abort(); - } - } else { - AVFrame avframe; //FIXME/XXX remove this - AVPacket opkt; - av_init_packet(&opkt); - - /* no reencoding needed : output the packet directly */ - /* force the input stream PTS */ - - avcodec_get_frame_defaults(&avframe); - ost->st->codec->coded_frame= &avframe; - avframe.key_frame = pkt->flags & PKT_FLAG_KEY; - - if(ost->st->codec->codec_type == CODEC_TYPE_AUDIO) - audio_size += data_size; - else if (ost->st->codec->codec_type == CODEC_TYPE_VIDEO) { - video_size += data_size; - ost->sync_opts++; - } + /* set the input output pts pairs */ + //ost->sync_ipts = (double)(ist->pts + input_files_ts_offset[ist->file_index] - start_time)/ AV_TIME_BASE; - opkt.stream_index= ost->index; - if(pkt->pts != AV_NOPTS_VALUE) - opkt.pts= av_rescale_q(av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q) + input_files_ts_offset[ist->file_index], AV_TIME_BASE_Q, ost->st->time_base); - else - opkt.pts= AV_NOPTS_VALUE; - - { - int64_t dts; - if (pkt->dts == AV_NOPTS_VALUE) - dts = ist->next_pts; - else - dts= av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); - opkt.dts= av_rescale_q(dts + input_files_ts_offset[ist->file_index], AV_TIME_BASE_Q, ost->st->time_base); - } - opkt.flags= pkt->flags; + if (ost->encoding_needed) { + switch(ost->st->codec->codec_type) { + case CODEC_TYPE_AUDIO: + do_audio_out(os, ost, ist, data_buf, data_size); + break; + case CODEC_TYPE_VIDEO: + do_video_out(os, ost, ist, &picture, &frame_size); + video_size += frame_size; + if (vstats_filename && frame_size) + do_video_stats(os, ost, frame_size); + break; + case CODEC_TYPE_SUBTITLE: + do_subtitle_out(os, ost, ist, &subtitle, + pkt->pts); + break; + default: + av_abort(); + } + } else { + AVFrame avframe; //FIXME/XXX remove this + AVPacket opkt; + av_init_packet(&opkt); + + /* no reencoding needed : output the packet directly */ + /* force the input stream PTS */ + + avcodec_get_frame_defaults(&avframe); + ost->st->codec->coded_frame= &avframe; + avframe.key_frame = pkt->flags & PKT_FLAG_KEY; + + if(ost->st->codec->codec_type == CODEC_TYPE_AUDIO) + audio_size += data_size; + else if (ost->st->codec->codec_type == CODEC_TYPE_VIDEO) { + video_size += data_size; + ost->sync_opts++; + } - //FIXME remove the following 2 lines they shall be replaced by the bitstream filters - 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; + opkt.stream_index= ost->index; + if(pkt->pts != AV_NOPTS_VALUE) + opkt.pts= av_rescale_q(av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q) + input_files_ts_offset[ist->file_index], AV_TIME_BASE_Q, ost->st->time_base); + else + opkt.pts= AV_NOPTS_VALUE; - write_frame(os, &opkt, ost->st->codec, bitstream_filters[ost->file_index][pkt->stream_index]); - ost->st->codec->frame_number++; - ost->frame_number++; - av_free_packet(&opkt); + { + int64_t dts; + if (pkt->dts == AV_NOPTS_VALUE) + dts = ist->next_pts; + else + dts= av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); + opkt.dts= av_rescale_q(dts + input_files_ts_offset[ist->file_index], AV_TIME_BASE_Q, ost->st->time_base); } + opkt.flags= pkt->flags; + + //FIXME remove the following 2 lines they shall be replaced by the bitstream filters + 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]); + ost->st->codec->frame_number++; + ost->frame_number++; + av_free_packet(&opkt); } } - av_free(buffer_to_free); - /* XXX: allocate the subtitles in the codec ? */ - if (subtitle_to_free) { - if (subtitle_to_free->rects != NULL) { - for (i = 0; i < subtitle_to_free->num_rects; i++) { - av_free(subtitle_to_free->rects[i].bitmap); - av_free(subtitle_to_free->rects[i].rgba_palette); - } - av_freep(&subtitle_to_free->rects); + } + av_free(buffer_to_free); + /* XXX: allocate the subtitles in the codec ? */ + if (subtitle_to_free) { + if (subtitle_to_free->rects != NULL) { + for (i = 0; i < subtitle_to_free->num_rects; i++) { + av_free(subtitle_to_free->rects[i].bitmap); + av_free(subtitle_to_free->rects[i].rgba_palette); } - subtitle_to_free->num_rects = 0; - subtitle_to_free = NULL; + av_freep(&subtitle_to_free->rects); } + subtitle_to_free->num_rects = 0; + subtitle_to_free = NULL; } + } discard_packet: if (pkt == NULL) { /* EOF handling */ @@ -1376,7 +1348,6 @@ static int av_encode(AVFormatContext **output_files, AVOutputStream *ost, **ost_table = NULL; AVInputStream *ist, **ist_table = NULL; AVInputFile *file_table; - AVFormatContext *stream_no_data; int key; file_table= (AVInputFile*) av_mallocz(nb_input_files * sizeof(AVInputFile)); @@ -1425,6 +1396,10 @@ static int av_encode(AVFormatContext **output_files, nb_ostreams = 0; for(i=0;inb_streams) { + fprintf(stderr, "Output file does not contain any stream\n"); + exit(1); + } nb_ostreams += os->nb_streams; } if (nb_stream_maps > 0 && nb_stream_maps != nb_ostreams) { @@ -1535,7 +1510,7 @@ static int av_encode(AVFormatContext **output_files, codec->bit_rate = icodec->bit_rate; codec->extradata= icodec->extradata; codec->extradata_size= icodec->extradata_size; - if(av_q2d(icodec->time_base) > av_q2d(ist->st->time_base)) + if(av_q2d(icodec->time_base) > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/1000) codec->time_base = icodec->time_base; else codec->time_base = ist->st->time_base; @@ -1547,6 +1522,10 @@ static int av_encode(AVFormatContext **output_files, codec->block_align= icodec->block_align; break; case CODEC_TYPE_VIDEO: + if(using_vhook) { + fprintf(stderr,"-vcodec copy and -vhook are incompatible (frames are not decoded)\n"); + exit(1); + } codec->pix_fmt = icodec->pix_fmt; codec->width = icodec->width; codec->height = icodec->height; @@ -1626,9 +1605,10 @@ static int av_encode(AVFormatContext **output_files, if (ost->video_resample) { avcodec_get_frame_defaults(&ost->pict_tmp); if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, codec->pix_fmt, - codec->width, codec->height ) ) - goto fail; - + codec->width, codec->height ) ) { + fprintf(stderr, "Cannot allocate temp picture, check pix fmt\n"); + exit(1); + } ost->img_resample_ctx = sws_getContext( icodec->width - (frame_leftBand + frame_rightBand), icodec->height - (frame_topBand + frame_bottomBand), @@ -1783,11 +1763,6 @@ static int av_encode(AVFormatContext **output_files, ist->is_start = 1; } - /* compute buffer size max (should use a complete heuristic) */ - for(i=0;i= nb_output_files ) { fprintf(stderr, "Invalid output file index %d map_meta_data(%d,%d)\n", out_file_index, out_file_index, in_file_index); - ret = -EINVAL; + ret = AVERROR(EINVAL); goto fail; } if ( in_file_index < 0 || in_file_index >= nb_input_files ) { fprintf(stderr, "Invalid input file index %d map_meta_data(%d,%d)\n", in_file_index, out_file_index, in_file_index); - ret = -EINVAL; + ret = AVERROR(EINVAL); goto fail; } @@ -1824,21 +1799,19 @@ static int av_encode(AVFormatContext **output_files, os = output_files[i]; if (av_write_header(os) < 0) { fprintf(stderr, "Could not write header for output file #%d (incorrect codec parameters ?)\n", i); - ret = -EINVAL; + ret = AVERROR(EINVAL); goto fail; } } -#ifndef __MINGW32__ if ( !using_stdin && verbose >= 0) { fprintf(stderr, "Press [q] to stop encoding\n"); url_set_interrupt_cb(decode_interrupt_cb); } -#endif term_init(); - stream_no_data = 0; key = -1; + timer_start = av_gettime(); for(; received_sigterm == 0;) { int file_index, ist_index; @@ -1897,7 +1870,7 @@ static int av_encode(AVFormatContext **output_files, break; /* finish if limit size exhausted */ - if (limit_filesize != 0 && (limit_filesize * 1024) < 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 */ @@ -1907,13 +1880,8 @@ static int av_encode(AVFormatContext **output_files, if (opt_shortest) break; else continue; // } - if (!pkt.size) { - stream_no_data = is; - } else { - stream_no_data = 0; - } if (do_pkt_dump) { - av_pkt_dump(stdout, &pkt, do_hex_dump); + av_pkt_dump_log(NULL, AV_LOG_DEBUG, &pkt, do_hex_dump); } /* the following test is needed in case new streams appear dynamically in stream : we ignore them */ @@ -2029,7 +1997,7 @@ static int av_encode(AVFormatContext **output_files, } return ret; fail: - ret = -ENOMEM; + ret = AVERROR(ENOMEM); goto fail1; } @@ -2055,21 +2023,6 @@ int file_read(const char *filename) } #endif -static void opt_image_format(const char *arg) -{ - AVImageFormat *f; - - for(f = first_image_format; f != NULL; f = f->next) { - if (!strcmp(arg, f->name)) - break; - } - if (!f) { - fprintf(stderr, "Unknown image format: '%s'\n", arg); - exit(1); - } - image_format = f; -} - static void opt_format(const char *arg) { /* compatibility stuff for pgmyuv */ @@ -2077,6 +2030,7 @@ static void opt_format(const char *arg) pgmyuv_compatibility_hack=1; // opt_image_format(arg); arg = "image2"; + fprintf(stderr, "pgmyuv format is deprecated, use image2\n"); } file_iformat = av_find_input_format(arg); @@ -2105,7 +2059,7 @@ static void opt_me_threshold(const char *arg) static void opt_verbose(const char *arg) { verbose = atoi(arg); - av_log_set_level(atoi(arg)); + av_log_level = atoi(arg); } static void opt_frame_rate(const char *arg) @@ -2335,11 +2289,6 @@ static void opt_qdiff(const char *arg) } } -static void opt_packet_size(const char *arg) -{ - packet_size= atoi(arg); -} - static void opt_strict(const char *arg) { strict= atoi(arg); @@ -2359,11 +2308,6 @@ static void opt_thread_count(const char *arg) #endif } -static void opt_audio_bitrate(const char *arg) -{ - audio_bit_rate = atoi(arg) * 1000; -} - static void opt_audio_rate(const char *arg) { audio_sample_rate = atoi(arg); @@ -2374,16 +2318,6 @@ static void opt_audio_channels(const char *arg) audio_channels = atoi(arg); } -static void opt_video_device(const char *arg) -{ - video_device = av_strdup(arg); -} - -static void opt_grab_device(const char *arg) -{ - grab_device = av_strdup(arg); -} - static void opt_video_channel(const char *arg) { video_channel = strtol(arg, NULL, 0); @@ -2394,11 +2328,6 @@ static void opt_video_standard(const char *arg) video_standard = av_strdup(arg); } -static void opt_audio_device(const char *arg) -{ - audio_device = av_strdup(arg); -} - static void opt_codec(int *pstream_copy, int *pcodec_id, int codec_type, const char *arg) { @@ -2589,9 +2518,7 @@ static void opt_input_file(const char *filename) ap->time_base.num = frame_rate_base; ap->width = frame_width + frame_padleft + frame_padright; ap->height = frame_height + frame_padtop + frame_padbottom; - ap->image_format = image_format; ap->pix_fmt = frame_pix_fmt; - ap->device = grab_device; ap->channel = video_channel; ap->standard = video_standard; ap->video_codec_id = video_codec_id; @@ -2600,7 +2527,7 @@ 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); @@ -2642,16 +2569,14 @@ static void opt_input_file(const char *filename) for(i=0;inb_streams;i++) { int j; AVCodecContext *enc = ic->streams[i]->codec; -#if defined(HAVE_THREADS) if(thread_count>1) avcodec_thread_init(enc, thread_count); -#endif enc->thread_count= thread_count; 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); } @@ -2663,8 +2588,8 @@ 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); } @@ -2681,7 +2606,7 @@ static void opt_input_file(const char *filename) if (enc->time_base.den != rfps || enc->time_base.num != rfps_base) { if (verbose >= 0) - fprintf(stderr,"\nSeems that stream %d comes from film source: %2.2f (%d/%d) -> %2.2f (%d/%d)\n", + fprintf(stderr,"\nSeems stream %d codec frame rate differs from container frame rate: %2.2f (%d/%d) -> %2.2f (%d/%d)\n", i, (float)enc->time_base.den / enc->time_base.num, enc->time_base.den, enc->time_base.num, (float)rfps / rfps_base, rfps, rfps_base); @@ -2716,20 +2641,12 @@ static void opt_input_file(const char *filename) nb_input_files++; file_iformat = NULL; file_oformat = NULL; - image_format = NULL; - grab_device = NULL; video_channel = 0; rate_emu = 0; } -static void opt_grab(const char *arg) -{ - file_iformat = av_find_input_format(arg); - opt_input_file(""); -} - static void check_audio_video_inputs(int *has_video_ptr, int *has_audio_ptr) { int has_video, has_audio, i, j; @@ -2772,13 +2689,12 @@ static void new_video_stream(AVFormatContext *oc) fprintf(stderr, "Could not alloc stream\n"); exit(1); } + avcodec_get_context_defaults2(st->codec, CODEC_TYPE_VIDEO); bitstream_filters[nb_output_files][oc->nb_streams - 1]= video_bitstream_filters; video_bitstream_filters= NULL; -#if defined(HAVE_THREADS) if(thread_count>1) avcodec_thread_init(st->codec, thread_count); -#endif video_enc = st->codec; @@ -2788,11 +2704,11 @@ static void new_video_stream(AVFormatContext *oc) if( (video_global_header&1) || (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))){ video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; - avctx_opts->flags|= CODEC_FLAG_GLOBAL_HEADER; + avctx_opts[CODEC_TYPE_VIDEO]->flags|= CODEC_FLAG_GLOBAL_HEADER; } if(video_global_header&2){ video_enc->flags2 |= CODEC_FLAG2_LOCAL_HEADER; - avctx_opts->flags2|= CODEC_FLAG2_LOCAL_HEADER; + avctx_opts[CODEC_TYPE_VIDEO]->flags2|= CODEC_FLAG2_LOCAL_HEADER; } if (video_stream_copy) { @@ -2811,8 +2727,8 @@ 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); } @@ -2892,16 +2808,12 @@ static void new_video_stream(AVFormatContext *oc) if(p) p++; } video_enc->rc_override_count=i; - video_enc->rc_initial_buffer_occupancy = video_enc->rc_buffer_size*3/4; + if (!video_enc->rc_initial_buffer_occupancy) + video_enc->rc_initial_buffer_occupancy = video_enc->rc_buffer_size*3/4; video_enc->me_threshold= me_threshold; video_enc->intra_dc_precision= intra_dc_precision - 8; video_enc->strict_std_compliance = strict; - if(packet_size){ - video_enc->rtp_mode= 1; - video_enc->rtp_payload_size= packet_size; - } - if (do_psnr) video_enc->flags|= CODEC_FLAG_PSNR; @@ -2934,24 +2846,24 @@ static void new_audio_stream(AVFormatContext *oc) fprintf(stderr, "Could not alloc stream\n"); exit(1); } + avcodec_get_context_defaults2(st->codec, CODEC_TYPE_AUDIO); bitstream_filters[nb_output_files][oc->nb_streams - 1]= audio_bitstream_filters; audio_bitstream_filters= NULL; -#if defined(HAVE_THREADS) if(thread_count>1) avcodec_thread_init(st->codec, thread_count); -#endif audio_enc = st->codec; audio_enc->codec_type = CODEC_TYPE_AUDIO; + audio_enc->strict_std_compliance = strict; if(audio_codec_tag) audio_enc->codec_tag= audio_codec_tag; if (oc->oformat->flags & AVFMT_GLOBALHEADER) { audio_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; - avctx_opts->flags|= CODEC_FLAG_GLOBAL_HEADER; + avctx_opts[CODEC_TYPE_AUDIO]->flags|= CODEC_FLAG_GLOBAL_HEADER; } if (audio_stream_copy) { st->stream_copy = 1; @@ -2960,8 +2872,8 @@ 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); } @@ -2970,20 +2882,12 @@ static void new_audio_stream(AVFormatContext *oc) codec_id = audio_codec_id; audio_enc->codec_id = codec_id; - audio_enc->bit_rate = audio_bit_rate; if (audio_qscale > QSCALE_NONE) { audio_enc->flags |= CODEC_FLAG_QSCALE; audio_enc->global_quality = st->quality = FF_QP2LAMBDA * audio_qscale; } - audio_enc->strict_std_compliance = strict; audio_enc->thread_count = thread_count; - /* For audio codecs other than AC3 or DTS we limit */ - /* the number of coded channels to stereo */ - if (audio_channels > 2 && codec_id != CODEC_ID_AC3 - && codec_id != CODEC_ID_DTS) { - audio_enc->channels = 2; - } else - audio_enc->channels = audio_channels; + audio_enc->channels = audio_channels; } audio_enc->sample_rate = audio_sample_rate; audio_enc->time_base= (AVRational){1, audio_sample_rate}; @@ -3017,6 +2921,7 @@ static void opt_new_subtitle_stream(void) fprintf(stderr, "Could not alloc stream\n"); exit(1); } + avcodec_get_context_defaults2(st->codec, CODEC_TYPE_SUBTITLE); subtitle_enc = st->codec; subtitle_enc->codec_type = CODEC_TYPE_SUBTITLE; @@ -3024,8 +2929,8 @@ static void opt_new_subtitle_stream(void) 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); } @@ -3125,10 +3030,6 @@ static void opt_output_file(const char *filename) new_audio_stream(oc); } - if (!oc->nb_streams) { - fprintf(stderr, "Note: Output file will not contain a video or audio stream\n"); - } - oc->timestamp = rec_timestamp; if (str_title) @@ -3185,7 +3086,6 @@ static void opt_output_file(const char *filename) } memset(ap, 0, sizeof(*ap)); - ap->image_format = image_format; if (av_set_parameters(oc, ap) < 0) { fprintf(stderr, "%s: Invalid encoding parameters\n", oc->filename); @@ -3197,7 +3097,7 @@ 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); @@ -3206,104 +3106,6 @@ static void opt_output_file(const char *filename) /* reset some options */ file_oformat = NULL; file_iformat = NULL; - image_format = NULL; -} - -/* prepare dummy protocols for grab */ -static void prepare_grab(void) -{ - int has_video, has_audio, i, j; - AVFormatContext *oc; - AVFormatContext *ic; - AVFormatParameters vp1, *vp = &vp1; - AVFormatParameters ap1, *ap = &ap1; - - /* see if audio/video inputs are needed */ - has_video = 0; - has_audio = 0; - memset(ap, 0, sizeof(*ap)); - memset(vp, 0, sizeof(*vp)); - vp->time_base.num= 1; - for(j=0;jnb_streams;i++) { - AVCodecContext *enc = oc->streams[i]->codec; - switch(enc->codec_type) { - case CODEC_TYPE_AUDIO: - if (enc->sample_rate > ap->sample_rate) - ap->sample_rate = enc->sample_rate; - if (enc->channels > ap->channels) - ap->channels = enc->channels; - has_audio = 1; - break; - case CODEC_TYPE_VIDEO: - if (enc->width > vp->width) - vp->width = enc->width; - if (enc->height > vp->height) - vp->height = enc->height; - - if (vp->time_base.num*(int64_t)enc->time_base.den > enc->time_base.num*(int64_t)vp->time_base.den){ - vp->time_base = enc->time_base; - vp->width += frame_leftBand + frame_rightBand; - vp->width -= (frame_padleft + frame_padright); - vp->height += frame_topBand + frame_bottomBand; - vp->height -= (frame_padtop + frame_padbottom); - } - has_video = 1; - break; - default: - av_abort(); - } - } - } - - if (has_video == 0 && has_audio == 0) { - fprintf(stderr, "Output file must have at least one audio or video stream\n"); - exit(1); - } - - if (has_video) { - AVInputFormat *fmt1; - fmt1 = av_find_input_format(video_grab_format); - vp->device = video_device; - vp->channel = video_channel; - vp->standard = video_standard; - vp->pix_fmt = frame_pix_fmt; - if (av_open_input_file(&ic, "", fmt1, 0, vp) < 0) { - fprintf(stderr, "Could not find video grab device\n"); - exit(1); - } - /* If not enough info to get the stream parameters, we decode the - first frames to get it. */ - if ((ic->ctx_flags & AVFMTCTX_NOHEADER) && av_find_stream_info(ic) < 0) { - fprintf(stderr, "Could not find video grab parameters\n"); - exit(1); - } - /* by now video grab has one stream */ - ic->streams[0]->r_frame_rate.num = vp->time_base.den; - ic->streams[0]->r_frame_rate.den = vp->time_base.num; - input_files[nb_input_files] = ic; - - if (verbose >= 0) - dump_format(ic, nb_input_files, "", 0); - - nb_input_files++; - } - if (has_audio && audio_grab_format) { - AVInputFormat *fmt1; - fmt1 = av_find_input_format(audio_grab_format); - ap->device = audio_device; - if (av_open_input_file(&ic, "", fmt1, 0, ap) < 0) { - fprintf(stderr, "Could not find audio grab device\n"); - exit(1); - } - input_files[nb_input_files] = ic; - - if (verbose >= 0) - dump_format(ic, nb_input_files, "", 0); - - nb_input_files++; - } } /* same option as mencoder */ @@ -3341,7 +3143,6 @@ static void show_formats(void) { AVInputFormat *ifmt; AVOutputFormat *ofmt; - AVImageFormat *image_fmt; URLProtocol *up; AVCodec *p, *p2; const char **pp, *last_name; @@ -3385,18 +3186,6 @@ static void show_formats(void) } printf("\n"); - printf("Image formats (filename extensions, if any, follow):\n"); - for(image_fmt = first_image_format; image_fmt != NULL; - image_fmt = image_fmt->next) { - printf( - " %s%s %-6s %s\n", - image_fmt->img_read ? "D":" ", - image_fmt->img_write ? "E":" ", - image_fmt->name, - image_fmt->extensions ? image_fmt->extensions:" "); - } - printf("\n"); - printf("Codecs:\n"); last_name= "000"; for(;;){ @@ -3579,8 +3368,9 @@ static void opt_target(const char *arg) opt_default("minrate", "1150000"); opt_default("bufsize", "327680"); // 40*1024*8; - audio_bit_rate = 224000; + opt_default("ab", "224000"); audio_sample_rate = 44100; + audio_channels = 2; opt_default("packetsize", "2324"); opt_default("muxrate", "1411200"); // 2352 * 75 * 8; @@ -3608,7 +3398,7 @@ static void opt_target(const char *arg) opt_default("flags", "+SCAN_OFFSET"); - audio_bit_rate = 224000; + opt_default("ab", "224000"); audio_sample_rate = 44100; opt_default("packetsize", "2324"); @@ -3631,7 +3421,7 @@ static void opt_target(const char *arg) opt_default("packetsize", "2048"); // from www.mpucoder.com: DVD sectors contain 2048 bytes of data, this is also the size of one pack. opt_default("muxrate", "10080000"); // from mplex project: data_rate = 1260000. mux_rate = data_rate * 8 - audio_bit_rate = 448000; + opt_default("ab", "448000"); audio_sample_rate = 48000; } else if(!strncmp(arg, "dv", 2)) { @@ -3652,13 +3442,30 @@ static void opt_target(const char *arg) } } +static void opt_vstats_file (const char *arg) +{ + av_free (vstats_filename); + vstats_filename=av_strdup (arg); +} + +static void opt_vstats (void) +{ + char filename[40]; + time_t today2 = time(NULL); + struct tm *today = localtime(&today2); + + snprintf(filename, sizeof(filename), "vstats_%02d%02d%02d.log", today->tm_hour, today->tm_min, + today->tm_sec); + opt_vstats_file(filename); +} + static void opt_video_bsf(const char *arg) { AVBitStreamFilterContext *bsfc= av_bitstream_filter_init(arg); //FIXME split name and args for filter at '=' AVBitStreamFilterContext **bsfp; if(!bsfc){ - fprintf(stderr, "Unkown bitstream filter %s\n", arg); + fprintf(stderr, "Unknown bitstream filter %s\n", arg); exit(1); } @@ -3676,7 +3483,7 @@ static void opt_audio_bsf(const char *arg) AVBitStreamFilterContext **bsfp; if(!bsfc){ - fprintf(stderr, "Unkown bitstream filter %s\n", arg); + fprintf(stderr, "Unknown bitstream filter %s\n", arg); exit(1); } @@ -3699,9 +3506,25 @@ static void show_version(void) } static int opt_default(const char *opt, const char *arg){ - AVOption *o= av_set_string(avctx_opts, opt, 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; typeflags & CODEC_FLAG_BITEXACT) + if(avctx_opts[0]->flags & CODEC_FLAG_BITEXACT) ffm_nopts = 1; #endif - if(avctx_opts->debug) - av_log_set_level(AV_LOG_DEBUG); + if(avctx_opts[0]->debug) + av_log_level = AV_LOG_DEBUG; return 0; } @@ -3729,13 +3552,12 @@ const OptionDef options[] = { { "version", 0, {(void*)show_version}, "show version" }, { "formats", 0, {(void*)show_formats}, "show available formats, codecs, protocols, ..." }, { "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" }, - { "img", HAS_ARG, {(void*)opt_image_format}, "force image format", "img_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}, "set the recording time", "duration" }, - { "fs", HAS_ARG | OPT_INT, {(void*)&limit_filesize}, "set the limit file size", "limit_size" }, // + { "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" }, { "title", HAS_ARG | OPT_STRING, {(void*)&str_title}, "set the title", "string" }, @@ -3765,7 +3587,6 @@ const OptionDef options[] = { /* video options */ { "vframes", OPT_INT | HAS_ARG | OPT_VIDEO, {(void*)&max_frames[CODEC_TYPE_VIDEO]}, "set the number of video frames to record", "number" }, - { "aframes", OPT_INT | HAS_ARG | OPT_AUDIO, {(void*)&max_frames[CODEC_TYPE_AUDIO]}, "set the number of audio 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" }, { "s", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" }, @@ -3791,7 +3612,6 @@ const OptionDef options[] = { { "me", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_motion_estimation}, "set motion estimation method", "method" }, { "me_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_threshold}, "motion estimaton threshold", "" }, - { "ps", HAS_ARG | OPT_EXPERT, {(void*)opt_packet_size}, "set packet size in bits", "size" }, { "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)" }, @@ -3800,7 +3620,8 @@ const OptionDef options[] = { { "deinterlace", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_deinterlace}, "deinterlace pictures" }, { "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" }, - { "vstats", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_vstats}, "dump video coding statistics to file" }, + { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" }, + { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" }, { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" }, { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" }, { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" }, @@ -3811,7 +3632,7 @@ const OptionDef options[] = { { "qphist", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&qp_hist }, "show QP histogram" }, /* audio options */ - { "ab", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_bitrate}, "set audio bitrate (in kbit/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" }, @@ -3828,14 +3649,9 @@ const OptionDef options[] = { { "slang", HAS_ARG | OPT_STRING | OPT_SUBTITLE, {(void *)&subtitle_language}, "set the ISO 639 language code (3 letters) of the current subtitle stream" , "code" }, /* grab options */ - { "vd", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_GRAB, {(void*)opt_video_device}, "set video grab device", "device" }, { "vc", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_GRAB, {(void*)opt_video_channel}, "set video grab channel (DV1394 only)", "channel" }, { "tvstd", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_GRAB, {(void*)opt_video_standard}, "set television standard (NTSC, PAL (SECAM))", "standard" }, - { "ad", HAS_ARG | OPT_EXPERT | OPT_AUDIO | OPT_GRAB, {(void*)opt_audio_device}, "set audio device", "device" }, - - /* G.2 grab options */ - { "grab", HAS_ARG | OPT_EXPERT | OPT_GRAB, {(void*)opt_grab}, "request grabbing using", "format" }, - { "gd", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_GRAB, {(void*)opt_grab_device}, "set grab device", "device" }, + { "isync", OPT_BOOL | OPT_EXPERT | OPT_GRAB, {(void*)&input_sync}, "sync read on input", "" }, /* muxer options */ { "muxdelay", OPT_FLOAT | HAS_ARG | OPT_EXPERT, {(void*)&mux_max_delay}, "set the maximum demux-decode delay", "seconds" }, @@ -3850,7 +3666,7 @@ const OptionDef options[] = { static void show_banner(void) { - fprintf(stderr, "FFmpeg version " FFMPEG_VERSION ", Copyright (c) 2000-2006 Fabrice Bellard, et al.\n"); + fprintf(stderr, "FFmpeg version " FFMPEG_VERSION ", Copyright (c) 2000-2007 Fabrice Bellard, et al.\n"); fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n"); fprintf(stderr, " libavutil version: " AV_STRINGIFY(LIBAVUTIL_VERSION) "\n"); fprintf(stderr, " libavcodec version: " AV_STRINGIFY(LIBAVCODEC_VERSION) "\n"); @@ -3902,8 +3718,18 @@ static void show_license(void) exit(1); } +/** + * 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); show_banner(); printf("usage: ffmpeg [[infile options] -i infile]... {[outfile options] outfile}...\n" "Hyper fast Audio and Video encoder\n"); @@ -3931,7 +3757,7 @@ static void show_help(void) show_help_options(options, "\nAdvanced options:\n", OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, OPT_EXPERT); - av_opt_show(avctx_opts, NULL); + av_opt_show(avctx_opts[0], NULL); av_opt_show(avformat_opts, NULL); exit(1); @@ -3949,7 +3775,9 @@ int main(int argc, char **argv) av_register_all(); - avctx_opts= avcodec_alloc_context(); + for(i=0; ioformat->flags & AVFMT_NOFILE)) url_fclose(&s->pb); - for(j=0;jnb_streams;j++) + for(j=0;jnb_streams;j++) { + av_free(s->streams[j]->codec); av_free(s->streams[j]); + } av_free(s); } for(i=0;i