X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=e439bf2e833da09d756611da85536b1e4612326a;hb=4567b4bdab0172f6570a94548cf7f491a466938a;hp=ba9aa027b44332e954cdbc66b4ffaa9ff6663497;hpb=59fa3f96f48d12e189492ca3670991f91c316d4e;p=ffmpeg diff --git a/ffmpeg.c b/ffmpeg.c index ba9aa027b44..e439bf2e833 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1,5 +1,5 @@ /* - * FFmpeg main + * FFmpeg main * Copyright (c) 2000-2003 Fabrice Bellard * * This library is free software; you can redistribute it and/or @@ -14,13 +14,14 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #define HAVE_AV_CONFIG_H #include #include "avformat.h" #include "framehook.h" #include "dsputil.h" +#include "opt.h" #ifndef CONFIG_WIN32 #include @@ -52,6 +53,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 */ @@ -64,6 +67,7 @@ extern const OptionDef options[]; static void show_help(void); static void show_license(void); +static int opt_default(const char *opt, const char *arg); #define MAX_FILES 20 @@ -86,7 +90,7 @@ static AVImageFormat *image_format; 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,7 +100,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[3] = {INT_MAX, INT_MAX, INT_MAX}; +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; @@ -109,8 +113,6 @@ static int video_lmax = 31*FF_QP2LAMBDA; 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; @@ -141,79 +143,40 @@ 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 mb_decision = FF_MB_DECISION_SIMPLE; -static int ildct_cmp = FF_CMP_VSAD; -static int mb_cmp = FF_CMP_SAD; -static int sub_cmp = FF_CMP_SAD; -static int cmp = FF_CMP_SAD; -static int pre_cmp = FF_CMP_SAD; static int pre_me = 0; -static float lumi_mask = 0; -static float dark_mask = 0; -static float scplx_mask = 0; -static float tcplx_mask = 0; -static float p_mask = 0; -static int use_4mv = 0; -static int use_obmc = 0; -static int use_loop = 0; -static int use_aic = 0; -static int use_aiv = 0; -static int use_umv = 0; -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 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_concealment = 3; -static int dct_algo = 0; -static int idct_algo = 0; -static int use_part = 0; static int packet_size = 0; static int error_rate = 0; static int strict = 0; static int top_field_first = -1; -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; -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 lowres= 0; +static int me_penalty_compensation= 256; 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 genpts = 0; +static int qp_hist = 0; static int gop_size = 12; 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; 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; @@ -235,18 +198,27 @@ static int do_pkt_dump = 0; static int do_psnr = 0; static int do_vstats = 0; static int do_pass = 0; -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 +#ifdef CONFIG_VIDEO4LINUX2 +static char *video_grab_format = "video4linux2"; +#else static char *video_grab_format = "video4linux"; +#endif +#endif static char *video_device = NULL; static char *grab_device = NULL; static int video_channel = 0; @@ -271,10 +243,17 @@ static int input_sync; static int limit_filesize = 0; // static int pgmyuv_compatibility_hack=0; +static int dts_delta_threshold = 10; + +const char **opt_names=NULL; +int opt_name_count=0; +AVCodecContext *avctx_opts; #define DEFAULT_PASS_LOGFILENAME "ffmpeg2pass" +struct AVInputStream; + typedef struct AVOutputStream { int file_index; /* file index */ int index; /* stream index in the output file */ @@ -284,7 +263,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 */ @@ -294,13 +274,13 @@ typedef struct AVOutputStream { int video_crop; /* video_resample and video_crop are mutually exclusive */ int topBand; /* cropping area sizes */ int leftBand; - + int video_pad; /* video_resample and video_pad are mutually exclusive */ int padtop; /* padding area sizes */ int padbottom; int padleft; int padright; - + /* audio only */ int audio_resample; ReSampleContext *resample; /* for audio resampling */ @@ -367,7 +347,7 @@ static void term_init(void) tty.c_cflag |= CS8; tty.c_cc[VMIN] = 1; tty.c_cc[VTIME] = 0; - + tcsetattr (0, TCSANOW, &tty); signal(SIGINT , sigterm_handler); /* Interrupt (ANSI). */ @@ -445,8 +425,11 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename) for(i=0;inb_streams;i++) { AVStream *st; + // FIXME: a more elegant solution is needed st = av_mallocz(sizeof(AVStream)); memcpy(st, ic->streams[i], sizeof(AVStream)); + st->codec = avcodec_alloc_context(); + memcpy(st->codec, ic->streams[i]->codec, sizeof(AVCodecContext)); s->streams[i] = st; } @@ -454,10 +437,17 @@ 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, - AVOutputStream *ost, +static void do_audio_out(AVFormatContext *s, + AVOutputStream *ost, AVInputStream *ist, unsigned char *buf, int size) { @@ -467,7 +457,7 @@ static void do_audio_out(AVFormatContext *s, const int audio_out_size= 4*MAX_AUDIO_PACKET_SIZE; int size_out, frame_bytes, ret; - AVCodecContext *enc= &ost->st->codec; + AVCodecContext *enc= ost->st->codec; /* SC: dynamic allocation of buffers */ if (!audio_buf) @@ -478,10 +468,10 @@ 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 - - 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; + 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; //FIXME resample delay if(fabs(delta) > 50){ @@ -516,19 +506,19 @@ 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) - - fifo_size(&ost->fifo, ost->fifo.rptr)/(ost->st->codec.channels * 2); //FIXME wrong + 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) { buftmp = audio_buf; - size_out = audio_resample(ost->resample, + size_out = audio_resample(ost->resample, (short *)buftmp, (short *)buf, - size / (ist->st->codec.channels * 2)); + size / (ist->st->codec->channels * 2)); size_out = size_out * enc->channels * 2; } else { buftmp = buf; @@ -538,27 +528,27 @@ static void do_audio_out(AVFormatContext *s, /* now encode as many frames as possible */ if (enc->frame_size > 1) { /* output resampled raw samples */ - fifo_write(&ost->fifo, buftmp, size_out, + fifo_write(&ost->fifo, buftmp, size_out, &ost->fifo.wptr); frame_bytes = enc->frame_size * 2 * enc->channels; - - while (fifo_read(&ost->fifo, audio_buf, frame_bytes, + + 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, + ret = avcodec_encode_audio(enc, audio_out, audio_out_size, (short *)audio_buf); 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; + if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE) + pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); pkt.flags |= PKT_FLAG_KEY; av_interleaved_write_frame(s, &pkt); - + ost->sync_opts += enc->frame_size; } } else { @@ -570,6 +560,19 @@ static void do_audio_out(AVFormatContext *s, /* output a pcm frame */ /* XXX: change encoding codec API to avoid this ? */ switch(enc->codec->id) { + case CODEC_ID_PCM_S32LE: + case CODEC_ID_PCM_S32BE: + case CODEC_ID_PCM_U32LE: + case CODEC_ID_PCM_U32BE: + size_out = size_out << 1; + break; + case CODEC_ID_PCM_S24LE: + case CODEC_ID_PCM_S24BE: + case CODEC_ID_PCM_U24LE: + case CODEC_ID_PCM_U24BE: + case CODEC_ID_PCM_S24DAUD: + size_out = size_out / 2 * 3; + break; case CODEC_ID_PCM_S16LE: case CODEC_ID_PCM_S16BE: case CODEC_ID_PCM_U16LE: @@ -579,14 +582,14 @@ static void do_audio_out(AVFormatContext *s, size_out = size_out >> 1; break; } - ret = avcodec_encode_audio(enc, audio_out, size_out, - (short *)buftmp); + ret = avcodec_encode_audio(enc, audio_out, size_out, + (short *)buftmp); 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; + if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE) + pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); pkt.flags |= PKT_FLAG_KEY; av_interleaved_write_frame(s, &pkt); } @@ -599,7 +602,7 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void AVPicture picture_tmp; uint8_t *buf = 0; - dec = &ist->st->codec; + dec = ist->st->codec; /* deinterlace : must be done before any resize */ if (do_deinterlace || using_vhook) { @@ -610,12 +613,12 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void buf = av_malloc(size); if (!buf) return; - + picture2 = &picture_tmp; avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height); if (do_deinterlace){ - if(avpicture_deinterlace(picture2, picture, + if(avpicture_deinterlace(picture2, picture, dec->pix_fmt, dec->width, dec->height) < 0) { /* if error, do not deinterlace */ av_free(buf); @@ -623,7 +626,7 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void picture2 = picture; } } else { - if (img_convert(picture2, dec->pix_fmt, picture, + if (img_convert(picture2, dec->pix_fmt, picture, dec->pix_fmt, dec->width, dec->height) < 0) { /* if error, do not copy */ av_free(buf); @@ -649,15 +652,15 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void /* Expects img to be yuv420 */ static void fill_pad_region(AVPicture* img, int height, int width, int padtop, int padbottom, int padleft, int padright, int *color) { - + int i, y, shift; uint8_t *optr; - + for (i = 0; i < 3; i++) { shift = (i == 0) ? 0 : 1; - + if (padtop || padleft) { - memset(img->data[i], color[i], (((img->linesize[i] * padtop) + + memset(img->data[i], color[i], (((img->linesize[i] * padtop) + padleft) >> shift)); } @@ -670,7 +673,7 @@ static void fill_pad_region(AVPicture* img, int height, int width, optr += img->linesize[i]; } } - + if (padbottom || padright) { optr = img->data[i] + (((img->linesize[i] * (height - padbottom)) - padright) >> shift); memset(optr, color[i], (((img->linesize[i] * padbottom) + padright) >> shift)); @@ -678,11 +681,63 @@ static void fill_pad_region(AVPicture* img, int height, int width, } } +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, - AVOutputStream *ost, +static void do_video_out(AVFormatContext *s, + AVOutputStream *ost, AVInputStream *ist, AVFrame *in_picture, int *frame_size) @@ -693,12 +748,12 @@ static void do_video_out(AVFormatContext *s, uint8_t *buf = NULL, *buf1 = NULL; AVCodecContext *enc, *dec; enum PixelFormat target_pixfmt; - + avcodec_get_frame_defaults(&picture_format_temp); avcodec_get_frame_defaults(&picture_crop_temp); - enc = &ost->st->codec; - dec = &ist->st->codec; + enc = ost->st->codec; + dec = ist->st->codec; /* by default, we output a single frame */ nb_frames = 1; @@ -707,7 +762,7 @@ 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; @@ -724,10 +779,10 @@ 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) + if (nb_frames <= 0) return; /* convert pixel format if needed */ @@ -743,9 +798,9 @@ static void do_video_out(AVFormatContext *s, return; formatted_picture = &picture_format_temp; avpicture_fill((AVPicture*)formatted_picture, buf, target_pixfmt, dec->width, dec->height); - - if (img_convert((AVPicture*)formatted_picture, target_pixfmt, - (AVPicture *)in_picture, dec->pix_fmt, + + if (img_convert((AVPicture*)formatted_picture, target_pixfmt, + (AVPicture *)in_picture, dec->pix_fmt, dec->width, dec->height) < 0) { if (verbose >= 0) @@ -763,17 +818,17 @@ static void do_video_out(AVFormatContext *s, if (ost->video_resample) { final_picture = &ost->pict_tmp; img_resample(ost->img_resample_ctx, (AVPicture*)final_picture, (AVPicture*)formatted_picture); - + if (ost->padtop || ost->padbottom || ost->padleft || ost->padright) { fill_pad_region((AVPicture*)final_picture, enc->height, enc->width, ost->padtop, ost->padbottom, ost->padleft, ost->padright, padcolor); } - - if (enc->pix_fmt != PIX_FMT_YUV420P) { + + if (enc->pix_fmt != PIX_FMT_YUV420P) { int size; - - av_free(buf); + + av_free(buf); /* create temporary picture */ size = avpicture_get_size(enc->pix_fmt, enc->width, enc->height); buf = av_malloc(size); @@ -781,9 +836,9 @@ static void do_video_out(AVFormatContext *s, return; final_picture = &picture_format_temp; avpicture_fill((AVPicture*)final_picture, buf, enc->pix_fmt, enc->width, enc->height); - - if (img_convert((AVPicture*)final_picture, enc->pix_fmt, - (AVPicture*)&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) @@ -791,22 +846,12 @@ static void do_video_out(AVFormatContext *s, goto the_end; } - } + } } else if (ost->video_crop) { - picture_crop_temp.data[0] = formatted_picture->data[0] + - (ost->topBand * formatted_picture->linesize[0]) + ost->leftBand; - - picture_crop_temp.data[1] = formatted_picture->data[1] + - ((ost->topBand >> 1) * formatted_picture->linesize[1]) + - (ost->leftBand >> 1); - - picture_crop_temp.data[2] = formatted_picture->data[2] + - ((ost->topBand >> 1) * formatted_picture->linesize[2]) + - (ost->leftBand >> 1); - - picture_crop_temp.linesize[0] = formatted_picture->linesize[0]; - picture_crop_temp.linesize[1] = formatted_picture->linesize[1]; - picture_crop_temp.linesize[2] = formatted_picture->linesize[2]; + if (img_crop((AVPicture *)&picture_crop_temp, (AVPicture *)formatted_picture, enc->pix_fmt, ost->topBand, ost->leftBand) < 0) { + av_log(NULL, AV_LOG_ERROR, "error cropping picture\n"); + goto the_end; + } final_picture = &picture_crop_temp; } else if (ost->video_pad) { final_picture = &ost->pict_tmp; @@ -815,9 +860,9 @@ static void do_video_out(AVFormatContext *s, uint8_t *optr, *iptr; int shift = (i == 0) ? 0 : 1; int y, yheight; - + /* set offset to start writing image into */ - optr = final_picture->data[i] + (((final_picture->linesize[i] * + optr = final_picture->data[i] + (((final_picture->linesize[i] * ost->padtop) + ost->padleft) >> shift); iptr = formatted_picture->data[i]; @@ -833,7 +878,7 @@ static void do_video_out(AVFormatContext *s, fill_pad_region((AVPicture*)final_picture, enc->height, enc->width, ost->padtop, ost->padbottom, ost->padleft, ost->padright, padcolor); - + if (enc->pix_fmt != PIX_FMT_YUV420P) { int size; @@ -846,8 +891,8 @@ static void do_video_out(AVFormatContext *s, final_picture = &picture_format_temp; avpicture_fill((AVPicture*)final_picture, buf, enc->pix_fmt, enc->width, enc->height); - if (img_convert((AVPicture*)final_picture, enc->pix_fmt, - (AVPicture*)&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) @@ -870,16 +915,16 @@ static void do_video_out(AVFormatContext *s, avoid any copies. We support temorarily the older method. */ AVFrame* old_frame = enc->coded_frame; - enc->coded_frame = dec->coded_frame; //FIXME/XXX remove this hack + 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 && enc->coded_frame->pts != AV_NOPTS_VALUE) + pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); if(dec->coded_frame && dec->coded_frame->key_frame) pkt.flags |= PKT_FLAG_KEY; av_interleaved_write_frame(s, &pkt); - enc->coded_frame = old_frame; + enc->coded_frame = old_frame; } else { AVFrame big_picture; @@ -887,7 +932,7 @@ static void do_video_out(AVFormatContext *s, /* better than nothing: use input picture interlaced settings */ big_picture.interlaced_frame = in_picture->interlaced_frame; - if(do_interlace_me || do_interlace_dct){ + if(avctx_opts->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)){ if(top_field_first == -1) big_picture.top_field_first = in_picture->top_field_first; else @@ -903,20 +948,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, + ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, &big_picture); //enc->frame_number = enc->real_pict_num; if(ret>0){ pkt.data= bit_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->pts != AV_NOPTS_VALUE) + 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->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; @@ -944,7 +990,7 @@ static double psnr(double d){ return -10.0*log(d)/log(10.0); } -static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, +static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, int frame_size) { static FILE *fvstats=NULL; @@ -955,7 +1001,7 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, int frame_number; int64_t ti; double ti1, bitrate, avg_bitrate; - + if (!fvstats) { today2 = time(NULL); today = localtime(&today2); @@ -968,32 +1014,32 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, exit(1); } } - + ti = MAXINT64; - enc = &ost->st->codec; + enc = ost->st->codec; 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); if (enc->flags&CODEC_FLAG_PSNR) fprintf(fvstats, "PSNR= %6.2f ", psnr(enc->coded_frame->error[0]/(enc->width*enc->height*255.0*255.0))); - + 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); - fprintf(fvstats,"type= %c\n", av_get_pict_type_char(enc->coded_frame->pict_type)); + fprintf(fvstats,"type= %c\n", av_get_pict_type_char(enc->coded_frame->pict_type)); } } static void print_report(AVFormatContext **output_files, - AVOutputStream **ost_table, int nb_ostreams, - int is_last_report) + AVOutputStream **ost_table, int nb_ostreams, + int is_last_report) { char buf[1024]; AVOutputStream *ost; @@ -1003,7 +1049,8 @@ static void print_report(AVFormatContext **output_files, int frame_number, vid, i; double bitrate, ti1, pts; static int64_t last_time = -1; - + static int qp_histogram[52]; + if (!is_last_report) { int64_t cur_time; /* display the report every 0.5 seconds */ @@ -1011,7 +1058,7 @@ static void print_report(AVFormatContext **output_files, if (last_time == -1) { last_time = cur_time; return; - } + } if ((cur_time - last_time) < 500000) return; last_time = cur_time; @@ -1021,24 +1068,32 @@ static void print_report(AVFormatContext **output_files, oc = output_files[0]; total_size = url_ftell(&oc->pb); - + buf[0] = '\0'; ti1 = 1e10; vid = 0; for(i=0;ifile_index]; - enc = &ost->st->codec; + enc = ost->st->codec; if (vid && enc->codec_type == CODEC_TYPE_VIDEO) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "q=%2.1f ", enc->coded_frame->quality/(float)FF_QP2LAMBDA); } if (!vid && enc->codec_type == CODEC_TYPE_VIDEO) { frame_number = ost->frame_number; - 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); + 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); if(is_last_report) snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "L"); + if(qp_hist && enc->coded_frame){ + int j; + int qp= lrintf(enc->coded_frame->quality/(float)FF_QP2LAMBDA); + if(qp>=0 && qpflags&CODEC_FLAG_PSNR){ int j; double error, error_sum=0; @@ -1069,24 +1124,24 @@ static void print_report(AVFormatContext **output_files, } if (ti1 < 0.01) ti1 = 0.01; - + if (verbose || is_last_report) { bitrate = (double)(total_size * 8) / ti1 / 1000.0; - - snprintf(buf + strlen(buf), sizeof(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) - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d", - nb_frames_dup, nb_frames_drop); - + if (verbose > 1) + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d", + nb_frames_dup, nb_frames_drop); + if (verbose >= 0) fprintf(stderr, "%s \r", buf); fflush(stderr); } - + if (is_last_report && verbose >= 0){ int64_t raw= audio_size + video_size + extra_size; fprintf(stderr, "\n"); @@ -1112,17 +1167,19 @@ static int output_packet(AVInputStream *ist, int ist_index, int data_size, got_picture; AVFrame picture; void *buffer_to_free; - static int samples_size= 0; + static unsigned 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); } - + if (pkt == NULL) { /* EOF handling */ ptr = NULL; @@ -1137,14 +1194,15 @@ 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) { + switch(ist->st->codec->codec_type) { case CODEC_TYPE_AUDIO:{ - if(pkt) + if(pkt) samples= av_fast_realloc(samples, &samples_size, FFMAX(pkt->size, AVCODEC_MAX_AUDIO_FRAME_SIZE)); /* XXX: could avoid copy if PCM 16 bits with same endianness as CPU */ - ret = avcodec_decode_audio(&ist->st->codec, samples, &data_size, + ret = avcodec_decode_audio(ist->st->codec, samples, &data_size, ptr, len); if (ret < 0) goto fail_decode; @@ -1157,44 +1215,55 @@ static int output_packet(AVInputStream *ist, int ist_index, continue; } data_buf = (uint8_t *)samples; - ist->next_pts += ((int64_t)AV_TIME_BASE/2 * data_size) / - (ist->st->codec.sample_rate * 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; + data_size = (ist->st->codec->width * ist->st->codec->height * 3) / 2; /* XXX: allocate picture correctly */ avcodec_get_frame_defaults(&picture); - ret = avcodec_decode_video(&ist->st->codec, + ret = avcodec_decode_video(ist->st->codec, &picture, &got_picture, ptr, len); ist->st->quality= picture.quality; - if (ret < 0) + if (ret < 0) goto fail_decode; if (!got_picture) { /* no picture yet */ goto discard_packet; } - if (ist->st->codec.frame_rate_base != 0) { - ist->next_pts += ((int64_t)AV_TIME_BASE * - ist->st->codec.frame_rate_base) / - ist->st->codec.frame_rate; + 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; } 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; } - } else { - switch(ist->st->codec.codec_type) { + 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); + 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.frame_rate_base != 0) { - ist->next_pts += ((int64_t)AV_TIME_BASE * - ist->st->codec.frame_rate_base) / - ist->st->codec.frame_rate; + 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; } @@ -1205,13 +1274,13 @@ static int output_packet(AVInputStream *ist, int ist_index, } buffer_to_free = NULL; - if (ist->st->codec.codec_type == CODEC_TYPE_VIDEO) { - pre_process_video_frame(ist, (AVPicture *)&picture, + 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 (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { if (audio_volume != 256) { short *volp; volp = samples; @@ -1225,8 +1294,8 @@ static int output_packet(AVInputStream *ist, int ist_index, } /* 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); + 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); @@ -1238,8 +1307,8 @@ static int output_packet(AVInputStream *ist, int ist_index, /* 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) { + 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; @@ -1247,8 +1316,8 @@ static int output_packet(AVInputStream *ist, int ist_index, } } #endif - /* if output time reached then transcode raw format, - encode packets and output them */ + /* if output time reached then transcode raw format, + encode packets and output them */ if (start_time == 0 || ist->pts >= start_time) for(i=0;ifile_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) - + 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])/ 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) { + switch(ost->st->codec->codec_type) { case CODEC_TYPE_AUDIO: do_audio_out(os, ost, ist, data_buf, data_size); break; @@ -1277,6 +1346,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(); } @@ -1287,49 +1360,69 @@ static int output_packet(AVInputStream *ist, int ist_index, /* 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; + ost->st->codec->coded_frame= &avframe; + avframe.key_frame = pkt->flags & PKT_FLAG_KEY; - if(ost->st->codec.codec_type == CODEC_TYPE_AUDIO) + 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; if(pkt->pts != AV_NOPTS_VALUE) - opkt.pts= pkt->pts + input_files_ts_offset[ist->file_index]; + 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; - opkt.dts= pkt->dts + input_files_ts_offset[ist->file_index]; + + { + 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->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); + } + subtitle_to_free->num_rects = 0; + subtitle_to_free = NULL; + } } discard_packet: if (pkt == NULL) { /* EOF handling */ - + for(i=0;isource_index == ist_index) { - AVCodecContext *enc= &ost->st->codec; + AVCodecContext *enc= ost->st->codec; os = output_files[ost->file_index]; - - if(ost->st->codec.codec_type == CODEC_TYPE_AUDIO && enc->frame_size <=1) + + if(ost->st->codec->codec_type == CODEC_TYPE_AUDIO && enc->frame_size <=1) continue; - if(ost->st->codec.codec_type == CODEC_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE)) + if(ost->st->codec->codec_type == CODEC_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE)) continue; if (ost->encoding_needed) { @@ -1337,9 +1430,9 @@ static int output_packet(AVInputStream *ist, int ist_index, AVPacket pkt; av_init_packet(&pkt); pkt.stream_index= ost->index; - - switch(ost->st->codec.codec_type) { - case CODEC_TYPE_AUDIO: + + switch(ost->st->codec->codec_type) { + case CODEC_TYPE_AUDIO: ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, NULL); audio_size += ret; pkt.flags |= PKT_FLAG_KEY; @@ -1356,20 +1449,20 @@ static int output_packet(AVInputStream *ist, int ist_index, default: ret=-1; } - + if(ret<=0) break; pkt.data= bit_buffer; pkt.size= ret; - if(enc->coded_frame) - pkt.pts= enc->coded_frame->pts; + if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE) + pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); av_interleaved_write_frame(os, &pkt); } } } } } - + return 0; fail_decode: return -1; @@ -1397,7 +1490,7 @@ static int av_encode(AVFormatContext **output_files, file_table= (AVInputFile*) av_mallocz(nb_input_files * sizeof(AVInputFile)); if (!file_table) goto fail; - + /* input stream init */ j = 0; for(i=0;idiscard = 1; /* the stream is discarded by default (changed later) */ - if (ist->st->codec.rate_emu) { + if (ist->st->codec->rate_emu) { ist->start = av_gettime(); ist->frame = 0; } @@ -1451,14 +1544,21 @@ static int av_encode(AVFormatContext **output_files, for(i=0;i nb_input_files - 1 || si < 0 || si > file_table[fi].nb_streams - 1) { 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); if (!ost_table) goto fail; @@ -1468,7 +1568,7 @@ static int av_encode(AVFormatContext **output_files, goto fail; ost_table[i] = ost; } - + n = 0; for(k=0;kindex = i; ost->st = os->streams[i]; if (nb_stream_maps > 0) { - ost->source_index = file_table[stream_maps[n-1].file_index].ist_index + + ost->source_index = file_table[stream_maps[n-1].file_index].ist_index + stream_maps[n-1].stream_index; - + /* Sanity check that the stream types match */ - if (ist_table[ost->source_index]->st->codec.codec_type != ost->st->codec.codec_type) { + if (ist_table[ost->source_index]->st->codec->codec_type != ost->st->codec->codec_type) { fprintf(stderr, "Codec type mismatch for mapping #%d.%d -> #%d.%d\n", stream_maps[n-1].file_index, stream_maps[n-1].stream_index, ost->file_index, ost->index); exit(1); } - + } else { /* get corresponding input stream index : we select the first one with the right type */ found = 0; for(j=0;jdiscard && - ist->st->codec.codec_type == ost->st->codec.codec_type) { + if (ist->discard && + ist->st->codec->codec_type == ost->st->codec->codec_type) { ost->source_index = j; found = 1; break; } } - + if (!found) { /* try again and reuse existing stream */ for(j=0;jst->codec.codec_type == ost->st->codec.codec_type) { + if (ist->st->codec->codec_type == ost->st->codec->codec_type) { ost->source_index = j; found = 1; } @@ -1521,6 +1621,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; } } @@ -1529,8 +1632,8 @@ static int av_encode(AVFormatContext **output_files, ost = ost_table[i]; ist = ist_table[ost->source_index]; - codec = &ost->st->codec; - icodec = &ist->st->codec; + codec = ost->st->codec; + icodec = ist->st->codec; if (ost->st->stream_copy) { /* if stream_copy is selected, no need to decode or encode */ @@ -1538,6 +1641,9 @@ static int av_encode(AVFormatContext **output_files, codec->codec_type = icodec->codec_type; 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; + codec->time_base = icodec->time_base; switch(codec->codec_type) { case CODEC_TYPE_AUDIO: codec->sample_rate = icodec->sample_rate; @@ -1546,12 +1652,13 @@ static int av_encode(AVFormatContext **output_files, 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->pix_fmt = icodec->pix_fmt; 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(); } @@ -1560,7 +1667,7 @@ static int av_encode(AVFormatContext **output_files, case CODEC_TYPE_AUDIO: if (fifo_init(&ost->fifo, 2 * MAX_AUDIO_PACKET_SIZE)) goto fail; - + if (codec->channels == icodec->channels && codec->sample_rate == icodec->sample_rate) { ost->audio_resample = 0; @@ -1578,7 +1685,7 @@ static int av_encode(AVFormatContext **output_files, ost->audio_resample = 1; } } else { - ost->audio_resample = 1; + ost->audio_resample = 1; } } if(audio_sync_method>1) @@ -1601,7 +1708,7 @@ static int av_encode(AVFormatContext **output_files, frame_topBand == 0 && frame_bottomBand == 0 && frame_leftBand == 0 && - frame_rightBand == 0 && + frame_rightBand == 0 && frame_padtop == 0 && frame_padbottom == 0 && frame_padleft == 0 && @@ -1613,16 +1720,17 @@ static int av_encode(AVFormatContext **output_files, } else if ((codec->width == icodec->width - (frame_leftBand + frame_rightBand)) && (codec->height == icodec->height - - (frame_topBand + frame_bottomBand))) - { + (frame_topBand + frame_bottomBand)) && + (frame_rightBand + frame_leftBand + frame_topBand + frame_bottomBand)) { ost->video_resample = 0; ost->video_crop = 1; ost->topBand = frame_topBand; ost->leftBand = frame_leftBand; - } else if ((codec->width == icodec->width + + } else if ((codec->width == icodec->width + (frame_padleft + frame_padright)) && (codec->height == icodec->height + - (frame_padtop + frame_padbottom))) { + (frame_padtop + frame_padbottom)) && + (frame_padright + frame_padleft + frame_padtop + frame_padbottom)) { ost->video_resample = 0; ost->video_crop = 0; ost->video_pad = 1; @@ -1642,36 +1750,41 @@ static int av_encode(AVFormatContext **output_files, codec->width, codec->height ) ) goto fail; - ost->img_resample_ctx = img_resample_full_init( - ost->st->codec.width, ost->st->codec.height, - ist->st->codec.width, ist->st->codec.height, + ost->img_resample_ctx = img_resample_full_init( + codec->width, codec->height, + icodec->width, icodec->height, frame_topBand, frame_bottomBand, - frame_leftBand, frame_rightBand, - frame_padtop, frame_padbottom, + frame_leftBand, frame_rightBand, + frame_padtop, frame_padbottom, frame_padleft, frame_padright); - + ost->padtop = frame_padtop; ost->padleft = frame_padleft; ost->padbottom = frame_padbottom; ost->padright = frame_padright; - + } 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 && + if (ost->encoding_needed && (codec->flags & (CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2))) { char logfilename[1024]; FILE *f; int size; char *logbuffer; - - snprintf(logfilename, sizeof(logfilename), "%s-%d.log", - pass_logfilename ? + + snprintf(logfilename, sizeof(logfilename), "%s-%d.log", + pass_logfilename ? pass_logfilename : DEFAULT_PASS_LOGFILENAME, i); if (codec->flags & CODEC_FLAG_PASS1) { f = fopen(logfilename, "w"); @@ -1724,11 +1837,16 @@ static int av_encode(AVFormatContext **output_files, fprintf(stderr, "Stream mapping:\n"); 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->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"); } } @@ -1737,18 +1855,18 @@ static int av_encode(AVFormatContext **output_files, ost = ost_table[i]; if (ost->encoding_needed) { AVCodec *codec; - codec = avcodec_find_encoder(ost->st->codec.codec_id); + codec = avcodec_find_encoder(ost->st->codec->codec_id); if (!codec) { - fprintf(stderr, "Unsupported codec for output stream #%d.%d\n", + fprintf(stderr, "Unsupported codec for output stream #%d.%d\n", ost->file_index, ost->index); exit(1); } - if (avcodec_open(&ost->st->codec, codec) < 0) { - fprintf(stderr, "Error while opening codec for output stream #%d.%d - maybe incorrect parameters such as bit_rate, rate, width or height\n", + if (avcodec_open(ost->st->codec, codec) < 0) { + 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); } - extra_size += ost->st->codec.extradata_size; + extra_size += ost->st->codec->extradata_size; } } @@ -1757,29 +1875,29 @@ static int av_encode(AVFormatContext **output_files, ist = ist_table[i]; if (ist->decoding_needed) { AVCodec *codec; - codec = avcodec_find_decoder(ist->st->codec.codec_id); + codec = avcodec_find_decoder(ist->st->codec->codec_id); if (!codec) { - fprintf(stderr, "Unsupported codec (id=%d) for input stream #%d.%d\n", - ist->st->codec.codec_id, ist->file_index, ist->index); + fprintf(stderr, "Unsupported codec (id=%d) for input stream #%d.%d\n", + ist->st->codec->codec_id, ist->file_index, ist->index); exit(1); } - if (avcodec_open(&ist->st->codec, codec) < 0) { - fprintf(stderr, "Error while opening codec for input stream #%d.%d\n", + if (avcodec_open(ist->st->codec, codec) < 0) { + fprintf(stderr, "Error while opening codec for input stream #%d.%d\n", ist->file_index, ist->index); exit(1); } - //if (ist->st->codec.codec_type == CODEC_TYPE_VIDEO) - // ist->st->codec.flags |= CODEC_FLAG_REPEAT_FIELD; + //if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO) + // ist->st->codec->flags |= CODEC_FLAG_REPEAT_FIELD; } } /* init pts */ for(i=0;ifile_index]; + 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; @@ -1807,8 +1925,8 @@ static int av_encode(AVFormatContext **output_files, fprintf(stderr, "Invalid input file index %d map_meta_data(%d,%d)\n", in_file_index, out_file_index, in_file_index); ret = -EINVAL; goto fail; - } - + } + out_file = output_files[out_file_index]; in_file = input_files[in_file_index]; @@ -1821,7 +1939,7 @@ static int av_encode(AVFormatContext **output_files, out_file->track = in_file->track; strcpy(out_file->genre, in_file->genre); } - + /* open files and write file headers */ for(i=0;ifile_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; + if(ost->st->codec->codec_type == CODEC_TYPE_VIDEO) + 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) { @@ -1885,7 +2003,7 @@ 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]){ + if(ost->frame_number >= max_frames[ost->st->codec->codec_type]){ file_index= -1; break; } @@ -1927,13 +2045,13 @@ 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); +// 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 && ist->next_pts != AV_NOPTS_VALUE) { - int64_t delta= pkt.dts - ist->next_pts; - if(ABS(delta) > 10LL*AV_TIME_BASE && !copy_ts){ + int64_t delta= av_rescale_q(pkt.dts, ist->st->time_base, AV_TIME_BASE_Q) - ist->next_pts; + if(ABS(delta) > 1LL*dts_delta_threshold*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]); + fprintf(stderr, "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n", delta, input_files_ts_offset[ist->file_index]); for(i=0; inext_pts += delta; @@ -1952,10 +2070,10 @@ static int av_encode(AVFormatContext **output_files, av_free_packet(&pkt); goto redo; } - + discard_packet: av_free_packet(&pkt); - + /* dump report by using the output first video and audio streams */ print_report(output_files, ost_table, nb_ostreams, 0); } @@ -1983,21 +2101,21 @@ static int av_encode(AVFormatContext **output_files, for(i=0;iencoding_needed) { - av_freep(&ost->st->codec.stats_in); - avcodec_close(&ost->st->codec); + av_freep(&ost->st->codec->stats_in); + avcodec_close(ost->st->codec); } } - + /* close each decoder */ for(i=0;idecoding_needed) { - avcodec_close(&ist->st->codec); + avcodec_close(ist->st->codec); } } /* finished ! */ - + ret = 0; fail1: av_freep(&bit_buffer); @@ -2061,7 +2179,7 @@ int file_read(const char *filename) static void opt_image_format(const char *arg) { AVImageFormat *f; - + for(f = first_image_format; f != NULL; f = f->next) { if (!strcmp(arg, f->name)) break; @@ -2131,16 +2249,6 @@ static void opt_workaround_bugs(const char *arg) workaround_bugs = atoi(arg); } -static void opt_dct_algo(const char *arg) -{ - dct_algo = atoi(arg); -} - -static void opt_idct_algo(const char *arg) -{ - idct_algo = atoi(arg); -} - static void opt_me_threshold(const char *arg) { me_threshold = atoi(arg); @@ -2151,26 +2259,6 @@ static void opt_mb_threshold(const char *arg) mb_threshold = atoi(arg); } -static void opt_error_resilience(const char *arg) -{ - error_resilience = atoi(arg); -} - -static void opt_error_concealment(const char *arg) -{ - error_concealment = atoi(arg); -} - -static void opt_debug(const char *arg) -{ - debug = atoi(arg); -} - -static void opt_vismv(const char *arg) -{ - debug_mv = atoi(arg); -} - static void opt_verbose(const char *arg) { verbose = atoi(arg); @@ -2181,13 +2269,13 @@ static void opt_frame_rate(const char *arg) { if (parse_frame_rate(&frame_rate, &frame_rate_base, arg) < 0) { fprintf(stderr, "Incorrect frame rate\n"); - exit(1); + exit(1); } } static void opt_frame_crop_top(const char *arg) { - frame_topBand = atoi(arg); + frame_topBand = atoi(arg); if (frame_topBand < 0) { fprintf(stderr, "Incorrect top crop size\n"); exit(1); @@ -2197,7 +2285,7 @@ static void opt_frame_crop_top(const char *arg) exit(1); } if ((frame_topBand) >= frame_height){ - fprintf(stderr, "Vertical crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n"); + fprintf(stderr, "Vertical crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n"); exit(1); } frame_height -= frame_topBand; @@ -2212,10 +2300,10 @@ static void opt_frame_crop_bottom(const char *arg) } if ((frame_bottomBand % 2) != 0) { fprintf(stderr, "Bottom crop size must be a multiple of 2\n"); - exit(1); + exit(1); } if ((frame_bottomBand) >= frame_height){ - fprintf(stderr, "Vertical crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n"); + fprintf(stderr, "Vertical crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n"); exit(1); } frame_height -= frame_bottomBand; @@ -2233,7 +2321,7 @@ static void opt_frame_crop_left(const char *arg) exit(1); } if ((frame_leftBand) >= frame_width){ - fprintf(stderr, "Horizontal crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n"); + fprintf(stderr, "Horizontal crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n"); exit(1); } frame_width -= frame_leftBand; @@ -2248,10 +2336,10 @@ static void opt_frame_crop_right(const char *arg) } if ((frame_rightBand % 2) != 0) { fprintf(stderr, "Right crop size must be a multiple of 2\n"); - exit(1); + exit(1); } if ((frame_rightBand) >= frame_width){ - fprintf(stderr, "Horizontal crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n"); + fprintf(stderr, "Horizontal crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n"); exit(1); } frame_width -= frame_rightBand; @@ -2272,7 +2360,7 @@ static void opt_frame_size(const char *arg) #define SCALEBITS 10 #define ONE_HALF (1 << (SCALEBITS - 1)) -#define FIX(x) ((int) ((x) * (1<> 16); + + r = (rgb >> 16); g = ((rgb >> 8) & 255); b = (rgb & 255); @@ -2303,7 +2391,7 @@ static void opt_pad_color(const char *arg) { static void opt_frame_pad_top(const char *arg) { - frame_padtop = atoi(arg); + frame_padtop = atoi(arg); if (frame_padtop < 0) { fprintf(stderr, "Incorrect top pad size\n"); exit(1); @@ -2316,7 +2404,7 @@ static void opt_frame_pad_top(const char *arg) static void opt_frame_pad_bottom(const char *arg) { - frame_padbottom = atoi(arg); + frame_padbottom = atoi(arg); if (frame_padbottom < 0) { fprintf(stderr, "Incorrect bottom pad size\n"); exit(1); @@ -2330,7 +2418,7 @@ static void opt_frame_pad_bottom(const char *arg) static void opt_frame_pad_left(const char *arg) { - frame_padleft = atoi(arg); + frame_padleft = atoi(arg); if (frame_padleft < 0) { fprintf(stderr, "Incorrect left pad size\n"); exit(1); @@ -2344,7 +2432,7 @@ static void opt_frame_pad_left(const char *arg) static void opt_frame_pad_right(const char *arg) { - frame_padright = atoi(arg); + frame_padright = atoi(arg); if (frame_padright < 0) { fprintf(stderr, "Incorrect right pad size\n"); exit(1); @@ -2366,20 +2454,20 @@ static void opt_frame_aspect_ratio(const char *arg) int x = 0, y = 0; double ar = 0; const char *p; - + p = strchr(arg, ':'); if (p) { x = strtol(arg, (char **)&arg, 10); - if (arg == p) - y = strtol(arg+1, (char **)&arg, 10); - if (x > 0 && y > 0) - ar = (double)x / (double)y; + if (arg == p) + y = strtol(arg+1, (char **)&arg, 10); + if (x > 0 && y > 0) + ar = (double)x / (double)y; } else ar = strtod(arg, (char **)&arg); if (!ar) { fprintf(stderr, "Incorrect aspect ratio specification.\n"); - exit(1); + exit(1); } frame_aspect_ratio = ar; } @@ -2401,66 +2489,11 @@ static void opt_b_frames(const char *arg) } } -static void opt_mb_decision(const char *arg) -{ - mb_decision = atoi(arg); -} - -static void opt_mb_cmp(const char *arg) -{ - mb_cmp = atoi(arg); -} - -static void opt_ildct_cmp(const char *arg) -{ - ildct_cmp = atoi(arg); -} - -static void opt_sub_cmp(const char *arg) -{ - sub_cmp = atoi(arg); -} - -static void opt_cmp(const char *arg) -{ - cmp = atoi(arg); -} - -static void opt_pre_cmp(const char *arg) -{ - pre_cmp = atoi(arg); -} - static void opt_pre_me(const char *arg) { pre_me = atoi(arg); } -static void opt_lumi_mask(const char *arg) -{ - lumi_mask = atof(arg); -} - -static void opt_dark_mask(const char *arg) -{ - dark_mask = atof(arg); -} - -static void opt_scplx_mask(const char *arg) -{ - scplx_mask = atof(arg); -} - -static void opt_tcplx_mask(const char *arg) -{ - tcplx_mask = atof(arg); -} - -static void opt_p_mask(const char *arg) -{ - p_mask = atof(arg); -} - static void opt_qscale(const char *arg) { video_qscale = atof(arg); @@ -2481,26 +2514,6 @@ static void opt_qsquish(const char *arg) } } -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; @@ -2515,8 +2528,8 @@ static void opt_qmin(const char *arg) { video_qmin = atoi(arg); if (video_qmin < 1 || - video_qmin > 31) { - fprintf(stderr, "qmin must be >= 1 and <= 31\n"); + video_qmin > 51) { + fprintf(stderr, "qmin must be >= 1 and <= 51\n"); exit(1); } } @@ -2525,8 +2538,8 @@ static void opt_qmax(const char *arg) { video_qmax = atoi(arg); if (video_qmax < 1 || - video_qmax > 31) { - fprintf(stderr, "qmax must be >= 1 and <= 31\n"); + video_qmax > 51) { + fprintf(stderr, "qmax must be >= 1 and <= 51\n"); exit(1); } } @@ -2621,16 +2634,6 @@ static void opt_top_field_first(const char *arg) top_field_first= atoi(arg); } -static void opt_noise_reduction(const char *arg) -{ - noise_reduction= atoi(arg); -} - -static void opt_qns(const char *arg) -{ - qns= atoi(arg); -} - static void opt_sc_threshold(const char *arg) { sc_threshold= atoi(arg); @@ -2690,28 +2693,34 @@ static void opt_audio_device(const char *arg) audio_device = av_strdup(arg); } -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; @@ -2758,6 +2767,9 @@ const char *motion_str[] = { "phods", "epzs", "x1", + "hex", + "umh", + "iter", NULL, }; @@ -2779,24 +2791,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) @@ -2812,13 +2812,23 @@ 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) { AVMetaDataMap *m; const char *p; - + p = arg; m = &meta_data_maps[nb_meta_data_maps++]; @@ -2859,15 +2869,15 @@ static void opt_input_file(const char *filename) if (!strcmp(filename, "-")) filename = "pipe:"; - using_stdin |= !strncmp(filename, "pipe:", 5) || + 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; @@ -2886,7 +2896,10 @@ static void opt_input_file(const char *filename) print_error(filename, err); exit(1); } - + + if(genpts) + ic->flags|= AVFMT_FLAG_GENPTS; + /* If not enough info to get the stream parameters, we decode the first frames to get it. (used in mpeg case for example) */ ret = av_find_stream_info(ic); @@ -2904,7 +2917,7 @@ static void opt_input_file(const char *filename) if (start_time != 0) { ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD); if (ret < 0) { - fprintf(stderr, "%s: could not seek to position %0.3f\n", + fprintf(stderr, "%s: could not seek to position %0.3f\n", filename, (double)timestamp / AV_TIME_BASE); } /* reset seek info */ @@ -2913,7 +2926,8 @@ 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; + int j; + AVCodecContext *enc = ic->streams[i]->codec; #if defined(HAVE_THREADS) if(thread_count>1) avcodec_thread_init(enc, thread_count); @@ -2921,6 +2935,12 @@ static void opt_input_file(const char *filename) enc->thread_count= thread_count; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: + for(j=0; jflags&AV_OPT_FLAG_AUDIO_PARAM) && (opt->flags&AV_OPT_FLAG_DECODING_PARAM)) + av_set_double(enc, opt_names[j], d); + } //fprintf(stderr, "\nInput Audio channels: %d", enc->channels); audio_channels = enc->channels; audio_sample_rate = enc->sample_rate; @@ -2928,29 +2948,28 @@ static void opt_input_file(const char *filename) ic->streams[i]->discard= AVDISCARD_ALL; break; case CODEC_TYPE_VIDEO: + for(j=0; jflags&AV_OPT_FLAG_VIDEO_PARAM) && (opt->flags&AV_OPT_FLAG_DECODING_PARAM)) + av_set_double(enc, opt_names[j], d); + } 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; + 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.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; - enc->idct_algo = idct_algo; - enc->debug = debug; - enc->debug_mv = debug_mv; - enc->lowres= lowres; - if(bitexact) - enc->flags|= CODEC_FLAG_BITEXACT; + if(enc->lowres) enc->flags |= CODEC_FLAG_EMU_EDGE; if(me_threshold) enc->debug |= FF_DEBUG_MV; - if (enc->frame_rate != rfps || enc->frame_rate_base != rfps_base) { + if (enc->time_base.den != rfps || enc->time_base.num != rfps_base) { if (verbose >= 0) fprintf(stderr,"\nSeems that stream %d comes from film source: %2.2f (%d/%d) -> %2.2f (%d/%d)\n", - i, (float)enc->frame_rate / enc->frame_rate_base, enc->frame_rate, enc->frame_rate_base, + i, (float)enc->time_base.den / enc->time_base.num, enc->time_base.den, enc->time_base.num, (float)rfps / rfps_base, rfps, rfps_base); } @@ -2966,11 +2985,15 @@ static void opt_input_file(const char *filename) break; case CODEC_TYPE_DATA: break; + case CODEC_TYPE_SUBTITLE: + break; + case CODEC_TYPE_UNKNOWN: + break; default: av_abort(); } } - + input_files[nb_input_files] = ic; input_files_ts_offset[nb_input_files] = input_ts_offset - (copy_ts ? 0 : timestamp); /* dump the file content */ @@ -2984,7 +3007,7 @@ static void opt_input_file(const char *filename) grab_device = NULL; video_channel = 0; - + rate_emu = 0; } @@ -3004,7 +3027,7 @@ static void check_audio_video_inputs(int *has_video_ptr, int *has_audio_ptr) for(j=0;jnb_streams;i++) { - AVCodecContext *enc = &ic->streams[i]->codec; + AVCodecContext *enc = ic->streams[i]->codec; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: has_audio = 1; @@ -3013,6 +3036,8 @@ 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_UNKNOWN: + case CODEC_TYPE_SUBTITLE: break; default: av_abort(); @@ -3023,12 +3048,346 @@ 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; + avctx_opts->flags|= CODEC_FLAG_GLOBAL_HEADER; + } + if(video_global_header&2){ + video_enc->flags2 |= CODEC_FLAG2_LOCAL_HEADER; + avctx_opts->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); + + for(i=0; iflags&AV_OPT_FLAG_VIDEO_PARAM) && (opt->flags&AV_OPT_FLAG_ENCODING_PARAM)) + av_set_double(video_enc, opt_names[i], d); + } + + 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; + + video_enc->pre_me = pre_me; + + if (b_frames) { + video_enc->max_b_frames = b_frames; + video_enc->b_quant_factor = 2.0; + } + 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->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->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->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->scenechange_threshold= sc_threshold; + video_enc->me_range = me_range; + 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; + + 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, i; + + 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; + avctx_opts->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); + + for(i=0; iflags&AV_OPT_FLAG_AUDIO_PARAM) && (opt->flags&AV_OPT_FLAG_ENCODING_PARAM)) + av_set_double(audio_enc, opt_names[i], d); + } + + 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; + if (audio_qscale > QSCALE_NONE) { + audio_enc->flags |= CODEC_FLAG_QSCALE; + audio_enc->global_quality = st->quality = FF_QP2LAMBDA * audio_qscale; + } + audio_enc->strict_std_compliance = strict; + audio_enc->thread_count = thread_count; + /* For audio codecs other than AC3 or DTS we limit */ + /* the number of coded channels to stereo */ + if (audio_channels > 2 && codec_id != CODEC_ID_AC3 + && codec_id != CODEC_ID_DTS) { + audio_enc->channels = 2; + } else + audio_enc->channels = audio_channels; + } + audio_enc->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_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; + int i; + + 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 { + for(i=0; iflags&AV_OPT_FLAG_SUBTITLE_PARAM) && (opt->flags&AV_OPT_FLAG_ENCODING_PARAM)) + av_set_double(subtitle_enc, opt_names[i], d); + } + 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, "-")) @@ -3044,10 +3403,11 @@ static void opt_output_file(const char *filename) exit(1); } } - + oc->oformat = file_oformat; + pstrcpy(oc->filename, sizeof(oc->filename), filename); - if (!strcmp(file_oformat->name, "ffm") && + if (!strcmp(file_oformat->name, "ffm") && strstart(filename, "http:", NULL)) { /* special case for files sent to ffserver: we get the stream parameters from ffserver */ @@ -3056,8 +3416,8 @@ static void opt_output_file(const char *filename) exit(1); } } else { - use_video = file_oformat->video_codec != CODEC_ID_NONE || video_stream_copy; - use_audio = file_oformat->audio_codec != CODEC_ID_NONE || audio_stream_copy; + use_video = file_oformat->video_codec != CODEC_ID_NONE || video_stream_copy || video_codec_id != CODEC_ID_NONE; + use_audio = file_oformat->audio_codec != CODEC_ID_NONE || audio_stream_copy || audio_codec_id != CODEC_ID_NONE; /* disable if no corresponding type found and at least one input file */ @@ -3076,332 +3436,23 @@ static void opt_output_file(const char *filename) if (video_disable) { 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_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(!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 = av_guess_codec(file_oformat, NULL, 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->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; - 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 = 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; - } - if (no_output) { - video_enc->flags2 |= CODEC_FLAG2_NO_OUTPUT; - } - 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->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; - } - } - } + if (use_video) { + 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_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(!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 = av_guess_codec(file_oformat, NULL, 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 (use_audio) { + 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); } oc->timestamp = rec_timestamp; - - if (str_title) + + if (str_title) pstrcpy(oc->title, sizeof(oc->title), str_title); if (str_author) pstrcpy(oc->author, sizeof(oc->author), str_author); @@ -3413,8 +3464,6 @@ static void opt_output_file(const char *filename) output_files[nb_output_files++] = oc; - pstrcpy(oc->filename, sizeof(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) { @@ -3425,12 +3474,12 @@ static void opt_output_file(const char *filename) if (!(oc->oformat->flags & AVFMT_NOFILE)) { /* test if it already exists to avoid loosing precious files */ - if (!file_overwrite && + if (!file_overwrite && (strchr(filename, ':') == NULL || strstart(filename, "file:", NULL))) { if (url_exist(filename)) { int c; - + if ( !using_stdin ) { fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename); fflush(stderr); @@ -3439,14 +3488,14 @@ static void opt_output_file(const char *filename) fprintf(stderr, "Not overwriting - exiting\n"); exit(1); } - } - else { + } + else { fprintf(stderr,"File '%s' already exists. Exiting.\n", filename); exit(1); - } + } } } - + /* open the file */ if (url_fopen(&oc->pb, filename, URL_WRONLY) < 0) { fprintf(stderr, "Could not open '%s'\n", filename); @@ -3466,17 +3515,12 @@ static void opt_output_file(const char *filename) 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 */ @@ -3487,17 +3531,17 @@ static void prepare_grab(void) AVFormatContext *ic; AVFormatParameters vp1, *vp = &vp1; AVFormatParameters ap1, *ap = &ap1; - + /* see if audio/video inputs are needed */ has_video = 0; has_audio = 0; memset(ap, 0, sizeof(*ap)); memset(vp, 0, sizeof(*vp)); - vp->frame_rate_base= 1; + vp->time_base.num= 1; for(j=0;jnb_streams;i++) { - AVCodecContext *enc = &oc->streams[i]->codec; + AVCodecContext *enc = oc->streams[i]->codec; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: if (enc->sample_rate > ap->sample_rate) @@ -3511,10 +3555,9 @@ static void prepare_grab(void) vp->width = enc->width; 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; @@ -3523,31 +3566,32 @@ static void prepare_grab(void) } } } - + if (has_video == 0 && has_audio == 0) { fprintf(stderr, "Output file must have at least one audio or video stream\n"); exit(1); } - + if (has_video) { AVInputFormat *fmt1; fmt1 = av_find_input_format(video_grab_format); vp->device = video_device; vp->channel = video_channel; - vp->standard = video_standard; + vp->standard = video_standard; + vp->pix_fmt = frame_pix_fmt; if (av_open_input_file(&ic, "", fmt1, 0, vp) < 0) { fprintf(stderr, "Could not find video grab device\n"); exit(1); } /* If not enough info to get the stream parameters, we decode the first frames to get it. */ - if ((ic->ctx_flags & AVFMTCTX_NOHEADER) && av_find_stream_info(ic) < 0) { + if ((ic->ctx_flags & AVFMTCTX_NOHEADER) && av_find_stream_info(ic) < 0) { fprintf(stderr, "Could not find video grab parameters\n"); exit(1); } /* by now video grab has one stream */ - ic->streams[0]->r_frame_rate = 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) @@ -3601,13 +3645,6 @@ static int64_t getutime(void) extern int ffm_nopts; -static void opt_bitexact(void) -{ - bitexact=1; - /* disable generate of real time pts in ffm (need to be supressed anyway) */ - ffm_nopts = 1; -} - static void show_formats(void) { AVInputFormat *ifmt; @@ -3646,18 +3683,18 @@ static void show_formats(void) if(name==NULL) break; last_name= name; - + printf( - " %s%s %-15s %s\n", - decode ? "D":" ", - encode ? "E":" ", + " %s%s %-15s %s\n", + decode ? "D":" ", + encode ? "E":" ", name, long_name ? long_name:" "); } printf("\n"); printf("Image formats (filename extensions, if any, follow):\n"); - for(image_fmt = first_image_format; image_fmt != NULL; + for(image_fmt = first_image_format; image_fmt != NULL; image_fmt = image_fmt->next) { printf( " %s%s %-6s %s\n", @@ -3674,6 +3711,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) { @@ -3691,12 +3729,26 @@ static void show_formats(void) if(p2==NULL) 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", + " %s%s%s%s%s%s %s", + decode ? "D": (/*p2->decoder ? "d":*/" "), + encode ? "E":" ", + type_str, cap & CODEC_CAP_DRAW_HORIZ_BAND ? "S":" ", cap & CODEC_CAP_DR1 ? "D":" ", cap & CODEC_CAP_TRUNCATED ? "T":" ", @@ -3711,17 +3763,17 @@ static void show_formats(void) for(up = first_protocol; up != NULL; up = up->next) printf(" %s:", up->name); printf("\n"); - + printf("Frame size, frame rate abbreviations:\n ntsc pal qntsc qpal sntsc spal film ntsc-film sqcif qcif cif 4cif\n"); printf("Motion estimation methods:\n"); pp = motion_str; while (*pp) { printf(" %s", *pp); - if ((pp - motion_str + 1) == ME_ZERO) + if ((pp - motion_str + 1) == ME_ZERO) printf("(fastest)"); - else if ((pp - motion_str + 1) == ME_FULL) + else if ((pp - motion_str + 1) == ME_FULL) printf("(slowest)"); - else if ((pp - motion_str + 1) == ME_EPZS) + else if ((pp - motion_str + 1) == ME_EPZS) printf("(default)"); pp++; } @@ -3735,7 +3787,7 @@ static void show_formats(void) exit(1); } -void parse_matrix_coeffs(uint16_t *dest, const char *str) +static void parse_matrix_coeffs(uint16_t *dest, const char *str) { int i; const char *p = str; @@ -3752,13 +3804,13 @@ void parse_matrix_coeffs(uint16_t *dest, const char *str) } } -void opt_inter_matrix(const char *arg) +static void opt_inter_matrix(const char *arg) { inter_matrix = av_mallocz(sizeof(uint16_t) * 64); parse_matrix_coeffs(inter_matrix, arg); } -void opt_intra_matrix(const char *arg) +static void opt_intra_matrix(const char *arg) { intra_matrix = av_mallocz(sizeof(uint16_t) * 64); parse_matrix_coeffs(intra_matrix, arg); @@ -3792,10 +3844,10 @@ static void opt_target(const char *arg) int i, j; for(j = 0; j < nb_input_files; j++) { for(i = 0; i < input_files[j]->nb_streams; i++) { - AVCodecContext *c = &input_files[j]->streams[i]->codec; + 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; @@ -3837,7 +3889,7 @@ static void opt_target(const char *arg) audio_bit_rate = 224000; audio_sample_rate = 44100; - + mux_packet_size= 2324; mux_rate= 2352 * 75 * 8; @@ -3861,7 +3913,8 @@ static void opt_target(const char *arg) video_rc_max_rate = 2516000; video_rc_min_rate = 0; //1145000; video_rc_buffer_size = 224*1024*8; - use_scan_offset = 1; + opt_default("flags", "+SCAN_OFFSET"); + audio_bit_rate = 224000; audio_sample_rate = 44100; @@ -3907,13 +3960,35 @@ static void opt_target(const char *arg) static void show_version(void) { + /* TODO: add function interface to avutil and avformat */ fprintf(stderr, "ffmpeg " FFMPEG_VERSION "\n" + "libavutil %d\n" "libavcodec %d\n" - "libavformat %d\n", - avcodec_build(), LIBAVFORMAT_BUILD); + "libavformat %d\n", + LIBAVUTIL_BUILD, avcodec_build(), LIBAVFORMAT_BUILD); exit(1); } +static int opt_default(const char *opt, const char *arg){ + AVOption *o= av_set_string(avctx_opts, opt, arg); + if(!o) + return -1; + +// av_log(NULL, AV_LOG_ERROR, "%s:%s: %f 0x%0X\n", opt, arg, av_get_double(avctx_opts, opt, NULL), (int)av_get_int(avctx_opts, opt, NULL)); + + //FIXME we should always use avctx_opts, ... for storing options so there wont be any need to keep track of whats set over this + opt_names= av_realloc(opt_names, sizeof(void*)*(opt_name_count+1)); + opt_names[opt_name_count++]= o->name; + + /* disable generate of real time pts in ffm (need to be supressed anyway) */ + if(avctx_opts->flags & CODEC_FLAG_BITEXACT) + ffm_nopts = 1; + + if(avctx_opts->debug) + av_log_set_level(AV_LOG_DEBUG); + return 0; +} + const OptionDef options[] = { /* main options */ { "L", 0, {(void*)show_license}, "show license" }, @@ -3924,7 +3999,7 @@ 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" }, // @@ -3935,24 +4010,24 @@ const OptionDef options[] = { { "author", HAS_ARG | OPT_STRING, {(void*)&str_author}, "set the author", "string" }, { "copyright", HAS_ARG | OPT_STRING, {(void*)&str_copyright}, "set the copyright", "string" }, { "comment", HAS_ARG | OPT_STRING, {(void*)&str_comment}, "set the comment", "string" }, - { "debug", HAS_ARG | OPT_EXPERT, {(void*)opt_debug}, "print specific debug info", "" }, - { "vismv", HAS_ARG | OPT_EXPERT, {(void*)opt_vismv}, "visualize motion vectors", "" }, - { "benchmark", OPT_BOOL | OPT_EXPERT, {(void*)&do_benchmark}, + { "benchmark", OPT_BOOL | OPT_EXPERT, {(void*)&do_benchmark}, "add timings for benchmarking" }, - { "dump", OPT_BOOL | OPT_EXPERT, {(void*)&do_pkt_dump}, + { "dump", OPT_BOOL | OPT_EXPERT, {(void*)&do_pkt_dump}, "dump each input packet" }, - { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump}, + { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump}, "when dumping packets, also dump the payload" }, - { "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_input", 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\", \"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" }, // + { "dts_delta_threshold", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&dts_delta_threshold}, "timestamp discontinuity delta threshold", "" }, /* video options */ { "b", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate}, "set video bitrate (in kbit/s)", "bitrate" }, @@ -3994,7 +4069,6 @@ 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" }, { "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" }, @@ -4002,96 +4076,56 @@ const OptionDef options[] = { { "minrate", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_min}, "set min video bitrate tolerance (in kbit/s)", "bitrate" }, { "bufsize", HAS_ARG | OPT_VIDEO, {(void*)opt_video_buffer_size}, "set ratecontrol buffer size (in kByte)", "size" }, { "vcodec", HAS_ARG | OPT_VIDEO, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" }, - { "me", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_motion_estimation}, "set motion estimation method", + { "me", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_motion_estimation}, "set motion estimation method", "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" }, - { "hq", OPT_BOOL, {(void*)&mb_decision}, "activate high quality settings" }, - { "mbd", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_decision}, "macroblock decision", "mode" }, - { "mbcmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_cmp}, "macroblock compare function", "cmp function" }, - { "ildctcmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_ildct_cmp}, "ildct compare function", "cmp function" }, - { "subcmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_sub_cmp}, "subpel compare function", "cmp function" }, - { "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", "" }, - { "tcplx_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_tcplx_mask}, "temporal complexity masking", "" }, - { "p_mask", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_p_mask}, "inter masking", "" }, - { "4mv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_4mv}, "use four motion vector by macroblock (MPEG4)" }, - { "obmc", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_obmc}, "use overlapped block motion compensation (h263+)" }, - { "lf", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_loop}, "use loop filter (h263+)" }, - { "part", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_part}, "use data partitioning (MPEG4)" }, { "bug", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_workaround_bugs}, "workaround not auto detected encoder bugs", "param" }, { "ps", HAS_ARG | OPT_EXPERT, {(void*)opt_packet_size}, "set packet size in bits", "size" }, { "error", HAS_ARG | OPT_EXPERT, {(void*)opt_error_rate}, "error rate", "rate" }, { "strict", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_strict}, "how strictly to follow the standards", "strictness" }, - { "sameq", OPT_BOOL | OPT_VIDEO, {(void*)&same_quality}, + { "sameq", OPT_BOOL | OPT_VIDEO, {(void*)&same_quality}, "use same video quality as source (implies VBR)" }, { "pass", HAS_ARG | OPT_VIDEO, {(void*)&opt_pass}, "select the pass number (1 or 2)", "n" }, { "passlogfile", HAS_ARG | OPT_STRING | OPT_VIDEO, {(void*)&pass_logfilename}, "select two pass log file name", "file" }, - { "deinterlace", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_deinterlace}, + { "deinterlace", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_deinterlace}, "deinterlace pictures" }, - { "ildct", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_interlace_dct}, - "force interlaced dct support in encoder (MPEG2/MPEG4)" }, - { "ilme", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_interlace_me}, - "force interlaced me support in encoder (MPEG2/MPEG4)" }, { "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" }, - { "vstats", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_vstats}, "dump video coding statistics to file" }, + { "vstats", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_vstats}, "dump video coding statistics to file" }, { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" }, - { "aic", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_aic}, "enable Advanced intra coding (h263+)" }, - { "aiv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_aiv}, "enable Alternative inter vlc (h263+)" }, - { "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" }, - { "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" }, { "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", "" }, - { "vprofile", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&video_profile}, "profile", "" }, - { "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}, "", "" }, - { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&lowres}, "", "" }, + { "mepc", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&me_penalty_compensation}, "motion estimation bitrate penalty compensation", "factor (1.0 = 256)" }, { "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" }, + { "newvideo", OPT_VIDEO, {(void*)opt_new_video_stream}, "add a new video stream to the current output stream" }, + { "genpts", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&genpts }, "generate pts" }, + { "qphist", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&qp_hist }, "show QP histogram" }, /* audio options */ { "ab", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_bitrate}, "set audio bitrate (in kbit/s)", "bitrate", }, + { "aq", OPT_FLOAT | HAS_ARG | OPT_AUDIO, {(void*)&audio_qscale}, "set audio quality (codec-specific)", "quality", }, { "ar", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_rate}, "set audio sampling rate (in Hz)", "rate" }, { "ac", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_channels}, "set number of audio channels", "channels" }, { "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" }, @@ -4099,26 +4133,29 @@ const OptionDef options[] = { { "tvstd", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_GRAB, {(void*)opt_video_standard}, "set television standard (NTSC, PAL (SECAM))", "standard" }, { "ad", HAS_ARG | OPT_EXPERT | OPT_AUDIO | OPT_GRAB, {(void*)opt_audio_device}, "set audio device", "device" }, - /* G.2 grab options */ + /* 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 */ + + /* 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" }, + { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; static void show_banner(void) { - fprintf(stderr, "ffmpeg version " FFMPEG_VERSION ", build %d, Copyright (c) 2000-2004 Fabrice Bellard\n", - LIBAVCODEC_BUILD); - fprintf(stderr, " configuration: %s\n", FFMPEG_CONFIGURATION); + fprintf(stderr, "FFmpeg version " FFMPEG_VERSION ", Copyright (c) 2000-2004 Fabrice Bellard\n"); + fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n"); + fprintf(stderr, " libavutil version: " AV_STRINGIFY(LIBAVUTIL_VERSION) "\n"); + fprintf(stderr, " libavcodec version: " AV_STRINGIFY(LIBAVCODEC_VERSION) "\n"); + fprintf(stderr, " libavformat version: " AV_STRINGIFY(LIBAVFORMAT_VERSION) "\n"); fprintf(stderr, " built on " __DATE__ " " __TIME__); #ifdef __GNUC__ - fprintf(stderr, ", gcc: %s\n", __VERSION__); + fprintf(stderr, ", gcc: " __VERSION__ "\n"); #else fprintf(stderr, ", using a non-gcc compiler\n"); #endif @@ -4129,7 +4166,7 @@ static void show_license(void) show_banner(); #ifdef CONFIG_GPL printf( - "This program is free software; you can redistribute it and/or modify\n" + "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" "the Free Software Foundation; either version 2 of the License, or\n" "(at your option) any later version.\n" @@ -4141,7 +4178,7 @@ static void show_license(void) "\n" "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" - "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" ); #else printf( @@ -4157,7 +4194,7 @@ static void show_license(void) "\n" "You should have received a copy of the GNU Lesser General Public\n" "License along with this library; if not, write to the Free Software\n" - "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n" ); #endif exit(1); @@ -4172,23 +4209,28 @@ static void show_help(void) show_help_options(options, "Main options:\n", OPT_EXPERT | OPT_AUDIO | OPT_VIDEO, 0); show_help_options(options, "\nVideo options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, OPT_VIDEO); show_help_options(options, "\nAdvanced Video options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, OPT_VIDEO | OPT_EXPERT); show_help_options(options, "\nAudio options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, OPT_AUDIO); show_help_options(options, "\nAdvanced Audio options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_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, OPT_GRAB); show_help_options(options, "\nAdvanced options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, OPT_EXPERT); + av_opt_show(avctx_opts, NULL); + exit(1); } @@ -4204,11 +4246,13 @@ int main(int argc, char **argv) av_register_all(); + avctx_opts= avcodec_alloc_context(); + if (argc <= 1) show_help(); else show_banner(); - + /* parse options */ parse_options(argc, argv, options); @@ -4217,14 +4261,14 @@ int main(int argc, char **argv) fprintf(stderr, "Must supply at least one output file\n"); exit(1); } - + if (nb_input_files == 0) { input_sync = 1; prepare_grab(); } ti = getutime(); - av_encode(output_files, nb_output_files, input_files, nb_input_files, + av_encode(output_files, nb_output_files, input_files, nb_input_files, stream_maps, nb_stream_maps); ti = getutime() - ti; if (do_benchmark) { @@ -4235,11 +4279,11 @@ int main(int argc, char **argv) for(i=0;ioformat->flags & AVFMT_NOFILE)) - url_fclose(&s->pb); - for(j=0;jnb_streams;j++) - av_free(s->streams[j]); + url_fclose(&s->pb); + for(j=0;jnb_streams;j++) + av_free(s->streams[j]); av_free(s); } for(i=0;i