X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=b313bd59f8e067883afc9bfc8ae54729e0cbc93e;hb=0bd586c50dc27ec38ca94e58f50030544d729463;hp=a2dfdf9431fcba4731279ca5b8aa2e7a588237bc;hpb=d223532c232d741156d60cf018e48ac770e0c965;p=ffmpeg diff --git a/ffmpeg.c b/ffmpeg.c index a2dfdf9431f..b313bd59f8e 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -17,6 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define HAVE_AV_CONFIG_H +#include #include "avformat.h" #include "framehook.h" @@ -57,6 +58,7 @@ static void show_license(void); #define MAX_FILES 20 static AVFormatContext *input_files[MAX_FILES]; +static int64_t input_files_ts_offset[MAX_FILES]; static int nb_input_files = 0; static AVFormatContext *output_files[MAX_FILES]; @@ -88,6 +90,8 @@ static int video_bit_rate_tolerance = 4000*1000; static float video_qscale = 0; 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_qdiff = 3; @@ -140,6 +144,9 @@ static int use_ss = 0; static int use_alt_scan = 0; static int use_trell = 0; static int use_scan_offset = 0; +static int use_qpel = 0; +static int use_qprd = 0; +static int use_cbprd = 0; static int qns = 0; static int closed_gop = 0; static int do_deinterlace = 0; @@ -159,6 +166,12 @@ static int noise_reduction = 0; static int sc_threshold = 0; static int debug = 0; static int debug_mv = 0; +static int me_threshold = 0; +static int mb_threshold = 0; +static int intra_dc_precision = 8; +static int coder = 0; +static int context = 0; +static int predictor = 0; extern int loop_input; /* currently a hack */ static int gop_size = 12; @@ -172,6 +185,7 @@ static int audio_codec_id = CODEC_ID_NONE; static int64_t recording_time = 0; static int64_t start_time = 0; static int64_t rec_timestamp = 0; +static int64_t input_ts_offset = 0; static int file_overwrite = 0; static char *str_title = NULL; static char *str_author = NULL; @@ -187,6 +201,8 @@ static int bitexact = 0; static char *pass_logfilename = NULL; static int audio_stream_copy = 0; static int video_stream_copy = 0; +static int sync_method= 1; +static int copy_ts= 0; static int rate_emu = 0; @@ -203,6 +219,13 @@ static int using_vhook = 0; static int verbose = 1; static int thread_count= 1; static int q_pressed = 0; +static int me_range = 0; +static int64_t video_size = 0; +static int64_t audio_size = 0; +static int64_t extra_size = 0; +static int nb_frames_dup = 0; +static int nb_frames_drop = 0; +static int input_sync; #define DEFAULT_PASS_LOGFILENAME "ffmpeg2pass" @@ -215,12 +238,11 @@ typedef struct AVOutputStream { int frame_number; /* input pts and corresponding output pts for A/V sync */ - double sync_ipts; - double sync_ipts_offset; - int64_t sync_opts; + double sync_ipts; /* dts from the AVPacket of the demuxer in second units */ + 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 */ - AVPicture pict_tmp; /* temporary image for resampling */ + AVFrame pict_tmp; /* temporary image for resampling */ ImgReSampleContext *img_resample_ctx; /* for image resampling */ int video_crop; /* video_resample and video_crop are mutually exclusive */ @@ -432,11 +454,23 @@ static void do_audio_out(AVFormatContext *s, while (fifo_read(&ost->fifo, audio_buf, frame_bytes, &ost->fifo.rptr) == 0) { + AVPacket pkt; + av_init_packet(&pkt); + ret = avcodec_encode_audio(enc, audio_out, audio_out_size, (short *)audio_buf); - av_write_frame(s, ost->index, audio_out, ret); + audio_size += ret; + pkt.stream_index= ost->index; + pkt.data= audio_out; + pkt.size= ret; + if(enc->coded_frame) + pkt.pts= enc->coded_frame->pts; + pkt.flags |= PKT_FLAG_KEY; + av_interleaved_write_frame(s, &pkt); } } else { + AVPacket pkt; + av_init_packet(&pkt); /* output a pcm frame */ /* XXX: change encoding codec API to avoid this ? */ switch(enc->codec->id) { @@ -451,7 +485,14 @@ static void do_audio_out(AVFormatContext *s, } ret = avcodec_encode_audio(enc, audio_out, size_out, (short *)buftmp); - av_write_frame(s, ost->index, audio_out, ret); + audio_size += ret; + pkt.stream_index= ost->index; + pkt.data= audio_out; + pkt.size= ret; + if(enc->coded_frame) + pkt.pts= enc->coded_frame->pts; + pkt.flags |= PKT_FLAG_KEY; + av_interleaved_write_frame(s, &pkt); } } @@ -549,15 +590,18 @@ static void do_video_out(AVFormatContext *s, int *frame_size, AVOutputStream *audio_sync) { int nb_frames, i, ret; - AVPicture *final_picture, *formatted_picture; - AVPicture picture_format_temp, picture_crop_temp; + AVFrame *final_picture, *formatted_picture; + AVFrame picture_format_temp, picture_crop_temp; static uint8_t *video_buffer= NULL; uint8_t *buf = NULL, *buf1 = NULL; 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); + enc = &ost->st->codec; dec = &ist->st->codec; @@ -566,55 +610,26 @@ static void do_video_out(AVFormatContext *s, *frame_size = 0; - /* NOTE: the A/V sync is always done by considering the audio is - the master clock. It is suffisant for transcoding or playing, - but not for the general case */ - if (audio_sync) { - /* compute the A-V delay and duplicate/remove frames if needed */ - double adelta, vdelta, av_delay; - - adelta = audio_sync->sync_ipts - ((double)audio_sync->sync_opts * - s->pts_num / s->pts_den); - - vdelta = ost->sync_ipts - ((double)ost->sync_opts * - s->pts_num / s->pts_den); - - av_delay = adelta - vdelta; - // printf("delay=%f\n", av_delay); - if (av_delay < -AV_DELAY_MAX) - nb_frames = 2; - else if (av_delay > AV_DELAY_MAX) - nb_frames = 0; - } else { + if(sync_method){ double vdelta; - - vdelta = (double)(ost->st->pts.val) * s->pts_num / s->pts_den - (ost->sync_ipts - ost->sync_ipts_offset); - if (vdelta < 100 && vdelta > -100 && ost->sync_ipts_offset) { - if (vdelta < -AV_DELAY_MAX) - nb_frames = 2; - else if (vdelta > AV_DELAY_MAX) - nb_frames = 0; - } else { - ost->sync_ipts_offset -= vdelta; - if (!ost->sync_ipts_offset) - ost->sync_ipts_offset = 0.000001; /* one microsecond */ - } - } - -#if defined(AVSYNC_DEBUG) - { - static char *action[] = { "drop frame", "copy frame", "dup frame" }; - if (audio_sync && verbose >=0) { - fprintf(stderr, "Input APTS %12.6f, output APTS %12.6f, ", - (double) audio_sync->sync_ipts, - (double) audio_sync->st->pts.val * s->pts_num / s->pts_den); - fprintf(stderr, "Input VPTS %12.6f, output VPTS %12.6f: %s\n", - (double) ost->sync_ipts, - (double) ost->st->pts.val * s->pts_num / s->pts_den, - action[nb_frames]); - } - } -#endif + vdelta = ost->sync_ipts * enc->frame_rate / enc->frame_rate_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 = 2; +//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; + if (verbose>2) + fprintf(stderr, "*** drop!\n"); + }else if (nb_frames == 2) { + ++nb_frames_dup; + if (verbose>2) + fprintf(stderr, "*** dup!\n"); + } + }else + ost->sync_opts= lrintf(ost->sync_ipts * enc->frame_rate / enc->frame_rate_base); if (nb_frames <= 0) return; @@ -636,9 +651,9 @@ static void do_video_out(AVFormatContext *s, if (!buf) return; formatted_picture = &picture_format_temp; - avpicture_fill(formatted_picture, buf, target_pixfmt, dec->width, dec->height); + avpicture_fill((AVPicture*)formatted_picture, buf, target_pixfmt, dec->width, dec->height); - if (img_convert(formatted_picture, target_pixfmt, + if (img_convert((AVPicture*)formatted_picture, target_pixfmt, (AVPicture *)in_picture, dec->pix_fmt, dec->width, dec->height) < 0) { @@ -648,7 +663,7 @@ static void do_video_out(AVFormatContext *s, goto the_end; } } else { - formatted_picture = (AVPicture *)in_picture; + formatted_picture = in_picture; } /* XXX: resampling could be done before raw format conversion in @@ -656,10 +671,10 @@ static void do_video_out(AVFormatContext *s, /* XXX: only works for YUV420P */ if (ost->video_resample) { final_picture = &ost->pict_tmp; - img_resample(ost->img_resample_ctx, final_picture, formatted_picture); + img_resample(ost->img_resample_ctx, (AVPicture*)final_picture, (AVPicture*)formatted_picture); if (ost->padtop || ost->padbottom || ost->padleft || ost->padright) { - fill_pad_region(final_picture, enc->height, enc->width, + fill_pad_region((AVPicture*)final_picture, enc->height, enc->width, ost->padtop, ost->padbottom, ost->padleft, ost->padright, padcolor); } @@ -674,10 +689,10 @@ static void do_video_out(AVFormatContext *s, if (!buf) return; final_picture = &picture_format_temp; - avpicture_fill(final_picture, buf, enc->pix_fmt, enc->width, enc->height); + avpicture_fill((AVPicture*)final_picture, buf, enc->pix_fmt, enc->width, enc->height); - if (img_convert(final_picture, enc->pix_fmt, - &ost->pict_tmp, PIX_FMT_YUV420P, + if (img_convert((AVPicture*)final_picture, enc->pix_fmt, + (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P, enc->width, enc->height) < 0) { if (verbose >= 0) @@ -724,7 +739,7 @@ static void do_video_out(AVFormatContext *s, } } - fill_pad_region(final_picture, enc->height, enc->width, + fill_pad_region((AVPicture*)final_picture, enc->height, enc->width, ost->padtop, ost->padbottom, ost->padleft, ost->padright, padcolor); @@ -738,10 +753,10 @@ static void do_video_out(AVFormatContext *s, if (!buf) return; final_picture = &picture_format_temp; - avpicture_fill(final_picture, buf, enc->pix_fmt, enc->width, enc->height); + avpicture_fill((AVPicture*)final_picture, buf, enc->pix_fmt, enc->width, enc->height); - if (img_convert(final_picture, enc->pix_fmt, - &ost->pict_tmp, PIX_FMT_YUV420P, + if (img_convert((AVPicture*)final_picture, enc->pix_fmt, + (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P, enc->width, enc->height) < 0) { if (verbose >= 0) @@ -756,20 +771,29 @@ static void do_video_out(AVFormatContext *s, /* duplicates frame if needed */ /* XXX: pb because no interleaving */ for(i=0;iindex; + if (s->oformat->flags & AVFMT_RAWPICTURE) { /* raw pictures are written as AVPicture structure to avoid any copies. We support temorarily the older method. */ AVFrame* old_frame = enc->coded_frame; - enc->coded_frame = dec->coded_frame; - av_write_frame(s, ost->index, - (uint8_t *)final_picture, sizeof(AVPicture)); + enc->coded_frame = dec->coded_frame; //FIXME/XXX remove this hack + pkt.data= (uint8_t *)final_picture; + pkt.size= sizeof(AVPicture); + if(dec->coded_frame) + pkt.pts= dec->coded_frame->pts; + if(dec->coded_frame && dec->coded_frame->key_frame) + pkt.flags |= PKT_FLAG_KEY; + + av_interleaved_write_frame(s, &pkt); enc->coded_frame = old_frame; } else { AVFrame big_picture; - - avcodec_get_frame_defaults(&big_picture); - *(AVPicture*)&big_picture= *final_picture; + + big_picture= *final_picture; /* better than nothing: use input picture interlaced settings */ big_picture.interlaced_frame = in_picture->interlaced_frame; @@ -777,7 +801,7 @@ static void do_video_out(AVFormatContext *s, if(top_field_first == -1) big_picture.top_field_first = in_picture->top_field_first; else - big_picture.top_field_first = 1; + big_picture.top_field_first = top_field_first; } /* handles sameq here. This is not correct because it may @@ -786,20 +810,38 @@ static void do_video_out(AVFormatContext *s, big_picture.quality = ist->st->quality; }else big_picture.quality = ost->st->quality; + 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); +//av_log(NULL, AV_LOG_DEBUG, "%lld -> encoder\n", ost->sync_opts); ret = avcodec_encode_video(enc, video_buffer, VIDEO_BUFFER_SIZE, &big_picture); //enc->frame_number = enc->real_pict_num; - av_write_frame(s, ost->index, video_buffer, ret); - *frame_size = ret; - //fprintf(stderr,"\nFrame: %3d %3d size: %5d type: %d", - // enc->frame_number-1, enc->real_pict_num, ret, - // enc->pict_type); - /* if two pass, output log */ - if (ost->logfile && enc->stats_out) { - fprintf(ost->logfile, "%s", enc->stats_out); + if(ret){ + pkt.data= video_buffer; + pkt.size= ret; + if(enc->coded_frame) + pkt.pts= enc->coded_frame->pts; +/*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);*/ + + if(enc->coded_frame && enc->coded_frame->key_frame) + pkt.flags |= PKT_FLAG_KEY; + av_interleaved_write_frame(s, &pkt); + *frame_size = ret; + //fprintf(stderr,"\nFrame: %3d %3d size: %5d type: %d", + // enc->frame_number-1, enc->real_pict_num, ret, + // enc->pict_type); + /* if two pass, output log */ + if (ost->logfile && enc->stats_out) { + fprintf(ost->logfile, "%s", enc->stats_out); + } } } + ost->sync_opts++; ost->frame_number++; } the_end: @@ -816,7 +858,6 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, int frame_size) { static FILE *fvstats=NULL; - static int64_t total_size = 0; char filename[40]; time_t today2; struct tm *today; @@ -840,7 +881,6 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, ti = MAXINT64; enc = &ost->st->codec; - total_size += frame_size; if (enc->codec_type == CODEC_TYPE_VIDEO) { frame_number = ost->frame_number; fprintf(fvstats, "frame= %5d q= %2.1f ", frame_number, enc->coded_frame->quality/(float)FF_QP2LAMBDA); @@ -849,14 +889,14 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, fprintf(fvstats,"f_size= %6d ", frame_size); /* compute pts value */ - ti1 = (double)ost->st->pts.val * os->pts_num / os->pts_den; + ti1 = (double)ost->sync_opts *enc->frame_rate_base / enc->frame_rate; if (ti1 < 0.01) ti1 = 0.01; bitrate = (double)(frame_size * 8) * enc->frame_rate / enc->frame_rate_base / 1000.0; - avg_bitrate = (double)(total_size * 8) / ti1 / 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)total_size / 1024, ti1, bitrate, avg_bitrate); + (double)video_size / 1024, ti1, bitrate, avg_bitrate); fprintf(fvstats,"type= %c\n", av_get_pict_type_char(enc->coded_frame->pict_type)); } } @@ -933,7 +973,7 @@ static void print_report(AVFormatContext **output_files, vid = 1; } /* compute min output value */ - pts = (double)ost->st->pts.val * os->pts_num / os->pts_den; + pts = (double)ost->st->pts.val * ost->st->time_base.num / ost->st->time_base.den; if ((pts < ti1) && (pts > 0)) ti1 = pts; } @@ -946,6 +986,10 @@ static void print_report(AVFormatContext **output_files, sprintf(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", + nb_frames_dup, nb_frames_drop); if (verbose >= 0) fprintf(stderr, "%s \r", buf); @@ -953,14 +997,22 @@ static void print_report(AVFormatContext **output_files, fflush(stderr); } - if (is_last_report && verbose >= 0) + if (is_last_report && verbose >= 0){ + int64_t raw= audio_size + video_size + extra_size; fprintf(stderr, "\n"); + fprintf(stderr, "video:%1.0fkB audio:%1.0fkB global headers:%1.0fkB muxing overhead %f%%\n", + video_size/1024.0, + audio_size/1024.0, + extra_size/1024.0, + 100.0*(total_size - raw)/raw + ); + } } /* pkt = NULL means EOF (needed to flush decoder buffers) */ static int output_packet(AVInputStream *ist, int ist_index, AVOutputStream **ost_table, int nb_ostreams, - AVPacket *pkt) + const AVPacket *pkt) { AVFormatContext *os; AVOutputStream *ost; @@ -972,8 +1024,8 @@ static int output_packet(AVInputStream *ist, int ist_index, short samples[AVCODEC_MAX_AUDIO_FRAME_SIZE / 2]; void *buffer_to_free; - if (pkt && pkt->pts != AV_NOPTS_VALUE) { - ist->pts = pkt->pts; + if (pkt && pkt->pts != AV_NOPTS_VALUE) { //FIXME seems redundant, as libavformat does this too + ist->next_pts = ist->pts = pkt->dts; } else { ist->pts = ist->next_pts; } @@ -1010,8 +1062,8 @@ static int output_packet(AVInputStream *ist, int ist_index, continue; } data_buf = (uint8_t *)samples; - ist->next_pts += ((int64_t)AV_TIME_BASE * data_size) / - (2 * ist->st->codec.channels); + ist->next_pts += ((int64_t)AV_TIME_BASE/2 * data_size) / + (ist->st->codec.sample_rate * ist->st->codec.channels); break; case CODEC_TYPE_VIDEO: data_size = (ist->st->codec.width * ist->st->codec.height * 3) / 2; @@ -1087,14 +1139,10 @@ static int output_packet(AVInputStream *ist, int ist_index, 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 * os->pts_num / os->pts_den)); + ((double)ost->st->pts.val * ost->time_base.num / ost->time_base.den)); #endif /* set the input output pts pairs */ - ost->sync_ipts = (double)ist->pts / AV_TIME_BASE; - /* XXX: take into account the various fifos, - in particular for audio */ - ost->sync_opts = ost->st->pts.val; - //printf("ipts=%lld sync_ipts=%f sync_opts=%lld pts.val=%lld pkt->pts=%lld\n", ist->pts, ost->sync_ipts, ost->sync_opts, ost->st->pts.val, pkt->pts); + ost->sync_ipts = (double)(ist->pts + input_files_ts_offset[ist->file_index])/ AV_TIME_BASE; if (ost->encoding_needed) { switch(ost->st->codec.codec_type) { @@ -1117,6 +1165,7 @@ static int output_packet(AVInputStream *ist, int ist_index, } do_video_out(os, ost, ist, &picture, &frame_size, audio_sync); + video_size += frame_size; if (do_vstats && frame_size) do_video_stats(os, ost, frame_size); } @@ -1125,16 +1174,30 @@ static int output_packet(AVInputStream *ist, int ist_index, av_abort(); } } else { - AVFrame avframe; - + 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; - - av_write_frame(os, ost->index, data_buf, data_size); + + 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; + + 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]; + opkt.flags= pkt->flags; + + av_interleaved_write_frame(os, &opkt); ost->st->codec.frame_number++; ost->frame_number++; } @@ -1406,13 +1469,15 @@ static int av_encode(AVFormatContext **output_files, ost->padleft = frame_padleft; ost->padbottom = frame_padbottom; ost->padright = frame_padright; - if( avpicture_alloc( &ost->pict_tmp, PIX_FMT_YUV420P, + avcodec_get_frame_defaults(&ost->pict_tmp); + if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P, codec->width, codec->height ) ) goto fail; } else { ost->video_resample = 1; ost->video_crop = 0; // cropping is handled as part of resample - if( avpicture_alloc( &ost->pict_tmp, PIX_FMT_YUV420P, + avcodec_get_frame_defaults(&ost->pict_tmp); + if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P, codec->width, codec->height ) ) goto fail; @@ -1513,6 +1578,7 @@ static int av_encode(AVFormatContext **output_files, ost->file_index, ost->index); exit(1); } + extra_size += ost->st->codec.extradata_size; } } @@ -1590,13 +1656,20 @@ static int av_encode(AVFormatContext **output_files, /* select the stream that we must read now by looking at the smallest output pts */ file_index = -1; - pts_min = 1e10; + pts_min = 1e100; for(i=0;ifile_index]; ist = ist_table[ost->source_index]; - pts = (double)ost->st->pts.val * os->pts_num / os->pts_den; + if (input_sync == 0) { + if(ost->st->codec.codec_type == CODEC_TYPE_VIDEO) + pts = (double)ost->sync_opts * ost->st->codec.frame_rate_base / ost->st->codec.frame_rate; + else + pts = (double)ost->st->pts.val * ost->st->time_base.num / ost->st->time_base.den; + } else { + pts = (double)ist->pts; + } if (!file_table[ist->file_index].eof_reached && pts < pts_min) { pts_min = pts; @@ -1636,6 +1709,20 @@ static int av_encode(AVFormatContext **output_files, if (ist->discard) 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(ABS(delta) > 10LL*AV_TIME_BASE && !copy_ts){ + input_files_ts_offset[ist->file_index]-= delta; + if (verbose > 2) + fprintf(stderr, "timestamp discontinuity %lld, new offset= %lld\n", delta, input_files_ts_offset[ist->file_index]); + for(i=0; inext_pts += delta; + } + } + } + //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size); if (output_packet(ist, ist_index, ost_table, nb_ostreams, &pkt) < 0) { @@ -1664,15 +1751,15 @@ static int av_encode(AVFormatContext **output_files, term_exit(); - /* dump report by using the first video and audio streams */ - print_report(output_files, ost_table, nb_ostreams, 1); - /* write the trailer if needed and close file */ for(i=0;idebug_mv = debug_mv; if(bitexact) enc->flags|= CODEC_FLAG_BITEXACT; + if(me_threshold) + enc->debug |= FF_DEBUG_MV; assert(enc->frame_rate_base == rfps_base); // should be true for now if (enc->frame_rate != rfps) { @@ -2558,6 +2681,7 @@ static void opt_input_file(const char *filename) } input_files[nb_input_files] = ic; + input_files_ts_offset[nb_input_files] = input_ts_offset; /* dump the file content */ if (verbose >= 0) dump_format(ic, nb_input_files, filename, 0); @@ -2632,8 +2756,8 @@ static void opt_output_file(const char *filename) exit(1); } } else { - use_video = file_oformat->video_codec != CODEC_ID_NONE; - use_audio = file_oformat->audio_codec != CODEC_ID_NONE; + use_video = file_oformat->video_codec != CODEC_ID_NONE || video_stream_copy; + use_audio = file_oformat->audio_codec != CODEC_ID_NONE || audio_stream_copy; /* disable if no corresponding type found and at least one input file */ @@ -2657,12 +2781,11 @@ static void opt_output_file(const char *filename) if (use_video) { AVCodecContext *video_enc; - st = av_mallocz(sizeof(AVStream)); + st = av_new_stream(oc, nb_streams++); if (!st) { fprintf(stderr, "Could not alloc stream\n"); exit(1); } - avcodec_get_context_defaults(&st->codec); #if defined(HAVE_PTHREADS) || defined(HAVE_W32THREADS) if(thread_count>1) avcodec_thread_init(&st->codec, thread_count); @@ -2678,22 +2801,50 @@ static void opt_output_file(const char *filename) } 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; + 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; @@ -2763,6 +2914,15 @@ static void opt_output_file(const char *filename) 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; @@ -2776,6 +2936,8 @@ static void opt_output_file(const char *filename) } 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; @@ -2824,10 +2986,18 @@ static void opt_output_file(const char *filename) 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; + if(packet_size){ video_enc->rtp_mode= 1; video_enc->rtp_payload_size= packet_size; @@ -2847,19 +3017,16 @@ static void opt_output_file(const char *filename) } } } - oc->streams[nb_streams] = st; - nb_streams++; } if (use_audio) { AVCodecContext *audio_enc; - st = av_mallocz(sizeof(AVStream)); + st = av_new_stream(oc, nb_streams++); if (!st) { fprintf(stderr, "Could not alloc stream\n"); exit(1); } - avcodec_get_context_defaults(&st->codec); #if defined(HAVE_PTHREADS) || defined(HAVE_W32THREADS) if(thread_count>1) avcodec_thread_init(&st->codec, thread_count); @@ -2872,6 +3039,7 @@ static void opt_output_file(const char *filename) 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) @@ -2879,7 +3047,6 @@ static void opt_output_file(const char *filename) audio_enc->codec_id = codec_id; audio_enc->bit_rate = audio_bit_rate; - audio_enc->sample_rate = audio_sample_rate; audio_enc->strict_std_compliance = strict; audio_enc->thread_count = thread_count; /* For audio codecs other than AC3 we limit */ @@ -2889,8 +3056,7 @@ static void opt_output_file(const char *filename) } else audio_enc->channels = audio_channels; } - oc->streams[nb_streams] = st; - nb_streams++; + audio_enc->sample_rate = audio_sample_rate; } oc->nb_streams = nb_streams; @@ -3364,10 +3530,20 @@ static void opt_target(const char *arg) } } +static void show_version(void) +{ + printf("ffmpeg " FFMPEG_VERSION "\n" + "libavcodec %d\n" + "libavformat %d\n", + avcodec_build(), LIBAVFORMAT_BUILD); + exit(1); +} + const OptionDef options[] = { /* main options */ { "L", 0, {(void*)show_license}, "show license" }, { "h", 0, {(void*)show_help}, "show help" }, + { "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" }, @@ -3376,6 +3552,7 @@ const OptionDef options[] = { { "map", HAS_ARG | OPT_EXPERT, {(void*)opt_map}, "set input stream mapping", "file:stream" }, { "t", HAS_ARG, {(void*)opt_recording_time}, "set the recording time", "duration" }, { "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" }, { "timestamp", HAS_ARG, {(void*)&opt_rec_timestamp}, "set the timestamp", "time" }, { "author", HAS_ARG | OPT_STRING, {(void*)&str_author}, "set the author", "string" }, @@ -3395,6 +3572,8 @@ const OptionDef options[] = { { "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" }, { "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, + { "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync_method}, "sync method", "" }, + { "copyts", OPT_BOOL | OPT_EXPERT, {(void*)©_ts}, "copy timestamps" }, /* video options */ { "b", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate}, "set video bitrate (in kbit/s)", "bitrate" }, @@ -3417,6 +3596,8 @@ const OptionDef options[] = { { "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" }, { "qdiff", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qdiff}, "max difference between the quantiser scale (VBR)", "q" }, @@ -3441,6 +3622,8 @@ const OptionDef options[] = { "method" }, { "dct_algo", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_dct_algo}, "set dct algo", "algo" }, { "idct_algo", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_idct_algo}, "set idct algo", "algo" }, + { "me_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_threshold}, "motion estimaton threshold", "" }, + { "mb_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_threshold}, "macroblock threshold", "" }, { "er", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_error_resilience}, "set error resilience", "n" }, { "ec", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_error_concealment}, "set error concealment", "bit_mask" }, { "bf", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_frames}, "use 'frames' B frames", "frames" }, @@ -3483,15 +3666,23 @@ const OptionDef options[] = { { "umv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_umv}, "enable Unlimited Motion Vector (h263+)" }, { "ssm", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_ss}, "enable Slice Structured mode (h263+)" }, { "alt", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_alt_scan}, "enable alternate scantable (MPEG2/MPEG4)" }, + { "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" }, { "cgop", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&closed_gop}, "closed gop" }, { "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" }, { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" }, { "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" }, { "nr", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_noise_reduction}, "noise reduction", "" }, { "qns", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qns}, "quantization noise shaping", "" }, { "sc_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_sc_threshold}, "scene change threshold", "threshold" }, + { "me_range", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_range}, "limit motion vectors range (1023 for DivX player)", "range" }, + { "dc", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&intra_dc_precision}, "intra_dc_precision", "precision" }, + { "coder", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&coder}, "coder type", "" }, + { "context", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&context}, "context model", "" }, + { "pred", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&predictor}, "prediction method", "" }, /* audio options */ { "ab", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_bitrate}, "set audio bitrate (in kbit/s)", "bitrate", }, @@ -3607,6 +3798,7 @@ int main(int argc, char **argv) } if (nb_input_files == 0) { + input_sync = 1; prepare_grab(); }