X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=aba78c4712471bc517b588291eb229638ad00794;hb=58379c062f098482a54bf8a178150e0bf6d5e4ee;hp=0467528fab208084ecf18a818c46169562ce91a9;hpb=f20ad5534a092109ed7d6c644ce74d7f50611fdb;p=ffmpeg diff --git a/ffmpeg.c b/ffmpeg.c index 0467528fab2..aba78c47124 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -52,6 +52,8 @@ typedef struct AVStreamMap { int file_index; int stream_index; + int sync_file_index; + int sync_stream_index; } AVStreamMap; /** select an input file for an output file */ @@ -83,10 +85,10 @@ static int nb_meta_data_maps; static AVInputFormat *file_iformat; static AVOutputFormat *file_oformat; static AVImageFormat *image_format; -static int frame_width = 160; -static int frame_height = 128; +static int frame_width = 0; +static int frame_height = 0; static float frame_aspect_ratio = 0; -static enum PixelFormat frame_pix_fmt = PIX_FMT_YUV420P; +static enum PixelFormat frame_pix_fmt = PIX_FMT_NONE; static int frame_padtop = 0; static int frame_padbottom = 0; static int frame_padleft = 0; @@ -96,6 +98,7 @@ static int frame_topBand = 0; 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 int frame_rate = 25; static int frame_rate_base = 1; static int video_bit_rate = 200*1000; @@ -105,10 +108,13 @@ static int video_qmin = 2; static int video_qmax = 31; static int video_lmin = 2*FF_QP2LAMBDA; static int video_lmax = 31*FF_QP2LAMBDA; -static int video_mb_qmin = 2; -static int video_mb_qmax = 31; +static int video_mb_lmin = 2*FF_QP2LAMBDA; +static int video_mb_lmax = 31*FF_QP2LAMBDA; static int video_qdiff = 3; +static int video_lelim = 0; +static int video_celim = 0; static float video_qblur = 0.5; +static float video_qsquish = 0.0; static float video_qcomp = 0.5; static uint16_t *intra_matrix = NULL; static uint16_t *inter_matrix = NULL; @@ -132,9 +138,12 @@ static int video_intra_quant_bias= FF_DEFAULT_QUANT_BIAS; static int video_inter_quant_bias= FF_DEFAULT_QUANT_BIAS; static int me_method = ME_EPZS; static int video_disable = 0; +static int video_discard = 0; static int video_codec_id = CODEC_ID_NONE; +static int video_codec_tag = 0; static int same_quality = 0; static int b_frames = 0; +static int b_strategy = 0; static int mb_decision = FF_MB_DECISION_SIMPLE; static int ildct_cmp = FF_CMP_VSAD; static int mb_cmp = FF_CMP_SAD; @@ -160,13 +169,17 @@ static int use_scan_offset = 0; static int use_qpel = 0; static int use_qprd = 0; static int use_cbprd = 0; +static int use_mv0 = 0; +static int do_normalize_aqp = 0; static int qns = 0; static int closed_gop = 0; +static int strict_gop = 0; +static int no_output = 0; static int do_deinterlace = 0; static int do_interlace_dct = 0; static int do_interlace_me = 0; static int workaround_bugs = FF_BUG_AUTODETECT; -static int error_resilience = 2; +static int error_resilience = FF_ER_CAREFULL; static int error_concealment = 3; static int dct_algo = 0; static int idct_algo = 0; @@ -189,8 +202,15 @@ static int video_profile = FF_PROFILE_UNKNOWN; static int video_level = FF_LEVEL_UNKNOWN; static int nsse_weight = 8; static int subpel_quality= 8; +static int me_penalty_compensation= 256; static int lowres= 0; +static int frame_skip_threshold= 0; +static int frame_skip_factor= 0; +static int frame_skip_exp= 0; +static int frame_skip_cmp= FF_CMP_DCTMAX; extern int loop_input; /* currently a hack */ +static int loop_output = AVFMT_NOOUTPUTLOOP; +static int gray_only = 0; static int gop_size = 12; static int intra_only = 0; @@ -199,6 +219,16 @@ static int audio_bit_rate = 64000; static int audio_disable = 0; static int audio_channels = 1; static int audio_codec_id = CODEC_ID_NONE; +static int audio_codec_tag = 0; +static char *audio_language = NULL; + +static int subtitle_codec_id = CODEC_ID_NONE; +static char *subtitle_language = NULL; + +static int mux_rate= 0; +static int mux_packet_size= 0; +static float mux_preload= 0.5; +static float mux_max_delay= 0.7; static int64_t recording_time = 0; static int64_t start_time = 0; @@ -219,19 +249,28 @@ static int bitexact = 0; static char *pass_logfilename = NULL; static int audio_stream_copy = 0; static int video_stream_copy = 0; +static int subtitle_stream_copy = 0; static int video_sync_method= 1; static int audio_sync_method= 0; static int copy_ts= 0; +static int opt_shortest = 0; // +static int video_global_header = 0; static int rate_emu = 0; +#ifdef CONFIG_BKTR +static char *video_grab_format = "bktr"; +#else static char *video_grab_format = "video4linux"; +#endif static char *video_device = NULL; +static char *grab_device = NULL; static int video_channel = 0; static char *video_standard = "ntsc"; static char *audio_grab_format = "audio_device"; static char *audio_device = NULL; +static int audio_volume = 256; static int using_stdin = 0; static int using_vhook = 0; @@ -245,9 +284,15 @@ 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 int pgmyuv_compatibility_hack=0; + #define DEFAULT_PASS_LOGFILENAME "ffmpeg2pass" +struct AVInputStream; + typedef struct AVOutputStream { int file_index; /* file index */ int index; /* stream index in the output file */ @@ -257,7 +302,8 @@ typedef struct AVOutputStream { int frame_number; /* input pts and corresponding output pts for A/V sync */ - double sync_ipts; /* dts from the AVPacket of the demuxer in second units */ + //double sync_ipts; /* dts from the AVPacket of the demuxer in second units */ + struct AVInputStream *sync_ist; /* input stream to sync against */ int64_t sync_opts; /* output frame counter, could be changed to some true timestamp */ //FIXME look at frame_number /* video only */ int video_resample; /* video_resample and video_crop are mutually exclusive */ @@ -427,6 +473,13 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename) return 0; } +static double +get_sync_ipts(const AVOutputStream *ost) +{ + const AVInputStream *ist = ost->sync_ist; + return (double)(ist->pts + input_files_ts_offset[ist->file_index] - start_time)/AV_TIME_BASE; +} + #define MAX_AUDIO_PACKET_SIZE (128 * 1024) static void do_audio_out(AVFormatContext *s, @@ -451,7 +504,7 @@ static void do_audio_out(AVFormatContext *s, return; /* Should signal an error ! */ if(audio_sync_method){ - double delta = ost->sync_ipts * enc->sample_rate - ost->sync_opts + double delta = get_sync_ipts(ost) * enc->sample_rate - ost->sync_opts - fifo_size(&ost->fifo, ost->fifo.rptr)/(ost->st->codec.channels * 2); double idelta= delta*ist->st->codec.sample_rate / enc->sample_rate; int byte_delta= ((int)idelta)*2*ist->st->codec.channels; @@ -489,12 +542,12 @@ static void do_audio_out(AVFormatContext *s, assert(ost->audio_resample); if(verbose > 2) fprintf(stderr, "compensating audio timestamp drift:%f compensation:%d in:%d\n", delta, comp, enc->sample_rate); -// fprintf(stderr, "drift:%f len:%d opts:%lld ipts:%lld fifo:%d\n", delta, -1, ost->sync_opts, (int64_t)(ost->sync_ipts * enc->sample_rate), fifo_size(&ost->fifo, ost->fifo.rptr)/(ost->st->codec.channels * 2)); +// fprintf(stderr, "drift:%f len:%d opts:%lld ipts:%lld fifo:%d\n", delta, -1, ost->sync_opts, (int64_t)(get_sync_ipts(ost) * enc->sample_rate), fifo_size(&ost->fifo, ost->fifo.rptr)/(ost->st->codec.channels * 2)); av_resample_compensate(*(struct AVResampleContext**)ost->resample, comp, enc->sample_rate); } } }else - ost->sync_opts= lrintf(ost->sync_ipts * enc->sample_rate) + ost->sync_opts= lrintf(get_sync_ipts(ost) * enc->sample_rate) - fifo_size(&ost->fifo, ost->fifo.rptr)/(ost->st->codec.channels * 2); //FIXME wrong if (ost->audio_resample) { @@ -528,7 +581,7 @@ static void do_audio_out(AVFormatContext *s, pkt.data= audio_out; pkt.size= ret; if(enc->coded_frame) - pkt.pts= enc->coded_frame->pts; + pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); pkt.flags |= PKT_FLAG_KEY; av_interleaved_write_frame(s, &pkt); @@ -559,7 +612,7 @@ static void do_audio_out(AVFormatContext *s, pkt.data= audio_out; pkt.size= ret; if(enc->coded_frame) - pkt.pts= enc->coded_frame->pts; + pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); pkt.flags |= PKT_FLAG_KEY; av_interleaved_write_frame(s, &pkt); } @@ -638,19 +691,72 @@ static void fill_pad_region(AVPicture* img, int height, int width, optr = img->data[i] + (img->linesize[i] * (padtop >> shift)) + (img->linesize[i] - (padright >> shift)); - for (y = 0; y < ((height - (padtop + padbottom)) >> shift); y++) { + for (y = 0; y < ((height - (padtop + padbottom) - 1) >> shift); y++) { memset(optr, color[i], (padleft + padright) >> shift); optr += img->linesize[i]; } } - if (padbottom) { - optr = img->data[i] + (img->linesize[i] * ((height - padbottom) >> shift)); - memset(optr, color[i], ((img->linesize[i] * padbottom) >> shift)); + if (padbottom || padright) { + optr = img->data[i] + (((img->linesize[i] * (height - padbottom)) - padright) >> shift); + memset(optr, color[i], (((img->linesize[i] * padbottom) + padright) >> shift)); } } } +static void do_subtitle_out(AVFormatContext *s, + AVOutputStream *ost, + AVInputStream *ist, + AVSubtitle *sub, + int64_t pts) +{ + static uint8_t *subtitle_out = NULL; + int subtitle_out_max_size = 65536; + int subtitle_out_size, nb, i; + AVCodecContext *enc; + AVPacket pkt; + + if (pts == AV_NOPTS_VALUE) { + fprintf(stderr, "Subtitle packets must have a pts\n"); + return; + } + + enc = &ost->st->codec; + + if (!subtitle_out) { + subtitle_out = av_malloc(subtitle_out_max_size); + } + + /* Note: DVB subtitle need one packet to draw them and one other + packet to clear them */ + /* XXX: signal it in the codec context ? */ + if (enc->codec_id == CODEC_ID_DVB_SUBTITLE) + nb = 2; + else + nb = 1; + + for(i = 0; i < nb; i++) { + subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out, + subtitle_out_max_size, sub); + + av_init_packet(&pkt); + pkt.stream_index = ost->index; + pkt.data = subtitle_out; + pkt.size = subtitle_out_size; + pkt.pts = av_rescale_q(av_rescale_q(pts, ist->st->time_base, AV_TIME_BASE_Q) + input_files_ts_offset[ist->file_index], 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 */ + if (i == 0) + pkt.pts += 90 * sub->start_display_time; + else + pkt.pts += 90 * sub->end_display_time; + } + av_interleaved_write_frame(s, &pkt); + } +} + +static int bit_buffer_size= 1024*256; static uint8_t *bit_buffer= NULL; static void do_video_out(AVFormatContext *s, @@ -666,8 +772,6 @@ static void do_video_out(AVFormatContext *s, AVCodecContext *enc, *dec; enum PixelFormat target_pixfmt; -#define VIDEO_BUFFER_SIZE (1024*1024) - avcodec_get_frame_defaults(&picture_format_temp); avcodec_get_frame_defaults(&picture_crop_temp); @@ -681,12 +785,12 @@ static void do_video_out(AVFormatContext *s, if(video_sync_method){ double vdelta; - vdelta = ost->sync_ipts * enc->frame_rate / enc->frame_rate_base - ost->sync_opts; + 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 if (vdelta < -1.1) nb_frames = 0; else if (vdelta > 1.1) - nb_frames = lrintf(vdelta - 1.1 + 0.5); + nb_frames = lrintf(vdelta); //fprintf(stderr, "vdelta:%f, ost->sync_opts:%lld, ost->sync_ipts:%f nb_frames:%d\n", vdelta, ost->sync_opts, ost->sync_ipts, nb_frames); if (nb_frames == 0){ ++nb_frames_drop; @@ -698,8 +802,9 @@ static void do_video_out(AVFormatContext *s, fprintf(stderr, "*** %d dup!\n", nb_frames-1); } }else - ost->sync_opts= lrintf(ost->sync_ipts * enc->frame_rate / enc->frame_rate_base); + ost->sync_opts= lrintf(get_sync_ipts(ost) / av_q2d(enc->time_base)); + nb_frames= FFMIN(nb_frames, max_frames[CODEC_TYPE_VIDEO] - ost->frame_number); if (nb_frames <= 0) return; @@ -847,7 +952,7 @@ static void do_video_out(AVFormatContext *s, pkt.data= (uint8_t *)final_picture; pkt.size= sizeof(AVPicture); if(dec->coded_frame) - pkt.pts= dec->coded_frame->pts; + 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; @@ -876,20 +981,21 @@ static void do_video_out(AVFormatContext *s, if(!me_threshold) big_picture.pict_type = 0; // big_picture.pts = AV_NOPTS_VALUE; - big_picture.pts= av_rescale(ost->sync_opts, AV_TIME_BASE*(int64_t)enc->frame_rate_base, enc->frame_rate); + big_picture.pts= ost->sync_opts; +// big_picture.pts= av_rescale(ost->sync_opts, AV_TIME_BASE*(int64_t)enc->time_base.num, enc->time_base.den); //av_log(NULL, AV_LOG_DEBUG, "%lld -> encoder\n", ost->sync_opts); ret = avcodec_encode_video(enc, - bit_buffer, VIDEO_BUFFER_SIZE, + bit_buffer, bit_buffer_size, &big_picture); //enc->frame_number = enc->real_pict_num; - if(ret){ + if(ret>0){ pkt.data= bit_buffer; pkt.size= ret; if(enc->coded_frame) - pkt.pts= enc->coded_frame->pts; + pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); /*av_log(NULL, AV_LOG_DEBUG, "encoder -> %lld/%lld\n", - pkt.pts != AV_NOPTS_VALUE ? av_rescale(pkt.pts, enc->frame_rate, AV_TIME_BASE*(int64_t)enc->frame_rate_base) : -1, - pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->frame_rate, AV_TIME_BASE*(int64_t)enc->frame_rate_base) : -1);*/ + pkt.pts != AV_NOPTS_VALUE ? av_rescale(pkt.pts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1, + pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1);*/ if(enc->coded_frame && enc->coded_frame->key_frame) pkt.flags |= PKT_FLAG_KEY; @@ -932,7 +1038,7 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, if (!fvstats) { today2 = time(NULL); today = localtime(&today2); - sprintf(filename, "vstats_%02d%02d%02d.log", today->tm_hour, + snprintf(filename, sizeof(filename), "vstats_%02d%02d%02d.log", today->tm_hour, today->tm_min, today->tm_sec); fvstats = fopen(filename,"w"); @@ -952,11 +1058,11 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, fprintf(fvstats,"f_size= %6d ", frame_size); /* compute pts value */ - ti1 = (double)ost->sync_opts *enc->frame_rate_base / enc->frame_rate; + ti1 = ost->sync_opts * av_q2d(enc->time_base); if (ti1 < 0.01) ti1 = 0.01; - bitrate = (double)(frame_size * 8) * enc->frame_rate / enc->frame_rate_base / 1000.0; + bitrate = (frame_size * 8) / av_q2d(enc->time_base) / 1000.0; avg_bitrate = (double)(video_size * 8) / ti1 / 1000.0; fprintf(fvstats, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ", (double)video_size / 1024, ti1, bitrate, avg_bitrate); @@ -1003,21 +1109,21 @@ static void print_report(AVFormatContext **output_files, os = output_files[ost->file_index]; enc = &ost->st->codec; if (vid && enc->codec_type == CODEC_TYPE_VIDEO) { - sprintf(buf + strlen(buf), "q=%2.1f ", + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "q=%2.1f ", enc->coded_frame->quality/(float)FF_QP2LAMBDA); } if (!vid && enc->codec_type == CODEC_TYPE_VIDEO) { frame_number = ost->frame_number; - sprintf(buf + strlen(buf), "frame=%5d q=%2.1f ", + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "frame=%5d q=%2.1f ", frame_number, enc->coded_frame ? enc->coded_frame->quality/(float)FF_QP2LAMBDA : 0); if(is_last_report) - sprintf(buf + strlen(buf), "L"); + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "L"); if (enc->flags&CODEC_FLAG_PSNR){ int j; double error, error_sum=0; double scale, scale_sum=0; char type[3]= {'Y','U','V'}; - sprintf(buf + strlen(buf), "PSNR="); + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "PSNR="); for(j=0; j<3; j++){ if(is_last_report){ error= enc->error[j]; @@ -1029,9 +1135,9 @@ static void print_report(AVFormatContext **output_files, if(j) scale/=4; error_sum += error; scale_sum += scale; - sprintf(buf + strlen(buf), "%c:%2.2f ", type[j], psnr(error/scale)); + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%c:%2.2f ", type[j], psnr(error/scale)); } - sprintf(buf + strlen(buf), "*:%2.2f ", psnr(error_sum/scale_sum)); + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "*:%2.2f ", psnr(error_sum/scale_sum)); } vid = 1; } @@ -1046,12 +1152,12 @@ static void print_report(AVFormatContext **output_files, if (verbose || is_last_report) { bitrate = (double)(total_size * 8) / ti1 / 1000.0; - sprintf(buf + strlen(buf), + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "size=%8.0fkB time=%0.1f bitrate=%6.1fkbits/s", (double)total_size / 1024, ti1, bitrate); if (verbose > 1) - sprintf(buf + strlen(buf), " dup=%d drop=%d", + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d", nb_frames_dup, nb_frames_drop); if (verbose >= 0) @@ -1087,13 +1193,15 @@ static int output_packet(AVInputStream *ist, int ist_index, void *buffer_to_free; static int samples_size= 0; static short *samples= NULL; + AVSubtitle subtitle, *subtitle_to_free; + int got_subtitle; if(!pkt){ ist->pts= ist->next_pts; // needed for last packet if vsync=0 } else if (pkt->dts != AV_NOPTS_VALUE) { //FIXME seems redundant, as libavformat does this too - ist->next_pts = ist->pts = pkt->dts; + ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); } else { - assert(ist->pts == ist->next_pts); +// assert(ist->pts == ist->next_pts); } if (pkt == NULL) { @@ -1110,6 +1218,7 @@ static int output_packet(AVInputStream *ist, int ist_index, /* decode the packet if needed */ data_buf = NULL; /* fail safe */ data_size = 0; + subtitle_to_free = NULL; if (ist->decoding_needed) { switch(ist->st->codec.codec_type) { case CODEC_TYPE_AUDIO:{ @@ -1147,17 +1256,41 @@ static int output_packet(AVInputStream *ist, int ist_index, /* no picture yet */ goto discard_packet; } - if (ist->st->codec.frame_rate_base != 0) { + if (ist->st->codec.time_base.num != 0) { ist->next_pts += ((int64_t)AV_TIME_BASE * - ist->st->codec.frame_rate_base) / - ist->st->codec.frame_rate; + ist->st->codec.time_base.num) / + ist->st->codec.time_base.den; } len = 0; break; - default: + case CODEC_TYPE_SUBTITLE: + ret = avcodec_decode_subtitle(&ist->st->codec, + &subtitle, &got_subtitle, ptr, len); + if (ret < 0) goto fail_decode; + if (!got_subtitle) { + goto discard_packet; + } + subtitle_to_free = &subtitle; + len = 0; + break; + default: + 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; } - } else { data_buf = ptr; data_size = len; ret = len; @@ -1170,9 +1303,23 @@ static int output_packet(AVInputStream *ist, int ist_index, &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.frame_rate_base, 1000000, ist->st->codec.frame_rate); + 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); @@ -1210,7 +1357,7 @@ static int output_packet(AVInputStream *ist, int ist_index, ((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])/ AV_TIME_BASE; + //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) { @@ -1223,6 +1370,10 @@ static int output_packet(AVInputStream *ist, int ist_index, 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(); } @@ -1240,23 +1391,42 @@ static int output_packet(AVInputStream *ist, int ist_index, if(ost->st->codec.codec_type == CODEC_TYPE_AUDIO) audio_size += data_size; - else if (ost->st->codec.codec_type == CODEC_TYPE_VIDEO) + else if (ost->st->codec.codec_type == CODEC_TYPE_VIDEO) { video_size += data_size; + ost->sync_opts++; + } opkt.stream_index= ost->index; - opkt.data= data_buf; - opkt.size= data_size; - opkt.pts= pkt->pts + input_files_ts_offset[ist->file_index]; - opkt.dts= pkt->dts + input_files_ts_offset[ist->file_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(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; av_interleaved_write_frame(os, &opkt); 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) { + av_free(subtitle_to_free->bitmap); + av_free(subtitle_to_free->rgba_palette); + subtitle_to_free = NULL; + } } discard_packet: if (pkt == NULL) { @@ -1281,12 +1451,12 @@ static int output_packet(AVInputStream *ist, int ist_index, switch(ost->st->codec.codec_type) { case CODEC_TYPE_AUDIO: - ret = avcodec_encode_audio(enc, bit_buffer, VIDEO_BUFFER_SIZE, NULL); + ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, NULL); audio_size += ret; pkt.flags |= PKT_FLAG_KEY; break; case CODEC_TYPE_VIDEO: - ret = avcodec_encode_video(enc, bit_buffer, VIDEO_BUFFER_SIZE, NULL); + ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, NULL); video_size += ret; if(enc->coded_frame && enc->coded_frame->key_frame) pkt.flags |= PKT_FLAG_KEY; @@ -1303,7 +1473,7 @@ static int output_packet(AVInputStream *ist, int ist_index, pkt.data= bit_buffer; pkt.size= ret; if(enc->coded_frame) - pkt.pts= enc->coded_frame->pts; + pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); av_interleaved_write_frame(os, &pkt); } } @@ -1338,11 +1508,6 @@ static int av_encode(AVFormatContext **output_files, file_table= (AVInputFile*) av_mallocz(nb_input_files * sizeof(AVInputFile)); if (!file_table) goto fail; - - if (!bit_buffer) - bit_buffer = av_malloc(VIDEO_BUFFER_SIZE); - if (!bit_buffer) - goto fail; /* input stream init */ j = 0; @@ -1403,6 +1568,13 @@ static int av_encode(AVFormatContext **output_files, fprintf(stderr,"Could not find input stream #%d.%d\n", fi, si); exit(1); } + fi = stream_maps[i].sync_file_index; + si = stream_maps[i].sync_stream_index; + if (fi < 0 || fi > nb_input_files - 1 || + si < 0 || si > file_table[fi].nb_streams - 1) { + fprintf(stderr,"Could not find sync stream #%d.%d\n", fi, si); + exit(1); + } } ost_table = av_mallocz(sizeof(AVOutputStream *) * nb_ostreams); @@ -1467,6 +1639,9 @@ static int av_encode(AVFormatContext **output_files, } ist = ist_table[ost->source_index]; ist->discard = 0; + ost->sync_ist = (nb_stream_maps > 0) ? + ist_table[file_table[stream_maps[n-1].sync_file_index].ist_index + + stream_maps[n-1].sync_stream_index] : ist; } } @@ -1482,19 +1657,24 @@ static int av_encode(AVFormatContext **output_files, /* if stream_copy is selected, no need to decode or encode */ codec->codec_id = icodec->codec_id; codec->codec_type = icodec->codec_type; - codec->codec_tag = icodec->codec_tag; + if(!codec->codec_tag) codec->codec_tag = icodec->codec_tag; codec->bit_rate = icodec->bit_rate; + codec->extradata= icodec->extradata; + codec->extradata_size= icodec->extradata_size; switch(codec->codec_type) { case CODEC_TYPE_AUDIO: codec->sample_rate = icodec->sample_rate; codec->channels = icodec->channels; codec->frame_size = icodec->frame_size; + codec->block_align= icodec->block_align; break; case CODEC_TYPE_VIDEO: - codec->frame_rate = icodec->frame_rate; - codec->frame_rate_base = icodec->frame_rate_base; + codec->time_base = icodec->time_base; codec->width = icodec->width; codec->height = icodec->height; + codec->has_b_frames = icodec->has_b_frames; + break; + case CODEC_TYPE_SUBTITLE: break; default: av_abort(); @@ -1603,8 +1783,13 @@ static int av_encode(AVFormatContext **output_files, ost->encoding_needed = 1; ist->decoding_needed = 1; break; + case CODEC_TYPE_SUBTITLE: + ost->encoding_needed = 1; + ist->decoding_needed = 1; + break; default: av_abort(); + break; } /* two pass mode */ if (ost->encoding_needed && @@ -1646,8 +1831,17 @@ static int av_encode(AVFormatContext **output_files, } } } + if(codec->codec_type == CODEC_TYPE_VIDEO){ + int size= codec->width * codec->height; + bit_buffer_size= FFMAX(bit_buffer_size, 4*size); + } } + if (!bit_buffer) + bit_buffer = av_malloc(bit_buffer_size); + if (!bit_buffer) + goto fail; + /* dump the file output parameters - cannot be done before in case of stream copy */ for(i=0;i #%d.%d\n", + fprintf(stderr, " Stream #%d.%d -> #%d.%d", ist_table[ost->source_index]->file_index, ist_table[ost->source_index]->index, ost->file_index, ost->index); + if (ost->sync_ist != ist_table[ost->source_index]) + fprintf(stderr, " [sync #%d.%d]", + ost->sync_ist->file_index, + ost->sync_ist->index); + fprintf(stderr, "\n"); } } @@ -1679,7 +1878,7 @@ static int av_encode(AVFormatContext **output_files, exit(1); } if (avcodec_open(&ost->st->codec, codec) < 0) { - fprintf(stderr, "Error while opening codec for stream #%d.%d - maybe incorrect parameters such as bit_rate, rate, width or height\n", + fprintf(stderr, "Error while opening codec for output stream #%d.%d - maybe incorrect parameters such as bit_rate, rate, width or height\n", ost->file_index, ost->index); exit(1); } @@ -1713,9 +1912,11 @@ static int av_encode(AVFormatContext **output_files, ist = ist_table[i]; is = input_files[ist->file_index]; ist->pts = 0; - ist->next_pts = ist->st->start_time; - if(ist->next_pts == AV_NOPTS_VALUE) + ist->next_pts = av_rescale_q(ist->st->start_time, ist->st->time_base, AV_TIME_BASE_Q); + if(ist->st->start_time == AV_NOPTS_VALUE) ist->next_pts=0; + if(input_files_ts_offset[ist->file_index]) + ist->next_pts= AV_NOPTS_VALUE; ist->is_start = 1; } @@ -1804,9 +2005,9 @@ static int av_encode(AVFormatContext **output_files, os = output_files[ost->file_index]; ist = ist_table[ost->source_index]; if(ost->st->codec.codec_type == CODEC_TYPE_VIDEO) - opts = (double)ost->sync_opts * ost->st->codec.frame_rate_base / ost->st->codec.frame_rate; + opts = ost->sync_opts * av_q2d(ost->st->codec.time_base); else - opts = (double)ost->st->pts.val * ost->st->time_base.num / ost->st->time_base.den; + opts = ost->st->pts.val * av_q2d(ost->st->time_base); ipts = (double)ist->pts; if (!file_table[ist->file_index].eof_reached){ if(ipts < ipts_min) { @@ -1818,6 +2019,10 @@ static int av_encode(AVFormatContext **output_files, if(!input_sync) file_index = ist->file_index; } } + if(ost->frame_number >= max_frames[ost->st->codec.codec_type]){ + file_index= -1; + break; + } } /* if none, if is finished */ if (file_index < 0) { @@ -1828,11 +2033,15 @@ static int av_encode(AVFormatContext **output_files, if (recording_time > 0 && opts_min >= (recording_time / 1000000.0)) break; + /* finish if limit size exhausted */ + if (limit_filesize != 0 && (limit_filesize * 1024) < url_ftell(&output_files[0]->pb)) + break; + /* read a frame from it and output it in the fifo */ is = input_files[file_index]; if (av_read_frame(is, &pkt) < 0) { file_table[file_index].eof_reached = 1; - continue; + if (opt_shortest) break; else continue; // } if (!pkt.size) { @@ -1853,8 +2062,8 @@ static int av_encode(AVFormatContext **output_files, goto discard_packet; // fprintf(stderr, "next:%lld dts:%lld off:%lld %d\n", ist->next_pts, pkt.dts, input_files_ts_offset[ist->file_index], ist->st->codec.codec_type); - if (pkt.dts != AV_NOPTS_VALUE) { - int64_t delta= pkt.dts - ist->next_pts; + if (pkt.dts != AV_NOPTS_VALUE && ist->next_pts != AV_NOPTS_VALUE) { + int64_t delta= av_rescale_q(pkt.dts, ist->st->time_base, AV_TIME_BASE_Q) - ist->next_pts; if(ABS(delta) > 10LL*AV_TIME_BASE && !copy_ts){ input_files_ts_offset[ist->file_index]-= delta; if (verbose > 2) @@ -1877,7 +2086,7 @@ static int av_encode(AVFormatContext **output_files, av_free_packet(&pkt); goto redo; } - + discard_packet: av_free_packet(&pkt); @@ -1925,6 +2134,7 @@ static int av_encode(AVFormatContext **output_files, ret = 0; fail1: + av_freep(&bit_buffer); av_free(file_table); if (ist_table) { @@ -2001,8 +2211,9 @@ static void opt_format(const char *arg) { /* compatibility stuff for pgmyuv */ if (!strcmp(arg, "pgmyuv")) { - opt_image_format(arg); - arg = "image"; + pgmyuv_compatibility_hack=1; +// opt_image_format(arg); + arg = "image2"; } file_iformat = av_find_input_format(arg); @@ -2087,6 +2298,7 @@ static void opt_error_concealment(const char *arg) static void opt_debug(const char *arg) { debug = atoi(arg); + av_log_set_level(AV_LOG_DEBUG); } static void opt_vismv(const char *arg) @@ -2394,6 +2606,36 @@ static void opt_qscale(const char *arg) } } +static void opt_qsquish(const char *arg) +{ + video_qsquish = atof(arg); + if (video_qsquish < 0.0 || + video_qsquish > 99.0) { + fprintf(stderr, "qsquish must be >= 0.0 and <= 99.0\n"); + exit(1); + } +} + +static void opt_lelim(const char *arg) +{ + video_lelim = atoi(arg); + if (video_lelim < -99 || + video_lelim > 99) { + fprintf(stderr, "lelim must be >= -99 and <= 99\n"); + exit(1); + } +} + +static void opt_celim(const char *arg) +{ + video_celim = atoi(arg); + if (video_celim < -99 || + video_celim > 99) { + fprintf(stderr, "celim must be >= -99 and <= 99\n"); + exit(1); + } +} + static void opt_lmax(const char *arg) { video_lmax = atof(arg)*FF_QP2LAMBDA; @@ -2407,7 +2649,7 @@ static void opt_lmin(const char *arg) static void opt_qmin(const char *arg) { video_qmin = atoi(arg); - if (video_qmin < 0 || + if (video_qmin < 1 || video_qmin > 31) { fprintf(stderr, "qmin must be >= 1 and <= 31\n"); exit(1); @@ -2417,29 +2659,29 @@ static void opt_qmin(const char *arg) static void opt_qmax(const char *arg) { video_qmax = atoi(arg); - if (video_qmax < 0 || + if (video_qmax < 1 || video_qmax > 31) { fprintf(stderr, "qmax must be >= 1 and <= 31\n"); exit(1); } } -static void opt_mb_qmin(const char *arg) +static void opt_mb_lmin(const char *arg) { - video_mb_qmin = atoi(arg); - if (video_mb_qmin < 0 || - video_mb_qmin > 31) { - fprintf(stderr, "qmin must be >= 1 and <= 31\n"); + video_mb_lmin = atof(arg)*FF_QP2LAMBDA; + if (video_mb_lmin < 1 || + video_mb_lmin > FF_LAMBDA_MAX) { + fprintf(stderr, "mblmin must be >= 1 and <= %d\n", FF_LAMBDA_MAX / FF_QP2LAMBDA); exit(1); } } -static void opt_mb_qmax(const char *arg) +static void opt_mb_lmax(const char *arg) { - video_mb_qmax = atoi(arg); - if (video_mb_qmax < 0 || - video_mb_qmax > 31) { - fprintf(stderr, "qmax must be >= 1 and <= 31\n"); + video_mb_lmax = atof(arg)*FF_QP2LAMBDA; + if (video_mb_lmax < 1 || + video_mb_lmax > FF_LAMBDA_MAX) { + fprintf(stderr, "mblmax must be >= 1 and <= %d\n", FF_LAMBDA_MAX / FF_QP2LAMBDA); exit(1); } } @@ -2537,7 +2779,7 @@ static void opt_me_range(const char *arg) static void opt_thread_count(const char *arg) { thread_count= atoi(arg); -#if !defined(HAVE_PTHREADS) && !defined(HAVE_W32THREADS) +#if !defined(HAVE_THREADS) if (verbose >= 0) fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n"); #endif @@ -2563,6 +2805,11 @@ 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); @@ -2578,34 +2825,52 @@ static void opt_audio_device(const char *arg) audio_device = av_strdup(arg); } -static void opt_dv1394(const char *arg) -{ - video_grab_format = "dv1394"; - audio_grab_format = NULL; -} - -static void opt_audio_codec(const char *arg) +static void opt_codec(int *pstream_copy, int *pcodec_id, + int codec_type, const char *arg) { AVCodec *p; if (!strcmp(arg, "copy")) { - audio_stream_copy = 1; + *pstream_copy = 1; } else { p = first_avcodec; while (p) { - if (!strcmp(p->name, arg) && p->type == CODEC_TYPE_AUDIO) + if (!strcmp(p->name, arg) && p->type == codec_type) break; p = p->next; } if (p == NULL) { - fprintf(stderr, "Unknown audio codec '%s'\n", arg); + fprintf(stderr, "Unknown codec '%s'\n", arg); exit(1); } else { - audio_codec_id = p->id; + *pcodec_id = p->id; } } } +static void opt_audio_codec(const char *arg) +{ + opt_codec(&audio_stream_copy, &audio_codec_id, CODEC_TYPE_AUDIO, arg); +} + +static void opt_audio_tag(const char *arg) +{ + char *tail; + audio_codec_tag= strtol(arg, &tail, 0); + + if(!tail || *tail) + audio_codec_tag= arg[0] + (arg[1]<<8) + (arg[2]<<16) + (arg[3]<<24); +} + +static void opt_video_tag(const char *arg) +{ + char *tail; + video_codec_tag= strtol(arg, &tail, 0); + + if(!tail || *tail) + video_codec_tag= arg[0] + (arg[1]<<8) + (arg[2]<<16) + (arg[3]<<24); +} + static void add_frame_hooker(const char *arg) { int argc = 0; @@ -2655,24 +2920,12 @@ static void opt_motion_estimation(const char *arg) static void opt_video_codec(const char *arg) { - AVCodec *p; + opt_codec(&video_stream_copy, &video_codec_id, CODEC_TYPE_VIDEO, arg); +} - if (!strcmp(arg, "copy")) { - video_stream_copy = 1; - } else { - p = first_avcodec; - while (p) { - if (!strcmp(p->name, arg) && p->type == CODEC_TYPE_VIDEO) - break; - p = p->next; - } - if (p == NULL) { - fprintf(stderr, "Unknown video codec '%s'\n", arg); - exit(1); - } else { - video_codec_id = p->id; - } - } +static void opt_subtitle_codec(const char *arg) +{ + opt_codec(&subtitle_stream_copy, &subtitle_codec_id, CODEC_TYPE_SUBTITLE, arg); } static void opt_map(const char *arg) @@ -2688,6 +2941,16 @@ static void opt_map(const char *arg) p++; m->stream_index = strtol(p, (char **)&p, 0); + if (*p) { + p++; + m->sync_file_index = strtol(p, (char **)&p, 0); + if (*p) + p++; + m->sync_stream_index = strtol(p, (char **)&p, 0); + } else { + m->sync_file_index = m->file_index; + m->sync_stream_index = m->stream_index; + } } static void opt_map_meta_data(const char *arg) @@ -2735,19 +2998,26 @@ static void opt_input_file(const char *filename) if (!strcmp(filename, "-")) filename = "pipe:"; - using_stdin |= !strcmp(filename, "pipe:" ) || + using_stdin |= !strncmp(filename, "pipe:", 5) || !strcmp( filename, "/dev/stdin" ); /* get default parameters from command line */ memset(ap, 0, sizeof(*ap)); ap->sample_rate = audio_sample_rate; ap->channels = audio_channels; - ap->frame_rate = frame_rate; - ap->frame_rate_base = frame_rate_base; + ap->time_base.den = frame_rate; + 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; + ap->audio_codec_id = audio_codec_id; + if(pgmyuv_compatibility_hack) + ap->video_codec_id= CODEC_ID_PGMYUV; /* open the input file with generic libav function */ err = av_open_input_file(&ic, filename, file_iformat, 0, ap); @@ -2771,7 +3041,7 @@ static void opt_input_file(const char *filename) /* if seeking requested, we execute it */ if (start_time != 0) { - ret = av_seek_frame(ic, -1, timestamp); + ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD); if (ret < 0) { fprintf(stderr, "%s: could not seek to position %0.3f\n", filename, (double)timestamp / AV_TIME_BASE); @@ -2783,7 +3053,7 @@ static void opt_input_file(const char *filename) /* update the current parameters so that they match the one of the input stream */ for(i=0;inb_streams;i++) { AVCodecContext *enc = &ic->streams[i]->codec; -#if defined(HAVE_PTHREADS) || defined(HAVE_W32THREADS) +#if defined(HAVE_THREADS) if(thread_count>1) avcodec_thread_init(enc, thread_count); #endif @@ -2793,14 +3063,16 @@ static void opt_input_file(const char *filename) //fprintf(stderr, "\nInput Audio channels: %d", enc->channels); audio_channels = enc->channels; audio_sample_rate = enc->sample_rate; + if(audio_disable) + ic->streams[i]->discard= AVDISCARD_ALL; break; case CODEC_TYPE_VIDEO: frame_height = enc->height; frame_width = enc->width; frame_aspect_ratio = av_q2d(enc->sample_aspect_ratio) * enc->width / enc->height; frame_pix_fmt = enc->pix_fmt; - rfps = ic->streams[i]->r_frame_rate; - rfps_base = ic->streams[i]->r_frame_rate_base; + rfps = ic->streams[i]->r_frame_rate.num; + rfps_base = ic->streams[i]->r_frame_rate.den; enc->workaround_bugs = workaround_bugs; enc->error_resilience = error_resilience; enc->error_concealment = error_concealment; @@ -2808,28 +3080,36 @@ static void opt_input_file(const char *filename) enc->debug = debug; enc->debug_mv = debug_mv; enc->lowres= lowres; + if(lowres) enc->flags |= CODEC_FLAG_EMU_EDGE; if(bitexact) enc->flags|= CODEC_FLAG_BITEXACT; if(me_threshold) enc->debug |= FF_DEBUG_MV; + if(gray_only) + enc->flags |= CODEC_FLAG_GRAY; - assert(enc->frame_rate_base == rfps_base); // should be true for now - if (enc->frame_rate != rfps) { + 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->%2.2f\n", - i, (float)enc->frame_rate / enc->frame_rate_base, + fprintf(stderr,"\nSeems that stream %d comes from film source: %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); + (float)rfps / rfps_base, rfps, rfps_base); } /* update the current frame rate to match the stream frame rate */ frame_rate = rfps; frame_rate_base = rfps_base; enc->rate_emu = rate_emu; + if(video_disable) + ic->streams[i]->discard= AVDISCARD_ALL; + else if(video_discard) + ic->streams[i]->discard= video_discard; break; case CODEC_TYPE_DATA: break; + case CODEC_TYPE_SUBTITLE: + break; default: av_abort(); } @@ -2846,9 +3126,18 @@ static void opt_input_file(const char *filename) 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; @@ -2868,6 +3157,7 @@ static void check_audio_video_inputs(int *has_video_ptr, int *has_audio_ptr) has_video = 1; break; case CODEC_TYPE_DATA: + case CODEC_TYPE_SUBTITLE: break; default: av_abort(); @@ -2878,12 +3168,411 @@ static void check_audio_video_inputs(int *has_video_ptr, int *has_audio_ptr) *has_audio_ptr = has_audio; } -static void opt_output_file(const char *filename) +static void new_video_stream(AVFormatContext *oc) { AVStream *st; - AVFormatContext *oc; - int use_video, use_audio, nb_streams, input_has_video, input_has_audio; + AVCodecContext *video_enc; + int codec_id; + + st = av_new_stream(oc, oc->nb_streams); + if (!st) { + fprintf(stderr, "Could not alloc stream\n"); + exit(1); + } +#if defined(HAVE_THREADS) + if(thread_count>1) + avcodec_thread_init(&st->codec, thread_count); +#endif + + video_enc = &st->codec; + + if(video_codec_tag) + video_enc->codec_tag= video_codec_tag; + + if( (video_global_header&1) + || (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))) + video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; + if(video_global_header&2) + video_enc->flags2 |= CODEC_FLAG2_LOCAL_HEADER; + + if (video_stream_copy) { + st->stream_copy = 1; + video_enc->codec_type = CODEC_TYPE_VIDEO; + } else { + char *p; + int i; + AVCodec *codec; + + codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO); + if (video_codec_id != CODEC_ID_NONE) + codec_id = video_codec_id; + + video_enc->codec_id = codec_id; + codec = avcodec_find_encoder(codec_id); + + video_enc->bit_rate = video_bit_rate; + video_enc->bit_rate_tolerance = video_bit_rate_tolerance; + video_enc->time_base.den = frame_rate; + video_enc->time_base.num = frame_rate_base; + if(codec && codec->supported_framerates){ + const AVRational *p= codec->supported_framerates; + AVRational req= (AVRational){frame_rate, frame_rate_base}; + const AVRational *best=NULL; + AVRational best_error= (AVRational){INT_MAX, 1}; + for(; p->den!=0; p++){ + AVRational error= av_sub_q(req, *p); + if(error.num <0) error.num *= -1; + if(av_cmp_q(error, best_error) < 0){ + best_error= error; + best= p; + } + } + video_enc->time_base.den= best->num; + video_enc->time_base.num= best->den; + } + + video_enc->width = frame_width + frame_padright + frame_padleft; + video_enc->height = frame_height + frame_padtop + frame_padbottom; + video_enc->sample_aspect_ratio = av_d2q(frame_aspect_ratio*frame_height/frame_width, 255); + video_enc->pix_fmt = frame_pix_fmt; + + if(codec && codec->pix_fmts){ + const enum PixelFormat *p= codec->pix_fmts; + for(; *p!=-1; p++){ + if(*p == video_enc->pix_fmt) + break; + } + if(*p == -1) + video_enc->pix_fmt = codec->pix_fmts[0]; + } + + if (!intra_only) + video_enc->gop_size = gop_size; + else + video_enc->gop_size = 0; + if (video_qscale || same_quality) { + video_enc->flags |= CODEC_FLAG_QSCALE; + video_enc->global_quality= + st->quality = FF_QP2LAMBDA * video_qscale; + } + + if(intra_matrix) + video_enc->intra_matrix = intra_matrix; + if(inter_matrix) + video_enc->inter_matrix = inter_matrix; + + if(bitexact) + video_enc->flags |= CODEC_FLAG_BITEXACT; + + video_enc->mb_decision = mb_decision; + video_enc->mb_cmp = mb_cmp; + video_enc->ildct_cmp = ildct_cmp; + video_enc->me_sub_cmp = sub_cmp; + video_enc->me_cmp = cmp; + video_enc->me_pre_cmp = pre_cmp; + video_enc->pre_me = pre_me; + video_enc->lumi_masking = lumi_mask; + video_enc->dark_masking = dark_mask; + video_enc->spatial_cplx_masking = scplx_mask; + video_enc->temporal_cplx_masking = tcplx_mask; + video_enc->p_masking = p_mask; + video_enc->quantizer_noise_shaping= qns; + + if (use_umv) { + video_enc->flags |= CODEC_FLAG_H263P_UMV; + } + if (use_ss) { + video_enc->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; + } + if (use_aic) { + video_enc->flags |= CODEC_FLAG_H263P_AIC; + } + if (use_aiv) { + video_enc->flags |= CODEC_FLAG_H263P_AIV; + } + if (use_4mv) { + video_enc->flags |= CODEC_FLAG_4MV; + } + if (use_obmc) { + video_enc->flags |= CODEC_FLAG_OBMC; + } + if (use_loop) { + video_enc->flags |= CODEC_FLAG_LOOP_FILTER; + } + + if(use_part) { + video_enc->flags |= CODEC_FLAG_PART; + } + if (use_alt_scan) { + video_enc->flags |= CODEC_FLAG_ALT_SCAN; + } + if (use_trell) { + video_enc->flags |= CODEC_FLAG_TRELLIS_QUANT; + } + if (use_mv0) { + video_enc->flags |= CODEC_FLAG_MV0; + } + if (do_normalize_aqp) { + video_enc->flags |= CODEC_FLAG_NORMALIZE_AQP; + } + if (use_scan_offset) { + video_enc->flags |= CODEC_FLAG_SVCD_SCAN_OFFSET; + } + if (closed_gop) { + video_enc->flags |= CODEC_FLAG_CLOSED_GOP; + } + if (strict_gop) { + video_enc->flags2 |= CODEC_FLAG2_STRICT_GOP; + } + if (use_qpel) { + video_enc->flags |= CODEC_FLAG_QPEL; + } + if (use_qprd) { + video_enc->flags |= CODEC_FLAG_QP_RD; + } + if (use_cbprd) { + video_enc->flags |= CODEC_FLAG_CBP_RD; + } + if (b_frames) { + video_enc->max_b_frames = b_frames; + video_enc->b_frame_strategy = b_strategy; + video_enc->b_quant_factor = 2.0; + } + if (do_interlace_dct) { + video_enc->flags |= CODEC_FLAG_INTERLACED_DCT; + } + if (do_interlace_me) { + video_enc->flags |= CODEC_FLAG_INTERLACED_ME; + } + if (no_output) { + video_enc->flags2 |= CODEC_FLAG2_NO_OUTPUT; + } + if (gray_only) { + video_enc->flags |= CODEC_FLAG_GRAY; + } + video_enc->qmin = video_qmin; + video_enc->qmax = video_qmax; + video_enc->lmin = video_lmin; + video_enc->lmax = video_lmax; + video_enc->rc_qsquish = video_qsquish; + video_enc->luma_elim_threshold = video_lelim; + video_enc->chroma_elim_threshold = video_celim; + video_enc->mb_lmin = video_mb_lmin; + video_enc->mb_lmax = video_mb_lmax; + video_enc->max_qdiff = video_qdiff; + video_enc->qblur = video_qblur; + video_enc->qcompress = video_qcomp; + video_enc->rc_eq = video_rc_eq; + video_enc->debug = debug; + video_enc->debug_mv = debug_mv; + video_enc->workaround_bugs = workaround_bugs; + video_enc->thread_count = thread_count; + p= video_rc_override_string; + for(i=0; p; i++){ + int start, end, q; + int e=sscanf(p, "%d,%d,%d", &start, &end, &q); + if(e!=3){ + fprintf(stderr, "error parsing rc_override\n"); + exit(1); + } + video_enc->rc_override= + av_realloc(video_enc->rc_override, + sizeof(RcOverride)*(i+1)); + video_enc->rc_override[i].start_frame= start; + video_enc->rc_override[i].end_frame = end; + if(q>0){ + video_enc->rc_override[i].qscale= q; + video_enc->rc_override[i].quality_factor= 1.0; + } + else{ + video_enc->rc_override[i].qscale= 0; + video_enc->rc_override[i].quality_factor= -q/100.0; + } + p= strchr(p, '/'); + if(p) p++; + } + video_enc->rc_override_count=i; + + video_enc->rc_max_rate = video_rc_max_rate; + video_enc->rc_min_rate = video_rc_min_rate; + video_enc->rc_buffer_size = video_rc_buffer_size; + video_enc->rc_initial_buffer_occupancy = video_rc_buffer_size*3/4; + video_enc->rc_buffer_aggressivity= video_rc_buffer_aggressivity; + video_enc->rc_initial_cplx= video_rc_initial_cplx; + video_enc->i_quant_factor = video_i_qfactor; + video_enc->b_quant_factor = video_b_qfactor; + video_enc->i_quant_offset = video_i_qoffset; + video_enc->b_quant_offset = video_b_qoffset; + video_enc->intra_quant_bias = video_intra_quant_bias; + video_enc->inter_quant_bias = video_inter_quant_bias; + video_enc->dct_algo = dct_algo; + video_enc->idct_algo = idct_algo; + video_enc->me_threshold= me_threshold; + video_enc->mb_threshold= mb_threshold; + video_enc->intra_dc_precision= intra_dc_precision - 8; + video_enc->strict_std_compliance = strict; + video_enc->error_rate = error_rate; + video_enc->noise_reduction= noise_reduction; + video_enc->scenechange_threshold= sc_threshold; + video_enc->me_range = me_range; + video_enc->coder_type= coder; + video_enc->context_model= context; + video_enc->prediction_method= predictor; + video_enc->profile= video_profile; + video_enc->level= video_level; + video_enc->nsse_weight= nsse_weight; + video_enc->me_subpel_quality= subpel_quality; + video_enc->me_penalty_compensation= me_penalty_compensation; + video_enc->frame_skip_threshold= frame_skip_threshold; + video_enc->frame_skip_factor= frame_skip_factor; + video_enc->frame_skip_exp= frame_skip_exp; + video_enc->frame_skip_cmp= frame_skip_cmp; + + if(packet_size){ + video_enc->rtp_mode= 1; + video_enc->rtp_payload_size= packet_size; + } + + if (do_psnr) + video_enc->flags|= CODEC_FLAG_PSNR; + + video_enc->me_method = me_method; + + /* two pass mode */ + if (do_pass) { + if (do_pass == 1) { + video_enc->flags |= CODEC_FLAG_PASS1; + } else { + video_enc->flags |= CODEC_FLAG_PASS2; + } + } + } + + /* reset some key parameters */ + video_disable = 0; + video_codec_id = CODEC_ID_NONE; + video_stream_copy = 0; +} + +static void new_audio_stream(AVFormatContext *oc) +{ + AVStream *st; + AVCodecContext *audio_enc; int codec_id; + + st = av_new_stream(oc, oc->nb_streams); + if (!st) { + fprintf(stderr, "Could not alloc stream\n"); + exit(1); + } +#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; + + if(audio_codec_tag) + audio_enc->codec_tag= audio_codec_tag; + + if (oc->oformat->flags & AVFMT_GLOBALHEADER) + audio_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; + if (audio_stream_copy) { + st->stream_copy = 1; + audio_enc->channels = audio_channels; + } else { + codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_AUDIO); + if (audio_codec_id != CODEC_ID_NONE) + codec_id = audio_codec_id; + audio_enc->codec_id = codec_id; + + audio_enc->bit_rate = audio_bit_rate; + 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->sample_rate = audio_sample_rate; + if (audio_language) { + pstrcpy(st->language, sizeof(st->language), audio_language); + av_free(audio_language); + audio_language = NULL; + } + + /* reset some key parameters */ + audio_disable = 0; + audio_codec_id = CODEC_ID_NONE; + audio_stream_copy = 0; +} + +static void opt_new_subtitle_stream(void) +{ + AVFormatContext *oc; + AVStream *st; + AVCodecContext *subtitle_enc; + + if (nb_output_files <= 0) { + fprintf(stderr, "At least one output file must be specified\n"); + exit(1); + } + oc = output_files[nb_output_files - 1]; + + st = av_new_stream(oc, oc->nb_streams); + if (!st) { + fprintf(stderr, "Could not alloc stream\n"); + exit(1); + } + + subtitle_enc = &st->codec; + subtitle_enc->codec_type = CODEC_TYPE_SUBTITLE; + if (subtitle_stream_copy) { + st->stream_copy = 1; + } else { + subtitle_enc->codec_id = subtitle_codec_id; + } + + if (subtitle_language) { + pstrcpy(st->language, sizeof(st->language), subtitle_language); + av_free(subtitle_language); + subtitle_language = NULL; + } + + subtitle_codec_id = CODEC_ID_NONE; + subtitle_stream_copy = 0; +} + +static void opt_new_audio_stream(void) +{ + AVFormatContext *oc; + if (nb_output_files <= 0) { + fprintf(stderr, "At least one output file must be specified\n"); + exit(1); + } + oc = output_files[nb_output_files - 1]; + new_audio_stream(oc); +} + +static void opt_new_video_stream(void) +{ + AVFormatContext *oc; + if (nb_output_files <= 0) { + fprintf(stderr, "At least one output file must be specified\n"); + exit(1); + } + oc = output_files[nb_output_files - 1]; + new_video_stream(oc); +} + +static void opt_output_file(const char *filename) +{ + AVFormatContext *oc; + int use_video, use_audio, input_has_video, input_has_audio; AVFormatParameters params, *ap = ¶ms; if (!strcmp(filename, "-")) @@ -2901,6 +3590,7 @@ static void opt_output_file(const char *filename) } oc->oformat = file_oformat; + pstrcpy(oc->filename, sizeof(oc->filename), filename); if (!strcmp(file_oformat->name, "ffm") && strstart(filename, "http:", NULL)) { @@ -2932,297 +3622,15 @@ static void opt_output_file(const char *filename) use_video = 0; } - nb_streams = 0; if (use_video) { - AVCodecContext *video_enc; - - st = av_new_stream(oc, nb_streams++); - if (!st) { - fprintf(stderr, "Could not alloc stream\n"); - exit(1); - } -#if defined(HAVE_PTHREADS) || defined(HAVE_W32THREADS) - if(thread_count>1) - avcodec_thread_init(&st->codec, thread_count); -#endif - - video_enc = &st->codec; - - if(!strcmp(file_oformat->name, "mp4") || !strcmp(file_oformat->name, "mov") || !strcmp(file_oformat->name, "3gp")) - video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; - if (video_stream_copy) { - st->stream_copy = 1; - video_enc->codec_type = CODEC_TYPE_VIDEO; - } else { - char *p; - int i; - AVCodec *codec; - - codec_id = file_oformat->video_codec; - if (video_codec_id != CODEC_ID_NONE) - codec_id = video_codec_id; - - video_enc->codec_id = codec_id; - codec = avcodec_find_encoder(codec_id); - - video_enc->bit_rate = video_bit_rate; - video_enc->bit_rate_tolerance = video_bit_rate_tolerance; - video_enc->frame_rate = frame_rate; - video_enc->frame_rate_base = frame_rate_base; - if(codec && codec->supported_framerates){ - const AVRational *p= codec->supported_framerates; - AVRational req= (AVRational){frame_rate, frame_rate_base}; - const AVRational *best=NULL; - AVRational best_error= (AVRational){INT_MAX, 1}; - for(; p->den!=0; p++){ - AVRational error= av_sub_q(req, *p); - if(error.num <0) error.num *= -1; - if(av_cmp_q(error, best_error) < 0){ - best_error= error; - best= p; - } - } - video_enc->frame_rate = best->num; - video_enc->frame_rate_base= best->den; - } - - video_enc->width = frame_width + frame_padright + frame_padleft; - video_enc->height = frame_height + frame_padtop + frame_padbottom; - video_enc->sample_aspect_ratio = av_d2q(frame_aspect_ratio*frame_height/frame_width, 255); - video_enc->pix_fmt = frame_pix_fmt; - - if(codec && codec->pix_fmts){ - const enum PixelFormat *p= codec->pix_fmts; - for(; *p!=-1; p++){ - if(*p == video_enc->pix_fmt) - break; - } - if(*p == -1) - video_enc->pix_fmt = codec->pix_fmts[0]; - } - - if (!intra_only) - video_enc->gop_size = gop_size; - else - video_enc->gop_size = 0; - if (video_qscale || same_quality) { - video_enc->flags |= CODEC_FLAG_QSCALE; - st->quality = FF_QP2LAMBDA * video_qscale; - } - - if(intra_matrix) - video_enc->intra_matrix = intra_matrix; - if(inter_matrix) - video_enc->inter_matrix = inter_matrix; - - if(bitexact) - video_enc->flags |= CODEC_FLAG_BITEXACT; - - video_enc->mb_decision = mb_decision; - video_enc->mb_cmp = mb_cmp; - video_enc->ildct_cmp = ildct_cmp; - video_enc->me_sub_cmp = sub_cmp; - video_enc->me_cmp = cmp; - video_enc->me_pre_cmp = pre_cmp; - video_enc->pre_me = pre_me; - video_enc->lumi_masking = lumi_mask; - video_enc->dark_masking = dark_mask; - video_enc->spatial_cplx_masking = scplx_mask; - video_enc->temporal_cplx_masking = tcplx_mask; - video_enc->p_masking = p_mask; - video_enc->quantizer_noise_shaping= qns; - - if (use_umv) { - video_enc->flags |= CODEC_FLAG_H263P_UMV; - } - if (use_ss) { - video_enc->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; - } - if (use_aic) { - video_enc->flags |= CODEC_FLAG_H263P_AIC; - } - if (use_aiv) { - video_enc->flags |= CODEC_FLAG_H263P_AIV; - } - if (use_4mv) { - video_enc->flags |= CODEC_FLAG_4MV; - } - if (use_obmc) { - video_enc->flags |= CODEC_FLAG_OBMC; - } - if (use_loop) { - video_enc->flags |= CODEC_FLAG_LOOP_FILTER; - } - - if(use_part) { - video_enc->flags |= CODEC_FLAG_PART; - } - if (use_alt_scan) { - video_enc->flags |= CODEC_FLAG_ALT_SCAN; - } - if (use_trell) { - video_enc->flags |= CODEC_FLAG_TRELLIS_QUANT; - } - if (use_scan_offset) { - video_enc->flags |= CODEC_FLAG_SVCD_SCAN_OFFSET; - } - if (closed_gop) { - video_enc->flags |= CODEC_FLAG_CLOSED_GOP; - } - if (use_qpel) { - video_enc->flags |= CODEC_FLAG_QPEL; - } - if (use_qprd) { - video_enc->flags |= CODEC_FLAG_QP_RD; - } - if (use_cbprd) { - video_enc->flags |= CODEC_FLAG_CBP_RD; - } - if (b_frames) { - video_enc->max_b_frames = b_frames; - video_enc->b_frame_strategy = 0; - video_enc->b_quant_factor = 2.0; - } - if (do_interlace_dct) { - video_enc->flags |= CODEC_FLAG_INTERLACED_DCT; - } - if (do_interlace_me) { - video_enc->flags |= CODEC_FLAG_INTERLACED_ME; - } - video_enc->qmin = video_qmin; - video_enc->qmax = video_qmax; - video_enc->lmin = video_lmin; - video_enc->lmax = video_lmax; - video_enc->mb_qmin = video_mb_qmin; - video_enc->mb_qmax = video_mb_qmax; - video_enc->max_qdiff = video_qdiff; - video_enc->qblur = video_qblur; - video_enc->qcompress = video_qcomp; - video_enc->rc_eq = video_rc_eq; - video_enc->debug = debug; - video_enc->debug_mv = debug_mv; - video_enc->thread_count = thread_count; - p= video_rc_override_string; - for(i=0; p; i++){ - int start, end, q; - int e=sscanf(p, "%d,%d,%d", &start, &end, &q); - if(e!=3){ - fprintf(stderr, "error parsing rc_override\n"); - exit(1); - } - video_enc->rc_override= - av_realloc(video_enc->rc_override, - sizeof(RcOverride)*(i+1)); - video_enc->rc_override[i].start_frame= start; - video_enc->rc_override[i].end_frame = end; - if(q>0){ - video_enc->rc_override[i].qscale= q; - video_enc->rc_override[i].quality_factor= 1.0; - } - else{ - video_enc->rc_override[i].qscale= 0; - video_enc->rc_override[i].quality_factor= -q/100.0; - } - p= strchr(p, '/'); - if(p) p++; - } - video_enc->rc_override_count=i; - - video_enc->rc_max_rate = video_rc_max_rate; - video_enc->rc_min_rate = video_rc_min_rate; - video_enc->rc_buffer_size = video_rc_buffer_size; - video_enc->rc_initial_buffer_occupancy = video_rc_buffer_size*3/4; - video_enc->rc_buffer_aggressivity= video_rc_buffer_aggressivity; - video_enc->rc_initial_cplx= video_rc_initial_cplx; - video_enc->i_quant_factor = video_i_qfactor; - video_enc->b_quant_factor = video_b_qfactor; - video_enc->i_quant_offset = video_i_qoffset; - video_enc->b_quant_offset = video_b_qoffset; - video_enc->intra_quant_bias = video_intra_quant_bias; - video_enc->inter_quant_bias = video_inter_quant_bias; - video_enc->dct_algo = dct_algo; - video_enc->idct_algo = idct_algo; - video_enc->me_threshold= me_threshold; - video_enc->mb_threshold= mb_threshold; - video_enc->intra_dc_precision= intra_dc_precision - 8; - video_enc->strict_std_compliance = strict; - video_enc->error_rate = error_rate; - video_enc->noise_reduction= noise_reduction; - video_enc->scenechange_threshold= sc_threshold; - video_enc->me_range = me_range; - video_enc->coder_type= coder; - video_enc->context_model= context; - video_enc->prediction_method= predictor; - video_enc->profile= video_profile; - video_enc->level= video_level; - video_enc->nsse_weight= nsse_weight; - video_enc->me_subpel_quality= subpel_quality; - - if(packet_size){ - video_enc->rtp_mode= 1; - video_enc->rtp_payload_size= packet_size; - } - - if (do_psnr) - video_enc->flags|= CODEC_FLAG_PSNR; - - video_enc->me_method = me_method; - - /* two pass mode */ - if (do_pass) { - if (do_pass == 1) { - video_enc->flags |= CODEC_FLAG_PASS1; - } else { - video_enc->flags |= CODEC_FLAG_PASS2; - } - } - } + new_video_stream(oc); } if (use_audio) { - AVCodecContext *audio_enc; - - st = av_new_stream(oc, nb_streams++); - if (!st) { - fprintf(stderr, "Could not alloc stream\n"); - exit(1); - } -#if defined(HAVE_PTHREADS) || defined(HAVE_W32THREADS) - if(thread_count>1) - avcodec_thread_init(&st->codec, thread_count); -#endif - - audio_enc = &st->codec; - audio_enc->codec_type = CODEC_TYPE_AUDIO; - - if(!strcmp(file_oformat->name, "mp4") || !strcmp(file_oformat->name, "mov") || !strcmp(file_oformat->name, "3gp")) - audio_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; - if (audio_stream_copy) { - st->stream_copy = 1; - audio_enc->channels = audio_channels; - } else { - codec_id = file_oformat->audio_codec; - if (audio_codec_id != CODEC_ID_NONE) - codec_id = audio_codec_id; - audio_enc->codec_id = codec_id; - - audio_enc->bit_rate = audio_bit_rate; - 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->sample_rate = audio_sample_rate; + new_audio_stream(oc); } - oc->nb_streams = nb_streams; - - if (!nb_streams) { + if (!oc->nb_streams) { fprintf(stderr, "No audio or video streams available\n"); exit(1); } @@ -3241,8 +3649,6 @@ static void opt_output_file(const char *filename) output_files[nb_output_files++] = oc; - strcpy(oc->filename, filename); - /* check filename in case of an image number is expected */ if (oc->oformat->flags & AVFMT_NEEDNUMBER) { if (filename_number_test(oc->filename) < 0) { @@ -3290,16 +3696,16 @@ static void opt_output_file(const char *filename) exit(1); } + oc->packet_size= mux_packet_size; + oc->mux_rate= mux_rate; + oc->preload= (int)(mux_preload*AV_TIME_BASE); + oc->max_delay= (int)(mux_max_delay*AV_TIME_BASE); + oc->loop_output = loop_output; + /* reset some options */ file_oformat = NULL; file_iformat = NULL; image_format = NULL; - audio_disable = 0; - video_disable = 0; - audio_codec_id = CODEC_ID_NONE; - video_codec_id = CODEC_ID_NONE; - audio_stream_copy = 0; - video_stream_copy = 0; } /* prepare dummy protocols for grab */ @@ -3316,7 +3722,7 @@ static void prepare_grab(void) has_audio = 0; memset(ap, 0, sizeof(*ap)); memset(vp, 0, sizeof(*vp)); - vp->frame_rate_base= 1; + vp->time_base.num= 1; for(j=0;jnb_streams;i++) { @@ -3335,9 +3741,8 @@ static void prepare_grab(void) if (enc->height > vp->height) vp->height = enc->height; - if (vp->frame_rate_base*(int64_t)enc->frame_rate > enc->frame_rate_base*(int64_t)vp->frame_rate){ - vp->frame_rate = enc->frame_rate; - vp->frame_rate_base = enc->frame_rate_base; + 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; } has_video = 1; break; @@ -3369,8 +3774,8 @@ static void prepare_grab(void) exit(1); } /* by now video grab has one stream */ - ic->streams[0]->r_frame_rate = vp->frame_rate; - ic->streams[0]->r_frame_rate_base = vp->frame_rate_base; + 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) @@ -3446,11 +3851,13 @@ static void show_formats(void) int decode=0; int encode=0; const char *name=NULL; + const char *long_name=NULL; for(ofmt = first_oformat; ofmt != NULL; ofmt = ofmt->next) { if((name == NULL || strcmp(ofmt->name, name)<0) && strcmp(ofmt->name, last_name)>0){ name= ofmt->name; + long_name= ofmt->long_name; encode=1; } } @@ -3458,6 +3865,7 @@ static void show_formats(void) if((name == NULL || strcmp(ifmt->name, name)<0) && strcmp(ifmt->name, last_name)>0){ name= ifmt->name; + long_name= ifmt->long_name; encode=0; } if(name && strcmp(ifmt->name, name)==0) @@ -3468,21 +3876,23 @@ static void show_formats(void) last_name= name; printf( - " %s%s %s\n", + " %s%s %-15s %s\n", decode ? "D":" ", encode ? "E":" ", - name); + name, + long_name ? long_name:" "); } printf("\n"); - printf("Image formats:\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 %s\n", + " %s%s %-6s %s\n", image_fmt->img_read ? "D":" ", image_fmt->img_write ? "E":" ", - image_fmt->name); + image_fmt->name, + image_fmt->extensions ? image_fmt->extensions:" "); } printf("\n"); @@ -3492,6 +3902,7 @@ static void show_formats(void) int decode=0; int encode=0; int cap=0; + const char *type_str; p2=NULL; for(p = first_avcodec; p != NULL; p = p->next) { @@ -3510,11 +3921,25 @@ static void show_formats(void) break; last_name= p2->name; + switch(p2->type) { + case CODEC_TYPE_VIDEO: + type_str = "V"; + break; + case CODEC_TYPE_AUDIO: + type_str = "A"; + break; + case CODEC_TYPE_SUBTITLE: + type_str = "S"; + break; + default: + type_str = "?"; + break; + } printf( " %s%s%s%s%s%s %s", decode ? "D": (/*p2->decoder ? "d":*/" "), encode ? "E":" ", - p2->type == CODEC_TYPE_AUDIO ? "A":"V", + type_str, cap & CODEC_CAP_DRAW_HORIZ_BAND ? "S":" ", cap & CODEC_CAP_DR1 ? "D":" ", cap & CODEC_CAP_TRUNCATED ? "T":" ", @@ -3585,6 +4010,7 @@ void opt_intra_matrix(const char *arg) static void opt_target(const char *arg) { int norm = -1; + static const char *const frame_rates[] = {"25", "30000/1001", "24000/1001"}; if(!strncmp(arg, "pal-", 4)) { norm = 0; @@ -3592,6 +4018,9 @@ static void opt_target(const char *arg) } else if(!strncmp(arg, "ntsc-", 5)) { norm = 1; arg += 5; + } else if(!strncmp(arg, "film-", 5)) { + norm = 2; + arg += 5; } else { int fr; /* Calculate FR via float to avoid int overflow */ @@ -3609,7 +4038,7 @@ static void opt_target(const char *arg) AVCodecContext *c = &input_files[j]->streams[i]->codec; if(c->codec_type != CODEC_TYPE_VIDEO) continue; - fr = c->frame_rate * 1000 / c->frame_rate_base; + fr = c->time_base.den * 1000 / c->time_base.num; if(fr == 25000) { norm = 0; break; @@ -3624,12 +4053,12 @@ static void opt_target(const char *arg) } } if(verbose && norm >= 0) - printf("Assuming %s for target.\n", norm ? "NTSC" : "PAL"); + fprintf(stderr, "Assuming %s for target.\n", norm ? "NTSC" : "PAL"); } if(norm < 0) { - fprintf(stderr, "Could not determine norm (PAL/NTSC) for target.\n"); - fprintf(stderr, "Please prefix target with \"pal-\" or \"ntsc-\",\n"); + fprintf(stderr, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n"); + fprintf(stderr, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n"); fprintf(stderr, "or set a framerate with \"-r xxx\".\n"); exit(1); } @@ -3641,6 +4070,8 @@ static void opt_target(const char *arg) opt_format("vcd"); opt_frame_size(norm ? "352x240" : "352x288"); + opt_frame_rate(frame_rates[norm]); + opt_gop_size(norm ? "18" : "15"); video_bit_rate = 1150000; video_rc_max_rate = 1150000; @@ -3649,7 +4080,16 @@ static void opt_target(const char *arg) audio_bit_rate = 224000; audio_sample_rate = 44100; - + + mux_packet_size= 2324; + mux_rate= 2352 * 75 * 8; + + /* We have to offset the PTS, so that it is consistent with the SCR. + SCR starts at 36000, but the first two packs contain only padding + and the first pack from the other stream, respectively, may also have + been written before. + So the real data starts at SCR 36000+3*1200. */ + mux_preload= (36000+3*1200) / 90000.0; //0.44 } else if(!strcmp(arg, "svcd")) { opt_video_codec("mpeg2video"); @@ -3657,6 +4097,7 @@ static void opt_target(const char *arg) opt_format("svcd"); opt_frame_size(norm ? "480x480" : "480x576"); + opt_frame_rate(frame_rates[norm]); opt_gop_size(norm ? "18" : "15"); video_bit_rate = 2040000; @@ -3668,13 +4109,16 @@ static void opt_target(const char *arg) audio_bit_rate = 224000; audio_sample_rate = 44100; + mux_packet_size= 2324; + } else if(!strcmp(arg, "dvd")) { opt_video_codec("mpeg2video"); opt_audio_codec("ac3"); - opt_format("vob"); + opt_format("dvd"); opt_frame_size(norm ? "720x480" : "720x576"); + opt_frame_rate(frame_rates[norm]); opt_gop_size(norm ? "18" : "15"); video_bit_rate = 6000000; @@ -3682,9 +4126,22 @@ static void opt_target(const char *arg) video_rc_min_rate = 0; //1500000; video_rc_buffer_size = 224*1024*8; + mux_packet_size= 2048; // from www.mpucoder.com: DVD sectors contain 2048 bytes of data, this is also the size of one pack. + mux_rate = 10080000; // from mplex project: data_rate = 1260000. mux_rate = data_rate * 8 + audio_bit_rate = 448000; audio_sample_rate = 48000; + } else if(!strcmp(arg, "dv")) { + + opt_format("dv"); + + opt_frame_size(norm ? "720x480" : "720x576"); + opt_frame_rate(frame_rates[norm]); + + audio_sample_rate = 48000; + audio_channels = 2; + } else { fprintf(stderr, "Unknown target: %s\n", arg); exit(1); @@ -3693,7 +4150,7 @@ static void opt_target(const char *arg) static void show_version(void) { - printf("ffmpeg " FFMPEG_VERSION "\n" + fprintf(stderr, "ffmpeg " FFMPEG_VERSION "\n" "libavcodec %d\n" "libavformat %d\n", avcodec_build(), LIBAVFORMAT_BUILD); @@ -3710,9 +4167,10 @@ const OptionDef options[] = { { "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" }, + { "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" }, // { "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" }, @@ -3731,15 +4189,21 @@ const OptionDef options[] = { { "bitexact", OPT_EXPERT, {(void*)opt_bitexact}, "only use bit exact algorithms (for codec testing)" }, { "re", OPT_BOOL | OPT_EXPERT, {(void*)&rate_emu}, "read input at native frame rate", "" }, { "loop", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "loop (current only works with images)" }, + { "loop_output", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&loop_output}, "number of times to loop output in formats that support looping (0 loops forever)", "" }, { "v", HAS_ARG, {(void*)opt_verbose}, "control amount of logging", "verbose" }, - { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\" or \"dvd\")", "type" }, + { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" }, { "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, { "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" }, { "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" }, + { "vglobal", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_global_header}, "video global header storage type", "" }, { "copyts", OPT_BOOL | OPT_EXPERT, {(void*)©_ts}, "copy timestamps" }, + { "shortest", OPT_BOOL | OPT_EXPERT, {(void*)&opt_shortest}, "finish encoding within shortest input" }, // /* video options */ { "b", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate}, "set video bitrate (in kbit/s)", "bitrate" }, + { "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" }, { "aspect", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_aspect_ratio}, "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" }, @@ -3756,15 +4220,17 @@ const OptionDef options[] = { { "g", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_gop_size}, "set the group of picture size", "gop_size" }, { "intra", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&intra_only}, "use only intra frames"}, { "vn", OPT_BOOL | OPT_VIDEO, {(void*)&video_disable}, "disable video" }, + { "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 quantiser scale (VBR)", "q" }, { "qmin", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qmin}, "min video quantiser scale (VBR)", "q" }, { "qmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qmax}, "max video quantiser scale (VBR)", "q" }, { "lmin", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_lmin}, "min video lagrange factor (VBR)", "lambda" }, { "lmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_lmax}, "max video lagrange factor (VBR)", "lambda" }, - { "mbqmin", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_qmin}, "min macroblock quantiser scale (VBR)", "q" }, - { "mbqmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_qmax}, "max macroblock quantiser scale (VBR)", "q" }, + { "mblmin", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_lmin}, "min macroblock quantiser scale (VBR)", "q" }, + { "mblmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_lmax}, "max macroblock quantiser scale (VBR)", "q" }, { "qdiff", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qdiff}, "max difference between the quantiser scale (VBR)", "q" }, { "qblur", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qblur}, "video quantiser scale blur (VBR)", "blur" }, + { "qsquish", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qsquish}, "how to keep quantiser between qmin and qmax (0 = clip, 1 = use differentiable function)", "squish" }, { "qcomp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qcomp}, "video quantiser scale compression (VBR)", "compression" }, { "rc_init_cplx", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_rc_initial_cplx}, "initial complexity for 1-pass encoding", "complexity" }, { "b_qfactor", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_qfactor}, "qp factor between p and b frames", "factor" }, @@ -3773,7 +4239,7 @@ const OptionDef options[] = { { "i_qoffset", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qoffset}, "qp offset between p and i frames", "offset" }, { "ibias", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_ibias}, "intra quant bias", "bias" }, { "pbias", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pbias}, "inter quant bias", "bias" }, -// { "b_strategy", HAS_ARG | OPT_EXPERT, {(void*)opt_b_strategy}, "dynamic b frame selection strategy", "strategy" }, + { "b_strategy", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&b_strategy}, "dynamic b frame selection strategy", "strategy" }, { "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" }, { "bt", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_tolerance}, "set video bitrate tolerance (in kbit/s)", "tolerance" }, @@ -3798,6 +4264,8 @@ const OptionDef options[] = { { "cmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_cmp}, "fullpel compare function", "cmp function" }, { "precmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pre_cmp}, "pre motion estimation compare function", "cmp function" }, { "preme", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pre_me}, "pre motion estimation", "" }, + { "lelim", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_lelim}, "single coefficient elimination threshold for luminance (negative values also consider DC coefficient)", "elim" }, + { "celim", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_celim}, "single coefficient elimination threshold for chrominance (negative values also consider DC coefficient)", "elim" }, { "lumi_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_lumi_mask}, "luminance masking", "" }, { "dark_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_dark_mask}, "darkness masking", "" }, { "scplx_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_scplx_mask}, "spatial complexity masking", "" }, @@ -3832,7 +4300,11 @@ const OptionDef options[] = { { "qprd", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_qprd}, "" }, { "cbp", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_cbprd}, "" }, { "trell", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_trell}, "enable trellis quantization" }, + { "mv0", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_mv0}, "try to encode each MB with MV=<0,0> and choose the better one (has no effect if mbd=0)" }, + { "naq", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_normalize_aqp}, "normalize adaptive quantization" }, { "cgop", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&closed_gop}, "closed gop" }, + { "sgop", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&strict_gop}, "strict gop" }, + { "noout", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&no_output}, "skip bitstream encoding" }, { "scan_offset", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_scan_offset}, "enable SVCD Scan Offset placeholder" }, { "qpel", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_qpel}, "enable 1/4-pel" }, { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" }, @@ -3850,7 +4322,15 @@ const OptionDef options[] = { { "vlevel", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&video_level}, "level", "" }, { "nssew", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&nsse_weight}, "weight", "" }, { "subq", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&subpel_quality}, "", "" }, + { "mepc", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&me_penalty_compensation}, "motion estimation bitrate penalty compensation", "factor (1.0 = 256)" }, { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&lowres}, "", "" }, + { "vtag", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_tag}, "force video tag/fourcc", "fourcc/tag" }, + { "skip_threshold", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&frame_skip_threshold}, "frame skip threshold", "threshold" }, + { "skip_factor", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&frame_skip_factor}, "frame skip factor", "factor" }, + { "skip_exp", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&frame_skip_exp}, "frame skip exponent", "exponent" }, + { "skip_cmp", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&frame_skip_cmp}, "frame skip compare function", "compare function" }, + { "gray", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&gray_only }, "encode/decode grayscale" }, + { "newvideo", OPT_VIDEO, {(void*)opt_new_video_stream}, "add a new video stream to the current output stream" }, /* audio options */ { "ab", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_bitrate}, "set audio bitrate (in kbit/s)", "bitrate", }, @@ -3858,25 +4338,44 @@ const OptionDef options[] = { { "ac", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_channels}, "set number of audio channels", "channels" }, { "an", OPT_BOOL | OPT_AUDIO, {(void*)&audio_disable}, "disable audio" }, { "acodec", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_codec}, "force audio codec ('copy' to copy stream)", "codec" }, - + { "atag", HAS_ARG | OPT_EXPERT | OPT_AUDIO, {(void*)opt_audio_tag}, "force audio tag/fourcc", "fourcc/tag" }, + { "vol", OPT_INT | HAS_ARG | OPT_AUDIO, {(void*)&audio_volume}, "change audio volume (256=normal)" , "volume" }, // + { "newaudio", OPT_AUDIO, {(void*)opt_new_audio_stream}, "add a new audio stream to the current output stream" }, + { "alang", HAS_ARG | OPT_STRING | OPT_AUDIO, {(void *)&audio_language}, "set the ISO 639 language code (3 letters) of the current audio stream" , "code" }, + + /* subtitle options */ + { "scodec", HAS_ARG | OPT_SUBTITLE, {(void*)opt_subtitle_codec}, "force subtitle codec ('copy' to copy stream)", "codec" }, + { "newsubtitle", OPT_SUBTITLE, {(void*)opt_new_subtitle_stream}, "add a new subtitle stream to the current output stream" }, + { "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" }, - { "dv1394", OPT_EXPERT | OPT_GRAB, {(void*)opt_dv1394}, "set DV1394 grab", "" }, { "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" }, + + /* muxer options */ + { "muxrate", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&mux_rate}, "set mux rate", "rate" }, + { "packetsize", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&mux_packet_size}, "set packet size", "size" }, + { "muxdelay", OPT_FLOAT | HAS_ARG | OPT_EXPERT, {(void*)&mux_max_delay}, "set the maximum demux-decode delay", "seconds" }, + { "muxpreload", OPT_FLOAT | HAS_ARG | OPT_EXPERT, {(void*)&mux_preload}, "set the initial demux-decode delay", "seconds" }, { NULL, }, }; static void show_banner(void) { - printf("ffmpeg version " FFMPEG_VERSION ", build %d, Copyright (c) 2000-2004 Fabrice Bellard\n", + fprintf(stderr, "ffmpeg version " FFMPEG_VERSION ", build %d, Copyright (c) 2000-2004 Fabrice Bellard\n", LIBAVCODEC_BUILD); - printf(" built on " __DATE__ " " __TIME__); + fprintf(stderr, " configuration: %s\n", FFMPEG_CONFIGURATION); + fprintf(stderr, " built on " __DATE__ " " __TIME__); #ifdef __GNUC__ - printf(", gcc: %s\n", __VERSION__); + fprintf(stderr, ", gcc: %s\n", __VERSION__); #else - printf(", using a non-gcc compiler\n"); + fprintf(stderr, ", using a non-gcc compiler\n"); #endif } @@ -3939,6 +4438,9 @@ static void show_help(void) 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);