X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=ef7dd07c864c6add3c85f997a31d5ffb24e92a3b;hb=7cbf432db1faa8b2ef2dc18e06a87bf6be293718;hp=122017b7daa508bf0790cda9383b1e415e3bae94;hpb=ea0fe83b0f2866261e0676135d51339d29747510;p=ffmpeg diff --git a/ffmpeg.c b/ffmpeg.c index 122017b7daa..ef7dd07c864 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -18,15 +18,15 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define HAVE_AV_CONFIG_H + #include #include #include "avformat.h" #include "swscale.h" #include "framehook.h" -#include "dsputil.h" #include "opt.h" #include "fifo.h" +#include "avstring.h" #ifdef __MINGW32__ #include @@ -56,6 +56,8 @@ #define INFINITY HUGE_VAL #endif +#undef exit + /* select an input stream for an output stream */ typedef struct AVStreamMap { int file_index; @@ -107,8 +109,7 @@ static int frame_bottomBand = 0; static int frame_leftBand = 0; static int frame_rightBand = 0; static int max_frames[4] = {INT_MAX, INT_MAX, INT_MAX, INT_MAX}; -static int frame_rate = 25; -static int frame_rate_base = 1; +static AVRational frame_rate = (AVRational) {25,1}; static float video_qscale = 0; static int video_qdiff = 3; static uint16_t *intra_matrix = NULL; @@ -137,7 +138,6 @@ static int qp_hist = 0; static int intra_only = 0; static int audio_sample_rate = 44100; -static int audio_bit_rate = 64000; #define QSCALE_NONE -99999 static float audio_qscale = QSCALE_NONE; static int audio_disable = 0; @@ -166,7 +166,6 @@ static int do_benchmark = 0; static int do_hex_dump = 0; static int do_pkt_dump = 0; static int do_psnr = 0; -static int do_vstats = 0; static int do_pass = 0; static char *pass_logfilename = NULL; static int audio_stream_copy = 0; @@ -177,11 +176,13 @@ static int audio_sync_method= 0; static int copy_ts= 0; static int opt_shortest = 0; // static int video_global_header = 0; +static char *vstats_filename; +static FILE *fvstats; static int rate_emu = 0; static int video_channel = 0; -static char *video_standard = "ntsc"; +static char *video_standard; static int audio_volume = 256; @@ -196,17 +197,19 @@ static int64_t extra_size = 0; static int nb_frames_dup = 0; static int nb_frames_drop = 0; static int input_sync; -static int limit_filesize = 0; // +static uint64_t limit_filesize = 0; // static int pgmyuv_compatibility_hack=0; static int dts_delta_threshold = 10; static int sws_flags = SWS_BICUBIC; -const char **opt_names=NULL; -int opt_name_count=0; -AVCodecContext *avctx_opts[CODEC_TYPE_NB]; -AVFormatContext *avformat_opts; +static const char **opt_names; +static int opt_name_count; +static AVCodecContext *avctx_opts[CODEC_TYPE_NB]; +static AVFormatContext *avformat_opts; +static struct SwsContext *sws_opts; +static int64_t timer_start; static AVBitStreamFilterContext *video_bitstream_filters=NULL; static AVBitStreamFilterContext *audio_bitstream_filters=NULL; @@ -271,8 +274,6 @@ typedef struct AVInputFile { int eof_reached; /* true if eof reached */ int ist_index; /* index of first stream in ist_table */ int buffer_size; /* current total buffer size */ - int buffer_size_max; /* buffer size at which we consider we can stop - buffering */ int nb_streams; /* nb streams we are aware of */ } AVInputFile; @@ -596,13 +597,14 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void picture2 = picture; } } else { - img_copy(picture2, picture, dec->pix_fmt, dec->width, dec->height); + av_picture_copy(picture2, picture, dec->pix_fmt, dec->width, dec->height); } } else { picture2 = picture; } - frame_hook_process(picture2, dec->pix_fmt, dec->width, dec->height); + frame_hook_process(picture2, dec->pix_fmt, dec->width, dec->height, + 1000000 * ist->pts / AV_TIME_BASE); if (picture != picture2) *picture = *picture2; @@ -676,7 +678,6 @@ static void do_video_out(AVFormatContext *s, int nb_frames, i, ret; AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src; AVFrame picture_crop_temp, picture_pad_temp; - uint8_t *buf = NULL, *buf1 = NULL; AVCodecContext *enc, *dec; avcodec_get_frame_defaults(&picture_crop_temp); @@ -716,9 +717,9 @@ static void do_video_out(AVFormatContext *s, return; if (ost->video_crop) { - if (img_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { + if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { av_log(NULL, AV_LOG_ERROR, "error cropping picture\n"); - goto the_end; + return; } formatted_picture = &picture_crop_temp; } else { @@ -731,9 +732,9 @@ static void do_video_out(AVFormatContext *s, if (ost->video_pad) { final_picture = &ost->pict_tmp; if (ost->video_resample) { - if (img_crop((AVPicture *)&picture_pad_temp, (AVPicture *)final_picture, enc->pix_fmt, ost->padtop, ost->padleft) < 0) { + if (av_picture_crop((AVPicture *)&picture_pad_temp, (AVPicture *)final_picture, enc->pix_fmt, ost->padtop, ost->padleft) < 0) { av_log(NULL, AV_LOG_ERROR, "error padding picture\n"); - goto the_end; + return; } resampling_dst = &picture_pad_temp; } @@ -747,7 +748,7 @@ static void do_video_out(AVFormatContext *s, } if (ost->video_pad) { - img_pad((AVPicture*)final_picture, (AVPicture *)padding_src, + av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, enc->height, enc->width, enc->pix_fmt, ost->padtop, ost->padbottom, ost->padleft, ost->padright, padcolor); } @@ -832,9 +833,6 @@ static void do_video_out(AVFormatContext *s, ost->sync_opts++; ost->frame_number++; } - the_end: - av_free(buf); - av_free(buf1); } static double psnr(double d){ @@ -845,22 +843,14 @@ static double psnr(double d){ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, int frame_size) { - static FILE *fvstats=NULL; - char filename[40]; - time_t today2; - struct tm *today; AVCodecContext *enc; int frame_number; int64_t ti; double ti1, bitrate, avg_bitrate; + /* this is executed just the first time do_video_stats is called */ if (!fvstats) { - today2 = time(NULL); - today = localtime(&today2); - snprintf(filename, sizeof(filename), "vstats_%02d%02d%02d.log", today->tm_hour, - today->tm_min, - today->tm_sec); - fvstats = fopen(filename,"w"); + fvstats = fopen(vstats_filename, "w"); if (!fvstats) { perror("fopen"); exit(1); @@ -919,7 +909,9 @@ static void print_report(AVFormatContext **output_files, oc = output_files[0]; - total_size = url_ftell(&oc->pb); + total_size = url_fsize(&oc->pb); + if(total_size<0) // FIXME improve url_fsize() so it works with non seekable output too + total_size= url_ftell(&oc->pb); buf[0] = '\0'; ti1 = 1e10; @@ -933,9 +925,12 @@ static void print_report(AVFormatContext **output_files, enc->coded_frame->quality/(float)FF_QP2LAMBDA); } if (!vid && enc->codec_type == CODEC_TYPE_VIDEO) { + float t = (av_gettime()-timer_start) / 1000000.0; + frame_number = ost->frame_number; - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "frame=%5d q=%3.1f ", - frame_number, enc->coded_frame ? enc->coded_frame->quality/(float)FF_QP2LAMBDA : -1); + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "frame=%5d fps=%3d q=%3.1f ", + frame_number, (t>1)?(int)(frame_number/t+0.5) : 0, + enc->coded_frame ? enc->coded_frame->quality/(float)FF_QP2LAMBDA : -1); if(is_last_report) snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "L"); if(qp_hist && enc->coded_frame){ @@ -1051,7 +1046,7 @@ static int output_packet(AVInputStream *ist, int ist_index, switch(ist->st->codec->codec_type) { case CODEC_TYPE_AUDIO:{ if(pkt) - samples= av_fast_realloc(samples, &samples_size, FFMAX(pkt->size, AVCODEC_MAX_AUDIO_FRAME_SIZE)); + samples= av_fast_realloc(samples, &samples_size, FFMAX(pkt->size*sizeof(*samples), AVCODEC_MAX_AUDIO_FRAME_SIZE)); data_size= samples_size; /* XXX: could avoid copy if PCM 16 bits with same endianness as CPU */ @@ -1107,165 +1102,165 @@ static int output_packet(AVInputStream *ist, int ist_index, goto fail_decode; } } else { - switch(ist->st->codec->codec_type) { - case CODEC_TYPE_AUDIO: - ist->next_pts += ((int64_t)AV_TIME_BASE * ist->st->codec->frame_size) / - (ist->st->codec->sample_rate * ist->st->codec->channels); - break; - case CODEC_TYPE_VIDEO: - if (ist->st->codec->time_base.num != 0) { - ist->next_pts += ((int64_t)AV_TIME_BASE * - ist->st->codec->time_base.num) / - ist->st->codec->time_base.den; - } - break; + switch(ist->st->codec->codec_type) { + case CODEC_TYPE_AUDIO: + ist->next_pts += ((int64_t)AV_TIME_BASE * ist->st->codec->frame_size) / + (ist->st->codec->sample_rate * ist->st->codec->channels); + break; + case CODEC_TYPE_VIDEO: + if (ist->st->codec->time_base.num != 0) { + ist->next_pts += ((int64_t)AV_TIME_BASE * + ist->st->codec->time_base.num) / + ist->st->codec->time_base.den; } - data_buf = ptr; - data_size = len; - ret = len; - len = 0; - } - - buffer_to_free = NULL; - if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO) { - pre_process_video_frame(ist, (AVPicture *)&picture, - &buffer_to_free); + break; } - - // preprocess audio (volume) - if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { - if (audio_volume != 256) { - short *volp; - volp = samples; - for(i=0;i<(data_size / sizeof(short));i++) { - int v = ((*volp) * audio_volume + 128) >> 8; - if (v < -32768) v = -32768; - if (v > 32767) v = 32767; - *volp++ = v; - } + data_buf = ptr; + data_size = len; + ret = len; + len = 0; + } + + buffer_to_free = NULL; + if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO) { + pre_process_video_frame(ist, (AVPicture *)&picture, + &buffer_to_free); + } + + // preprocess audio (volume) + if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { + if (audio_volume != 256) { + short *volp; + volp = samples; + for(i=0;i<(data_size / sizeof(short));i++) { + int v = ((*volp) * audio_volume + 128) >> 8; + if (v < -32768) v = -32768; + if (v > 32767) v = 32767; + *volp++ = v; } } + } - /* frame rate emulation */ - if (ist->st->codec->rate_emu) { - int64_t pts = av_rescale((int64_t) ist->frame * ist->st->codec->time_base.num, 1000000, ist->st->codec->time_base.den); - int64_t now = av_gettime() - ist->start; - if (pts > now) - usleep(pts - now); + /* frame rate emulation */ + if (ist->st->codec->rate_emu) { + int64_t pts = av_rescale((int64_t) ist->frame * ist->st->codec->time_base.num, 1000000, ist->st->codec->time_base.den); + int64_t now = av_gettime() - ist->start; + if (pts > now) + usleep(pts - now); - ist->frame++; - } + ist->frame++; + } #if 0 - /* mpeg PTS deordering : if it is a P or I frame, the PTS - is the one of the next displayed one */ - /* XXX: add mpeg4 too ? */ - if (ist->st->codec->codec_id == CODEC_ID_MPEG1VIDEO) { - if (ist->st->codec->pict_type != B_TYPE) { - int64_t tmp; - tmp = ist->last_ip_pts; - ist->last_ip_pts = ist->frac_pts.val; - ist->frac_pts.val = tmp; - } + /* mpeg PTS deordering : if it is a P or I frame, the PTS + is the one of the next displayed one */ + /* XXX: add mpeg4 too ? */ + if (ist->st->codec->codec_id == CODEC_ID_MPEG1VIDEO) { + if (ist->st->codec->pict_type != B_TYPE) { + int64_t tmp; + tmp = ist->last_ip_pts; + ist->last_ip_pts = ist->frac_pts.val; + ist->frac_pts.val = tmp; } + } #endif - /* if output time reached then transcode raw format, - encode packets and output them */ - if (start_time == 0 || ist->pts >= start_time) - for(i=0;ipts >= start_time) + for(i=0;isource_index == ist_index) { - os = output_files[ost->file_index]; + ost = ost_table[i]; + if (ost->source_index == ist_index) { + os = output_files[ost->file_index]; #if 0 - printf("%d: got pts=%0.3f %0.3f\n", i, - (double)pkt->pts / AV_TIME_BASE, - ((double)ist->pts / AV_TIME_BASE) - - ((double)ost->st->pts.val * ost->st->time_base.num / ost->st->time_base.den)); + printf("%d: got pts=%0.3f %0.3f\n", i, + (double)pkt->pts / AV_TIME_BASE, + ((double)ist->pts / AV_TIME_BASE) - + ((double)ost->st->pts.val * ost->st->time_base.num / ost->st->time_base.den)); #endif - /* set the input output pts pairs */ - //ost->sync_ipts = (double)(ist->pts + input_files_ts_offset[ist->file_index] - start_time)/ AV_TIME_BASE; - - if (ost->encoding_needed) { - switch(ost->st->codec->codec_type) { - case CODEC_TYPE_AUDIO: - do_audio_out(os, ost, ist, data_buf, data_size); - break; - case CODEC_TYPE_VIDEO: - do_video_out(os, ost, ist, &picture, &frame_size); - video_size += frame_size; - if (do_vstats && frame_size) - do_video_stats(os, ost, frame_size); - break; - case CODEC_TYPE_SUBTITLE: - do_subtitle_out(os, ost, ist, &subtitle, - pkt->pts); - break; - default: - av_abort(); - } - } else { - AVFrame avframe; //FIXME/XXX remove this - AVPacket opkt; - av_init_packet(&opkt); - - /* no reencoding needed : output the packet directly */ - /* force the input stream PTS */ - - avcodec_get_frame_defaults(&avframe); - ost->st->codec->coded_frame= &avframe; - avframe.key_frame = pkt->flags & PKT_FLAG_KEY; - - if(ost->st->codec->codec_type == CODEC_TYPE_AUDIO) - audio_size += data_size; - else if (ost->st->codec->codec_type == CODEC_TYPE_VIDEO) { - video_size += data_size; - ost->sync_opts++; - } + /* set the input output pts pairs */ + //ost->sync_ipts = (double)(ist->pts + input_files_ts_offset[ist->file_index] - start_time)/ AV_TIME_BASE; - opkt.stream_index= ost->index; - if(pkt->pts != AV_NOPTS_VALUE) - opkt.pts= av_rescale_q(av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q) + input_files_ts_offset[ist->file_index], AV_TIME_BASE_Q, ost->st->time_base); - else - opkt.pts= AV_NOPTS_VALUE; - - { - int64_t dts; - if (pkt->dts == AV_NOPTS_VALUE) - dts = ist->next_pts; - else - dts= av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); - opkt.dts= av_rescale_q(dts + input_files_ts_offset[ist->file_index], AV_TIME_BASE_Q, ost->st->time_base); - } - opkt.flags= pkt->flags; + if (ost->encoding_needed) { + switch(ost->st->codec->codec_type) { + case CODEC_TYPE_AUDIO: + do_audio_out(os, ost, ist, data_buf, data_size); + break; + case CODEC_TYPE_VIDEO: + do_video_out(os, ost, ist, &picture, &frame_size); + video_size += frame_size; + if (vstats_filename && frame_size) + do_video_stats(os, ost, frame_size); + break; + case CODEC_TYPE_SUBTITLE: + do_subtitle_out(os, ost, ist, &subtitle, + pkt->pts); + break; + default: + av_abort(); + } + } else { + AVFrame avframe; //FIXME/XXX remove this + AVPacket opkt; + av_init_packet(&opkt); + + /* no reencoding needed : output the packet directly */ + /* force the input stream PTS */ + + avcodec_get_frame_defaults(&avframe); + ost->st->codec->coded_frame= &avframe; + avframe.key_frame = pkt->flags & PKT_FLAG_KEY; + + if(ost->st->codec->codec_type == CODEC_TYPE_AUDIO) + audio_size += data_size; + else if (ost->st->codec->codec_type == CODEC_TYPE_VIDEO) { + video_size += data_size; + ost->sync_opts++; + } - //FIXME remove the following 2 lines they shall be replaced by the bitstream filters - if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & PKT_FLAG_KEY)) - opkt.destruct= av_destruct_packet; + opkt.stream_index= ost->index; + if(pkt->pts != AV_NOPTS_VALUE) + opkt.pts= av_rescale_q(av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q) + input_files_ts_offset[ist->file_index], AV_TIME_BASE_Q, ost->st->time_base); + else + opkt.pts= AV_NOPTS_VALUE; - write_frame(os, &opkt, ost->st->codec, bitstream_filters[ost->file_index][pkt->stream_index]); - ost->st->codec->frame_number++; - ost->frame_number++; - av_free_packet(&opkt); + { + int64_t dts; + if (pkt->dts == AV_NOPTS_VALUE) + dts = ist->next_pts; + else + dts= av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); + opkt.dts= av_rescale_q(dts + input_files_ts_offset[ist->file_index], AV_TIME_BASE_Q, ost->st->time_base); } + opkt.flags= pkt->flags; + + //FIXME remove the following 2 lines they shall be replaced by the bitstream filters + if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & PKT_FLAG_KEY)) + opkt.destruct= av_destruct_packet; + + write_frame(os, &opkt, ost->st->codec, bitstream_filters[ost->file_index][pkt->stream_index]); + ost->st->codec->frame_number++; + ost->frame_number++; + av_free_packet(&opkt); } } - av_free(buffer_to_free); - /* XXX: allocate the subtitles in the codec ? */ - if (subtitle_to_free) { - if (subtitle_to_free->rects != NULL) { - for (i = 0; i < subtitle_to_free->num_rects; i++) { - av_free(subtitle_to_free->rects[i].bitmap); - av_free(subtitle_to_free->rects[i].rgba_palette); - } - av_freep(&subtitle_to_free->rects); + } + av_free(buffer_to_free); + /* XXX: allocate the subtitles in the codec ? */ + if (subtitle_to_free) { + if (subtitle_to_free->rects != NULL) { + for (i = 0; i < subtitle_to_free->num_rects; i++) { + av_free(subtitle_to_free->rects[i].bitmap); + av_free(subtitle_to_free->rects[i].rgba_palette); } - subtitle_to_free->num_rects = 0; - subtitle_to_free = NULL; + av_freep(&subtitle_to_free->rects); } + subtitle_to_free->num_rects = 0; + subtitle_to_free = NULL; } + } discard_packet: if (pkt == NULL) { /* EOF handling */ @@ -1354,7 +1349,6 @@ static int av_encode(AVFormatContext **output_files, AVOutputStream *ost, **ost_table = NULL; AVInputStream *ist, **ist_table = NULL; AVInputFile *file_table; - AVFormatContext *stream_no_data; int key; file_table= (AVInputFile*) av_mallocz(nb_input_files * sizeof(AVInputFile)); @@ -1612,9 +1606,11 @@ static int av_encode(AVFormatContext **output_files, if (ost->video_resample) { avcodec_get_frame_defaults(&ost->pict_tmp); if( avpicture_alloc( (AVPicture*)&ost->pict_tmp, codec->pix_fmt, - codec->width, codec->height ) ) + codec->width, codec->height ) ) { + fprintf(stderr, "Cannot allocate temp picture, check pix fmt\n"); exit(1); - + } + sws_flags = av_get_int(sws_opts, "sws_flags", NULL); ost->img_resample_ctx = sws_getContext( icodec->width - (frame_leftBand + frame_rightBand), icodec->height - (frame_topBand + frame_bottomBand), @@ -1769,11 +1765,6 @@ static int av_encode(AVFormatContext **output_files, ist->is_start = 1; } - /* compute buffer size max (should use a complete heuristic) */ - for(i=0;ipb)) + if (limit_filesize != 0 && limit_filesize < url_ftell(&output_files[0]->pb)) break; /* read a frame from it and output it in the fifo */ @@ -1891,13 +1882,8 @@ static int av_encode(AVFormatContext **output_files, if (opt_shortest) break; else continue; // } - if (!pkt.size) { - stream_no_data = is; - } else { - stream_no_data = 0; - } if (do_pkt_dump) { - av_pkt_dump(stdout, &pkt, do_hex_dump); + av_pkt_dump_log(NULL, AV_LOG_DEBUG, &pkt, do_hex_dump); } /* the following test is needed in case new streams appear dynamically in stream : we ignore them */ @@ -2046,6 +2032,7 @@ static void opt_format(const char *arg) pgmyuv_compatibility_hack=1; // opt_image_format(arg); arg = "image2"; + fprintf(stderr, "pgmyuv format is deprecated, use image2\n"); } file_iformat = av_find_input_format(arg); @@ -2079,7 +2066,7 @@ static void opt_verbose(const char *arg) static void opt_frame_rate(const char *arg) { - if (parse_frame_rate(&frame_rate, &frame_rate_base, arg) < 0) { + if (av_parse_video_frame_rate(&frame_rate, arg) < 0) { fprintf(stderr, "Incorrect frame rate\n"); exit(1); } @@ -2159,7 +2146,7 @@ static void opt_frame_crop_right(const char *arg) static void opt_frame_size(const char *arg) { - if (parse_image_size(&frame_width, &frame_height, arg) < 0) { + if (av_parse_video_frame_size(&frame_width, &frame_height, arg) < 0) { fprintf(stderr, "Incorrect frame size\n"); exit(1); } @@ -2255,10 +2242,24 @@ static void opt_frame_pad_right(const char *arg) } } +void list_pix_fmts(void) +{ + int i; + char pix_fmt_str[128]; + for (i=-1; i < PIX_FMT_NB; i++) { + avcodec_pix_fmt_string (pix_fmt_str, sizeof(pix_fmt_str), i); + fprintf(stdout, "%s\n", pix_fmt_str); + } +} static void opt_frame_pix_fmt(const char *arg) { - frame_pix_fmt = avcodec_get_pix_fmt(arg); + if (strcmp(arg, "list")) + frame_pix_fmt = avcodec_get_pix_fmt(arg); + else { + list_pix_fmts(); + exit(0); + } } static void opt_frame_aspect_ratio(const char *arg) @@ -2323,11 +2324,6 @@ static void opt_thread_count(const char *arg) #endif } -static void opt_audio_bitrate(const char *arg) -{ - audio_bit_rate = atoi(arg) * 1000; -} - static void opt_audio_rate(const char *arg) { audio_sample_rate = atoi(arg); @@ -2534,8 +2530,8 @@ static void opt_input_file(const char *filename) ap->prealloced_context = 1; ap->sample_rate = audio_sample_rate; ap->channels = audio_channels; - ap->time_base.den = frame_rate; - ap->time_base.num = frame_rate_base; + ap->time_base.den = frame_rate.num; + ap->time_base.num = frame_rate.den; ap->width = frame_width + frame_padleft + frame_padright; ap->height = frame_height + frame_padtop + frame_padbottom; ap->pix_fmt = frame_pix_fmt; @@ -2589,10 +2585,8 @@ static void opt_input_file(const char *filename) for(i=0;inb_streams;i++) { int j; AVCodecContext *enc = ic->streams[i]->codec; -#if defined(HAVE_THREADS) if(thread_count>1) avcodec_thread_init(enc, thread_count); -#endif enc->thread_count= thread_count; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: @@ -2634,8 +2628,8 @@ static void opt_input_file(const char *filename) (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; + frame_rate.num = rfps; + frame_rate.den = rfps_base; enc->rate_emu = rate_emu; if(video_disable) @@ -2711,13 +2705,12 @@ static void new_video_stream(AVFormatContext *oc) fprintf(stderr, "Could not alloc stream\n"); exit(1); } + avcodec_get_context_defaults2(st->codec, CODEC_TYPE_VIDEO); bitstream_filters[nb_output_files][oc->nb_streams - 1]= video_bitstream_filters; video_bitstream_filters= NULL; -#if defined(HAVE_THREADS) if(thread_count>1) avcodec_thread_init(st->codec, thread_count); -#endif video_enc = st->codec; @@ -2756,11 +2749,11 @@ static void new_video_stream(AVFormatContext *oc) av_set_double(video_enc, opt_names[i], d); } - video_enc->time_base.den = frame_rate; - video_enc->time_base.num = frame_rate_base; + video_enc->time_base.den = frame_rate.num; + video_enc->time_base.num = frame_rate.den; if(codec && codec->supported_framerates){ const AVRational *p= codec->supported_framerates; - AVRational req= (AVRational){frame_rate, frame_rate_base}; + AVRational req= (AVRational){frame_rate.num, frame_rate.den}; const AVRational *best=NULL; AVRational best_error= (AVRational){INT_MAX, 1}; for(; p->den!=0; p++){ @@ -2869,14 +2862,13 @@ static void new_audio_stream(AVFormatContext *oc) fprintf(stderr, "Could not alloc stream\n"); exit(1); } + avcodec_get_context_defaults2(st->codec, CODEC_TYPE_AUDIO); bitstream_filters[nb_output_files][oc->nb_streams - 1]= audio_bitstream_filters; audio_bitstream_filters= NULL; -#if defined(HAVE_THREADS) if(thread_count>1) avcodec_thread_init(st->codec, thread_count); -#endif audio_enc = st->codec; audio_enc->codec_type = CODEC_TYPE_AUDIO; @@ -2906,7 +2898,6 @@ static void new_audio_stream(AVFormatContext *oc) codec_id = audio_codec_id; audio_enc->codec_id = codec_id; - audio_enc->bit_rate = audio_bit_rate; if (audio_qscale > QSCALE_NONE) { audio_enc->flags |= CODEC_FLAG_QSCALE; audio_enc->global_quality = st->quality = FF_QP2LAMBDA * audio_qscale; @@ -2917,7 +2908,7 @@ static void new_audio_stream(AVFormatContext *oc) audio_enc->sample_rate = audio_sample_rate; audio_enc->time_base= (AVRational){1, audio_sample_rate}; if (audio_language) { - pstrcpy(st->language, sizeof(st->language), audio_language); + av_strlcpy(st->language, audio_language, sizeof(st->language)); av_free(audio_language); audio_language = NULL; } @@ -2946,6 +2937,7 @@ static void opt_new_subtitle_stream(void) fprintf(stderr, "Could not alloc stream\n"); exit(1); } + avcodec_get_context_defaults2(st->codec, CODEC_TYPE_SUBTITLE); subtitle_enc = st->codec; subtitle_enc->codec_type = CODEC_TYPE_SUBTITLE; @@ -2962,7 +2954,7 @@ static void opt_new_subtitle_stream(void) } if (subtitle_language) { - pstrcpy(st->language, sizeof(st->language), subtitle_language); + av_strlcpy(st->language, subtitle_language, sizeof(st->language)); av_free(subtitle_language); subtitle_language = NULL; } @@ -3014,10 +3006,10 @@ static void opt_output_file(const char *filename) } oc->oformat = file_oformat; - pstrcpy(oc->filename, sizeof(oc->filename), filename); + av_strlcpy(oc->filename, filename, sizeof(oc->filename)); if (!strcmp(file_oformat->name, "ffm") && - strstart(filename, "http:", NULL)) { + av_strstart(filename, "http:", NULL)) { /* special case for files sent to ffserver: we get the stream parameters from ffserver */ if (read_ffserver_streams(oc, filename) < 0) { @@ -3057,15 +3049,15 @@ static void opt_output_file(const char *filename) oc->timestamp = rec_timestamp; if (str_title) - pstrcpy(oc->title, sizeof(oc->title), str_title); + av_strlcpy(oc->title, str_title, sizeof(oc->title)); if (str_author) - pstrcpy(oc->author, sizeof(oc->author), str_author); + av_strlcpy(oc->author, str_author, sizeof(oc->author)); if (str_copyright) - pstrcpy(oc->copyright, sizeof(oc->copyright), str_copyright); + av_strlcpy(oc->copyright, str_copyright, sizeof(oc->copyright)); if (str_comment) - pstrcpy(oc->comment, sizeof(oc->comment), str_comment); + av_strlcpy(oc->comment, str_comment, sizeof(oc->comment)); if (str_album) - pstrcpy(oc->album, sizeof(oc->album), str_album); + av_strlcpy(oc->album, str_album, sizeof(oc->album)); } output_files[nb_output_files++] = oc; @@ -3082,7 +3074,7 @@ static void opt_output_file(const char *filename) /* test if it already exists to avoid loosing precious files */ if (!file_overwrite && (strchr(filename, ':') == NULL || - strstart(filename, "file:", NULL))) { + av_strstart(filename, "file:", NULL))) { if (url_exist(filename)) { int c; @@ -3284,11 +3276,11 @@ static void show_formats(void) } printf("\n\n"); printf( -"Note, the names of encoders and decoders dont always match, so there are\n" +"Note, the names of encoders and decoders do not always match, so there are\n" "several cases where the above table shows encoder only or decoder only entries\n" -"even though both encoding and decoding are supported for example, the h263\n" -"decoder corresponds to the h263 and h263p encoders, for file formats its even\n" -"worse\n"); +"even though both encoding and decoding are supported. For example, the h263\n" +"decoder corresponds to the h263 and h263p encoders, for file formats it is even\n" +"worse.\n"); exit(1); } @@ -3338,7 +3330,7 @@ static void opt_target(const char *arg) } else { int fr; /* Calculate FR via float to avoid int overflow */ - fr = (int)(frame_rate * 1000.0 / frame_rate_base); + fr = (int)(frame_rate.num * 1000.0 / frame_rate.den); if(fr == 25000) { norm = 0; } else if((fr == 29970) || (fr == 23976)) { @@ -3392,7 +3384,7 @@ static void opt_target(const char *arg) opt_default("minrate", "1150000"); opt_default("bufsize", "327680"); // 40*1024*8; - audio_bit_rate = 224000; + opt_default("ab", "224000"); audio_sample_rate = 44100; audio_channels = 2; @@ -3422,7 +3414,7 @@ static void opt_target(const char *arg) opt_default("flags", "+SCAN_OFFSET"); - audio_bit_rate = 224000; + opt_default("ab", "224000"); audio_sample_rate = 44100; opt_default("packetsize", "2324"); @@ -3445,7 +3437,7 @@ static void opt_target(const char *arg) opt_default("packetsize", "2048"); // from www.mpucoder.com: DVD sectors contain 2048 bytes of data, this is also the size of one pack. opt_default("muxrate", "10080000"); // from mplex project: data_rate = 1260000. mux_rate = data_rate * 8 - audio_bit_rate = 448000; + opt_default("ab", "448000"); audio_sample_rate = 48000; } else if(!strncmp(arg, "dv", 2)) { @@ -3466,13 +3458,30 @@ static void opt_target(const char *arg) } } +static void opt_vstats_file (const char *arg) +{ + av_free (vstats_filename); + vstats_filename=av_strdup (arg); +} + +static void opt_vstats (void) +{ + char filename[40]; + time_t today2 = time(NULL); + struct tm *today = localtime(&today2); + + snprintf(filename, sizeof(filename), "vstats_%02d%02d%02d.log", today->tm_hour, today->tm_min, + today->tm_sec); + opt_vstats_file(filename); +} + static void opt_video_bsf(const char *arg) { AVBitStreamFilterContext *bsfc= av_bitstream_filter_init(arg); //FIXME split name and args for filter at '=' AVBitStreamFilterContext **bsfp; if(!bsfc){ - fprintf(stderr, "Unkown bitstream filter %s\n", arg); + fprintf(stderr, "Unknown bitstream filter %s\n", arg); exit(1); } @@ -3490,7 +3499,7 @@ static void opt_audio_bsf(const char *arg) AVBitStreamFilterContext **bsfp; if(!bsfc){ - fprintf(stderr, "Unkown bitstream filter %s\n", arg); + fprintf(stderr, "Unknown bitstream filter %s\n", arg); exit(1); } @@ -3514,11 +3523,18 @@ static void show_version(void) static int opt_default(const char *opt, const char *arg){ int type; - const AVOption *o; - for(type=0; type