X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=46b4f0098aef19d1ca331d15863216b21fb9e4ff;hb=b2722d0a42d69bdb2461d37bad3b7ed6f7a6a51b;hp=b916e0cf9e38d1728ff193f24c12ae9f6abccb41;hpb=544286b3d39365b30298ae07e66a755200b0895c;p=ffmpeg diff --git a/ffmpeg.c b/ffmpeg.c index b916e0cf9e3..46b4f0098ae 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1,20 +1,20 @@ /* * FFmpeg main - * Copyright (c) 2000,2001 Gerard Lantau + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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 */ #define HAVE_AV_CONFIG_H #include "avformat.h" @@ -24,12 +24,15 @@ #include #include #include -#include #include -#include #include -#include #endif +#ifdef __BEOS__ +/* for snooze() */ +#include +#endif +#include +#include #define MAXINT64 INT64_C(0x7fffffffffffffff) @@ -71,16 +74,54 @@ static int nb_output_files = 0; static AVStreamMap stream_maps[MAX_FILES]; static int nb_stream_maps; -static AVFormat *file_format; +static AVInputFormat *file_iformat; +static AVOutputFormat *file_oformat; static int frame_width = 160; static int frame_height = 128; +static int frame_topBand = 0; +static int frame_bottomBand = 0; +static int frame_leftBand = 0; +static int frame_rightBand = 0; static int frame_rate = 25 * FRAME_RATE_BASE; -static int video_bit_rate = 200000; +static int video_bit_rate = 200*1000; +static int video_bit_rate_tolerance = 4000*1000; static int video_qscale = 0; +static int video_qmin = 2; +static int video_qmax = 31; +static int video_qdiff = 3; +static float video_qblur = 0.5; +static float video_qcomp = 0.5; +#if 0 //experimental, (can be removed) +static float video_rc_qsquish=1.0; +static float video_rc_qmod_amp=0; +static int video_rc_qmod_freq=0; +#endif +static char *video_rc_override_string=NULL; +static char *video_rc_eq="tex^qComp"; +static int video_rc_buffer_size=0; +static float video_rc_buffer_aggressivity=1.0; +static int video_rc_max_rate=0; +static int video_rc_min_rate=0; +static float video_rc_initial_cplx=0; +static float video_b_qfactor = 1.25; +static float video_b_qoffset = 1.25; +static float video_i_qfactor = -0.8; +static float video_i_qoffset = 0.0; +static int me_method = 0; static int video_disable = 0; static int video_codec_id = CODEC_ID_NONE; static int same_quality = 0; +static int b_frames = 0; +static int use_hq = 0; +static int use_4mv = 0; static int do_deinterlace = 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 gop_size = 12; static int intra_only = 0; @@ -97,16 +138,35 @@ static char *str_author = NULL; static char *str_copyright = NULL; static char *str_comment = NULL; static int do_benchmark = 0; +static int do_hex_dump = 0; +static int do_play = 0; +static int do_psnr = 0; +static int do_vstats = 0; +static int do_pass = 0; +static char *pass_logfilename = NULL; +static int audio_stream_copy = 0; +static int video_stream_copy = 0; + +#define DEFAULT_PASS_LOGFILENAME "ffmpeg2pass" + +#ifndef CONFIG_AUDIO_OSS +const char *audio_device = "none"; +#endif +#ifndef CONFIG_VIDEO4LINUX +const char *v4l_device = "none"; +#endif typedef struct AVOutputStream { int file_index; /* file index */ int index; /* stream index in the output file */ int source_index; /* AVInputStream index */ AVStream *st; /* stream in the output file */ - int encoding_needed; /* true if encoding needed for this stream */ - - int fifo_packet_rptr; /* read index in the corresponding - avinputstream packet fifo */ + int encoding_needed; /* true if encoding needed for this stream */ + int frame_number; + /* input pts and corresponding output pts + for A/V sync */ + double sync_ipts; + INT64 sync_opts; /* video only */ AVPicture pict_tmp; /* temporary image for resizing */ int video_resample; @@ -116,6 +176,7 @@ typedef struct AVOutputStream { int audio_resample; ReSampleContext *resample; /* for audio resampling */ FifoBuffer fifo; /* for compression: one audio fifo per codec */ + FILE *logfile; } AVOutputStream; typedef struct AVInputStream { @@ -124,9 +185,8 @@ typedef struct AVInputStream { AVStream *st; int discard; /* true if stream data should be discarded */ int decoding_needed; /* true if the packets must be decoded in 'raw_fifo' */ - INT64 pts; /* current pts */ - int frame_number; /* current frame */ INT64 sample_index; /* current sample */ + int frame_decoded; /* true if a video or audio frame has been decoded */ } AVInputStream; typedef struct AVInputFile { @@ -135,6 +195,7 @@ typedef struct AVInputFile { int buffer_size; /* current total buffer size */ int buffer_size_max; /* buffer size at which we consider we can stop buffering */ + int nb_streams; /* nb streams we are aware of */ } AVInputFile; #ifndef CONFIG_WIN32 @@ -182,431 +243,41 @@ static int read_key(void) tv.tv_usec = 0; n = select(1, &rfds, NULL, NULL, &tv); if (n > 0) { - if (read(0, &ch, 1) == 1) + n = read(0, &ch, 1); + if (n == 1) return ch; + + return n; } return -1; } -#define AUDIO_FIFO_SIZE 8192 - -/* main loop for grabbing */ -int av_grab(AVFormatContext *s) -{ - UINT8 audio_buf[AUDIO_FIFO_SIZE/2]; - UINT8 audio_buf1[AUDIO_FIFO_SIZE/2]; - UINT8 audio_out[AUDIO_FIFO_SIZE/2]; - UINT8 video_buffer[1024*1024]; - char buf[256]; - short *samples; - URLContext *audio_handle = NULL, *video_handle = NULL; - int ret; - AVCodecContext *enc, *first_video_enc = NULL; - int frame_size, frame_bytes; - int use_audio, use_video; - int frame_rate, sample_rate, channels; - int width, height, frame_number, i, pix_fmt = 0; - AVOutputStream *ost_table[s->nb_streams], *ost; - UINT8 *picture_in_buf = NULL, *picture_420p = NULL; - int audio_fifo_size = 0, picture_size = 0; - INT64 time_start; - - /* init output stream info */ - for(i=0;inb_streams;i++) - ost_table[i] = NULL; - - /* output stream init */ - for(i=0;inb_streams;i++) { - ost = av_mallocz(sizeof(AVOutputStream)); - if (!ost) - goto fail; - ost->index = i; - ost->st = s->streams[i]; - ost_table[i] = ost; - } - - use_audio = 0; - use_video = 0; - frame_rate = 0; - sample_rate = 0; - frame_size = 0; - channels = 1; - width = 0; - height = 0; - frame_number = 0; - - for(i=0;inb_streams;i++) { - AVCodec *codec; - - ost = ost_table[i]; - enc = &ost->st->codec; - codec = avcodec_find_encoder(enc->codec_id); - if (!codec) { - fprintf(stderr, "Unknown codec\n"); - return -1; - } - if (avcodec_open(enc, codec) < 0) { - fprintf(stderr, "Incorrect encode parameters\n"); - return -1; - } - switch(enc->codec_type) { - case CODEC_TYPE_AUDIO: - use_audio = 1; - if (enc->sample_rate > sample_rate) - sample_rate = enc->sample_rate; - if (enc->frame_size > frame_size) - frame_size = enc->frame_size; - if (enc->channels > channels) - channels = enc->channels; - break; - case CODEC_TYPE_VIDEO: - if (!first_video_enc) - first_video_enc = enc; - use_video = 1; - if (enc->frame_rate > frame_rate) - frame_rate = enc->frame_rate; - if (enc->width > width) - width = enc->width; - if (enc->height > height) - height = enc->height; - break; - } - } - - /* audio */ - samples = NULL; - if (use_audio) { - snprintf(buf, sizeof(buf), "audio:%d,%d", sample_rate, channels); - ret = url_open(&audio_handle, buf, URL_RDONLY); - if (ret < 0) { - fprintf(stderr, "Could not open audio device: disabling audio capture\n"); - use_audio = 0; - } else { - URLFormat f; - /* read back exact grab parameters */ - if (url_getformat(audio_handle, &f) < 0) { - fprintf(stderr, "could not read back video grab parameters\n"); - goto fail; - } - sample_rate = f.sample_rate; - channels = f.channels; - audio_fifo_size = ((AUDIO_FIFO_SIZE / 2) / audio_handle->packet_size) * - audio_handle->packet_size; - fprintf(stderr, "Audio sampling: %d Hz, %s\n", - sample_rate, channels == 2 ? "stereo" : "mono"); - } - } - - /* video */ - if (use_video) { - snprintf(buf, sizeof(buf), "video:%d,%d,%f", - width, height, (float)frame_rate / FRAME_RATE_BASE); - - ret = url_open(&video_handle, buf, URL_RDONLY); - if (ret < 0) { - fprintf(stderr,"Could not init video 4 linux capture: disabling video capture\n"); - use_video = 0; - } else { - URLFormat f; - const char *pix_fmt_str; - /* read back exact grab parameters */ - if (url_getformat(video_handle, &f) < 0) { - fprintf(stderr, "could not read back video grab parameters\n"); - goto fail; - } - width = f.width; - height = f.height; - pix_fmt = f.pix_fmt; - switch(pix_fmt) { - case PIX_FMT_YUV420P: - pix_fmt_str = "420P"; - break; - case PIX_FMT_YUV422: - pix_fmt_str = "422"; - break; - case PIX_FMT_RGB24: - pix_fmt_str = "RGB24"; - break; - case PIX_FMT_BGR24: - pix_fmt_str = "BGR24"; - break; - default: - pix_fmt_str = "???"; - break; - } - picture_size = video_handle->packet_size; - picture_in_buf = malloc(picture_size); - if (!picture_in_buf) - goto fail; - /* allocate a temporary picture if not grabbing in 420P format */ - if (pix_fmt != PIX_FMT_YUV420P) { - picture_420p = malloc((width * height * 3) / 2); - } - fprintf(stderr, "Video sampling: %dx%d, %s format, %0.2f fps\n", - width, height, pix_fmt_str, (float)frame_rate / FRAME_RATE_BASE); - } - } - - if (!use_video && !use_audio) { - fprintf(stderr,"Could not open grab devices : exiting\n"); - exit(1); - } - - /* init built in conversion functions */ - for(i=0;inb_streams;i++) { - ost = ost_table[i]; - enc = &ost->st->codec; - switch(enc->codec_type) { - case CODEC_TYPE_AUDIO: - ost->audio_resample = 0; - if ((enc->channels != channels || - enc->sample_rate != sample_rate)) { - ost->audio_resample = 1; - ost->resample = audio_resample_init(enc->channels, channels, - enc->sample_rate, sample_rate); - } - if (fifo_init(&ost->fifo, (2 * audio_fifo_size * enc->sample_rate) / - sample_rate)) - goto fail; - break; - case CODEC_TYPE_VIDEO: - ost->video_resample = 0; - if (enc->width != width || - enc->height != height) { - UINT8 *buf; - ost->video_resample = 1; - buf = malloc((enc->width * enc->height * 3) / 2); - if (!buf) - goto fail; - ost->pict_tmp.data[0] = buf; - ost->pict_tmp.data[1] = buf + enc->width * height; - ost->pict_tmp.data[2] = ost->pict_tmp.data[1] + (enc->width * height) / 4; - ost->pict_tmp.linesize[0] = enc->width; - ost->pict_tmp.linesize[1] = enc->width / 2; - ost->pict_tmp.linesize[2] = enc->width / 2; - ost->img_resample_ctx = img_resample_init( - ost->st->codec.width, ost->st->codec.height, - width, height); - } - } - } - - fprintf(stderr, "Press [q] to stop encoding\n"); - - s->format->write_header(s); - time_start = gettime(); - term_init(); - - for(;;) { - /* if 'q' pressed, exits */ - if (read_key() == 'q') - break; - - /* read & compress audio frames */ - if (use_audio) { - int ret, nb_samples, nb_samples_out; - UINT8 *buftmp; - - for(;;) { - ret = url_read(audio_handle, audio_buf, audio_fifo_size); - if (ret <= 0) - break; - /* fill each codec fifo by doing the right sample - rate conversion. This is not optimal because we - do too much work, but it is easy to do */ - nb_samples = ret / (channels * 2); - for(i=0;inb_streams;i++) { - ost = ost_table[i]; - enc = &ost->st->codec; - if (enc->codec_type == CODEC_TYPE_AUDIO) { - /* rate & stereo convertion */ - if (!ost->audio_resample) { - buftmp = audio_buf; - nb_samples_out = nb_samples; - } else { - buftmp = audio_buf1; - nb_samples_out = audio_resample(ost->resample, - (short *)buftmp, (short *)audio_buf, - nb_samples); - } - fifo_write(&ost->fifo, buftmp, nb_samples_out * enc->channels * 2, - &ost->fifo.wptr); - } - } - - /* compress as many frame as possible with each audio codec */ - for(i=0;inb_streams;i++) { - ost = ost_table[i]; - enc = &ost->st->codec; - if (enc->codec_type == CODEC_TYPE_AUDIO) { - frame_bytes = enc->frame_size * 2 * enc->channels; - - while (fifo_read(&ost->fifo, audio_buf, - frame_bytes, &ost->fifo.rptr) == 0) { - ret = avcodec_encode_audio(enc, - audio_out, sizeof(audio_out), - (short *)audio_buf); - s->format->write_packet(s, ost->index, audio_out, ret); - } - } - } - } - } - - if (use_video) { - AVPicture *picture1, *picture2, *picture; - AVPicture picture_tmp0, picture_tmp1; - - ret = url_read(video_handle, picture_in_buf, picture_size); - if (ret < 0) - break; - - picture2 = &picture_tmp0; - avpicture_fill(picture2, picture_in_buf, pix_fmt, width, height); - - if (pix_fmt != PIX_FMT_YUV420P) { - picture = &picture_tmp1; - img_convert(picture, PIX_FMT_YUV420P, - picture2, pix_fmt, - width, height); - } else { - picture = picture2; - } - - for(i=0;inb_streams;i++) { - ost = ost_table[i]; - enc = &ost->st->codec; - if (enc->codec_type == CODEC_TYPE_VIDEO) { - int n1, n2, nb; - - /* feed each codec with its requested frame rate */ - n1 = ((INT64)frame_number * enc->frame_rate) / frame_rate; - n2 = (((INT64)frame_number + 1) * enc->frame_rate) / frame_rate; - nb = n2 - n1; - if (nb > 0) { - /* resize the picture if needed */ - if (ost->video_resample) { - picture1 = &ost->pict_tmp; - img_resample(ost->img_resample_ctx, - picture1, picture); - } else { - picture1 = picture; - } - ret = avcodec_encode_video(enc, video_buffer, - sizeof(video_buffer), - picture1); - s->format->write_packet(s, ost->index, video_buffer, ret); - } - } - } - frame_number++; - } - - /* write report */ - { - char buf[1024]; - INT64 total_size; - float ti, bitrate; - static float last_ti; - INT64 ti1; - - total_size = url_ftell(&s->pb); - ti1 = gettime() - time_start; - /* check elapsed time */ - if (recording_time && ti1 >= recording_time) - break; - - ti = ti1 / 1000000.0; - if (ti < 0.1) - ti = 0.1; - /* dispaly twice per second */ - if ((ti - last_ti) >= 0.5) { - last_ti = ti; - bitrate = (int)((total_size * 8) / ti / 1000.0); - - buf[0] = '\0'; - if (use_video) { - sprintf(buf + strlen(buf), "frame=%5d fps=%4.1f q=%2d ", - frame_number, (float)frame_number / ti, first_video_enc->quality); - } - - sprintf(buf + strlen(buf), "size=%8LdkB time=%0.1f bitrate=%6.1fkbits/s", - total_size / 1024, ti, bitrate); - fprintf(stderr, "%s \r", buf); - fflush(stderr); - } - } - } - term_exit(); - - for(i=0;inb_streams;i++) { - ost = ost_table[i]; - enc = &ost->st->codec; - avcodec_close(enc); - } - s->format->write_trailer(s); - - if (audio_handle) - url_close(audio_handle); - - if (video_handle) - url_close(video_handle); - - /* write report */ - { - float ti, bitrate; - INT64 total_size; - - total_size = url_ftell(&s->pb); +#else - ti = (gettime() - time_start) / 1000000.0; - if (ti < 0.1) - ti = 0.1; - bitrate = (int)((total_size * 8) / ti / 1000.0); +/* no interactive support */ +static void term_exit(void) +{ +} - fprintf(stderr, "\033[K\nTotal time = %0.1f s, %Ld KBytes, %0.1f kbits/s\n", - ti, total_size / 1024, bitrate); - if (use_video) { - fprintf(stderr, "Total frames = %d\n", frame_number); - } - } +static void term_init(void) +{ +} - ret = 0; - fail1: - if (picture_in_buf) - free(picture_in_buf); - if (picture_420p) - free(picture_420p); - for(i=0;inb_streams;i++) { - ost = ost_table[i]; - if (ost) { - if (ost->fifo.buffer) - fifo_free(&ost->fifo); - if (ost->pict_tmp.data[0]) - free(ost->pict_tmp.data[0]); - if (ost->video_resample) - img_resample_close(ost->img_resample_ctx); - if (ost->audio_resample) - audio_resample_close(ost->resample); - free(ost); - } - } - return ret; - fail: - ret = -ENOMEM; - goto fail1; +static int read_key(void) +{ + return 0; } -#endif /* CONFIG_WIN32 */ +#endif int read_ffserver_streams(AVFormatContext *s, const char *filename) { - int i; + int i, err; AVFormatContext *ic; - ic = av_open_input_file(filename, FFM_PACKET_SIZE); - if (!ic) - return -EIO; + err = av_open_input_file(&ic, filename, NULL, FFM_PACKET_SIZE, NULL); + if (err < 0) + return err; /* copy stream format */ s->nb_streams = ic->nb_streams; for(i=0;inb_streams;i++) { @@ -647,7 +318,7 @@ static void do_audio_out(AVFormatContext *s, } /* now encode as many frames as possible */ - if (enc->codec_id != CODEC_ID_PCM) { + if (enc->frame_size > 1) { /* output resampled raw samples */ fifo_write(&ost->fifo, buftmp, size_out, &ost->fifo.wptr); @@ -656,13 +327,26 @@ static void do_audio_out(AVFormatContext *s, while (fifo_read(&ost->fifo, audio_buf, frame_bytes, &ost->fifo.rptr) == 0) { - ret = avcodec_encode_audio(enc, - audio_out, sizeof(audio_out), (short *)audio_buf); - s->format->write_packet(s, ost->index, audio_out, ret); + ret = avcodec_encode_audio(enc, audio_out, sizeof(audio_out), + (short *)audio_buf); + av_write_frame(s, ost->index, audio_out, ret); } } else { - /* XXX: handle endianness */ - s->format->write_packet(s, ost->index, buftmp, size_out); + /* output a pcm frame */ + /* XXX: change encoding codec API to avoid this ? */ + switch(enc->codec->id) { + case CODEC_ID_PCM_S16LE: + case CODEC_ID_PCM_S16BE: + case CODEC_ID_PCM_U16LE: + case CODEC_ID_PCM_U16BE: + break; + default: + size_out = size_out >> 1; + break; + } + ret = avcodec_encode_audio(enc, audio_out, size_out, + (short *)buftmp); + av_write_frame(s, ost->index, audio_out, ret); } } @@ -673,15 +357,14 @@ static void write_picture(AVFormatContext *s, int index, AVPicture *picture, UINT8 *buf, *src, *dest; int size, j, i; - size = avpicture_get_size(pix_fmt, w, h); - buf = malloc(size); - if (!buf) - return; - /* XXX: not efficient, should add test if we can take directly the AVPicture */ switch(pix_fmt) { case PIX_FMT_YUV420P: + size = avpicture_get_size(pix_fmt, w, h); + buf = av_malloc(size); + if (!buf) + return; dest = buf; for(i=0;i<3;i++) { if (i == 1) { @@ -698,7 +381,9 @@ static void write_picture(AVFormatContext *s, int index, AVPicture *picture, break; case PIX_FMT_YUV422P: size = (w * h) * 2; - buf = malloc(size); + buf = av_malloc(size); + if (!buf) + return; dest = buf; for(i=0;i<3;i++) { if (i == 1) { @@ -714,7 +399,9 @@ static void write_picture(AVFormatContext *s, int index, AVPicture *picture, break; case PIX_FMT_YUV444P: size = (w * h) * 3; - buf = malloc(size); + buf = av_malloc(size); + if (!buf) + return; dest = buf; for(i=0;i<3;i++) { src = picture->data[i]; @@ -727,7 +414,9 @@ static void write_picture(AVFormatContext *s, int index, AVPicture *picture, break; case PIX_FMT_YUV422: size = (w * h) * 2; - buf = malloc(size); + buf = av_malloc(size); + if (!buf) + return; dest = buf; src = picture->data[0]; for(j=0;jdata[0]; for(j=0;jformat->write_packet(s, index, buf, size); - free(buf); + av_write_frame(s, index, buf, size); + av_free(buf); } +/* we begin to correct av delay at this threshold */ +#define AV_DELAY_MAX 0.100 static void do_video_out(AVFormatContext *s, AVOutputStream *ost, AVInputStream *ist, - AVPicture *picture1) + AVPicture *picture1, + int *frame_size, AVOutputStream *audio_sync) { - int n1, n2, nb, i, ret, frame_number; + int nb_frames, i, ret; AVPicture *picture, *picture2, *pict; AVPicture picture_tmp1, picture_tmp2; - UINT8 video_buffer[1024*1024]; + static UINT8 *video_buffer; UINT8 *buf = NULL, *buf1 = NULL; AVCodecContext *enc, *dec; +#define VIDEO_BUFFER_SIZE (1024*1024) + enc = &ost->st->codec; dec = &ist->st->codec; - frame_number = ist->frame_number; - /* first drop frame if needed */ - n1 = ((INT64)frame_number * enc->frame_rate) / dec->frame_rate; - n2 = (((INT64)frame_number + 1) * enc->frame_rate) / dec->frame_rate; - nb = n2 - n1; - if (nb <= 0) + /* by default, we output a single frame */ + nb_frames = 1; + + /* NOTE: the A/V sync is always done by considering the audio is + the master clock. It is suffisant for transcoding or playing, + but not for the general case */ + if (audio_sync) { + /* compute the A-V delay and duplicate/remove frames if needed */ + double adelta, vdelta, apts, vpts, av_delay; + + if (audio_sync->sync_ipts != AV_NOPTS_VALUE && + ost->sync_ipts != AV_NOPTS_VALUE) { + + adelta = (double)(ost->st->pts.val - audio_sync->sync_opts) * + s->pts_num / s->pts_den; + apts = audio_sync->sync_ipts + adelta; + + vdelta = (double)(ost->st->pts.val - ost->sync_opts) * + s->pts_num / s->pts_den; + vpts = ost->sync_ipts + vdelta; + + av_delay = apts - vpts; + // printf("delay=%f\n", av_delay); + if (av_delay < -AV_DELAY_MAX) + nb_frames = 2; + else if (av_delay > AV_DELAY_MAX) + nb_frames = 0; + } + } + /* XXX: also handle frame rate conversion */ + if (nb_frames <= 0) + return; + + if (!video_buffer) + video_buffer = av_malloc(VIDEO_BUFFER_SIZE); + if (!video_buffer) return; - + /* deinterlace : must be done before any resize */ if (do_deinterlace) { int size; /* create temporary picture */ size = avpicture_get_size(dec->pix_fmt, dec->width, dec->height); - buf1 = malloc(size); + buf1 = av_malloc(size); if (!buf1) return; @@ -795,7 +521,7 @@ static void do_video_out(AVFormatContext *s, if (avpicture_deinterlace(picture2, picture1, dec->pix_fmt, dec->width, dec->height) < 0) { /* if error, do not deinterlace */ - free(buf1); + av_free(buf1); buf1 = NULL; picture2 = picture1; } @@ -809,7 +535,7 @@ static void do_video_out(AVFormatContext *s, /* create temporary picture */ size = avpicture_get_size(enc->pix_fmt, dec->width, dec->height); - buf = malloc(size); + buf = av_malloc(size); if (!buf) return; pict = &picture_tmp1; @@ -834,60 +560,165 @@ static void do_video_out(AVFormatContext *s, } else { picture = pict; } - /* duplicates frame if needed */ /* XXX: pb because no interleaving */ - for(i=0;icodec_id != CODEC_ID_RAWVIDEO) { /* handles sameq here. This is not correct because it may not be a global option */ if (same_quality) { enc->quality = dec->quality; } + ret = avcodec_encode_video(enc, - video_buffer, sizeof(video_buffer), + video_buffer, VIDEO_BUFFER_SIZE, picture); - s->format->write_packet(s, ost->index, video_buffer, ret); + //enc->frame_number = enc->real_pict_num; + av_write_frame(s, ost->index, video_buffer, ret); + *frame_size = ret; + //fprintf(stderr,"\nFrame: %3d %3d size: %5d type: %d", + // enc->frame_number-1, enc->real_pict_num, ret, + // enc->pict_type); + /* if two pass, output log */ + if (ost->logfile && enc->stats_out) { + fprintf(ost->logfile, "%s", enc->stats_out); + } } else { - write_picture(s, ost->index, picture, enc->pix_fmt, enc->width, enc->height); + if (s->oformat->flags & AVFMT_RAWPICTURE) { + /* raw pictures are written as AVPicture structure to + avoid any copies. We support temorarily the older + method. */ + av_write_frame(s, ost->index, + (UINT8 *)picture, sizeof(AVPicture)); + } else { + write_picture(s, ost->index, picture, enc->pix_fmt, + enc->width, enc->height); + } } + ost->frame_number++; } - the_end: - if (buf) - free(buf); - if (buf1) - free(buf1); + the_end: + av_free(buf); + av_free(buf1); } -//#define HEX_DUMP +static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, + int frame_size) +{ + static FILE *fvstats=NULL; + static INT64 total_size = 0; + char filename[40]; + time_t today2; + struct tm *today; + AVCodecContext *enc; + int frame_number; + INT64 ti; + double ti1, bitrate, avg_bitrate; + + if (!fvstats) { + today2 = time(NULL); + today = localtime(&today2); + sprintf(filename, "vstats_%02d%02d%02d.log", today->tm_hour, + today->tm_min, + today->tm_sec); + fvstats = fopen(filename,"w"); + if (!fvstats) { + perror("fopen"); + exit(1); + } + } + + ti = MAXINT64; + enc = &ost->st->codec; + total_size += frame_size; + if (enc->codec_type == CODEC_TYPE_VIDEO) { + frame_number = ost->frame_number; + fprintf(fvstats, "frame= %5d q= %2d ", frame_number, enc->quality); + if (do_psnr) + fprintf(fvstats, "PSNR= %6.2f ", enc->psnr_y); + + fprintf(fvstats,"f_size= %6d ", frame_size); + /* compute pts value */ + ti1 = (double)ost->st->pts.val * os->pts_num / os->pts_den; + if (ti1 < 0.01) + ti1 = 0.01; + + bitrate = (double)(frame_size * 8) * enc->frame_rate / FRAME_RATE_BASE / 1000.0; + avg_bitrate = (double)(total_size * 8) / ti1 / 1000.0; + fprintf(fvstats, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ", + (double)total_size / 1024, ti1, bitrate, avg_bitrate); + fprintf(fvstats,"type= %s\n", enc->key_frame == 1 ? "I" : "P"); + } +} -#ifdef HEX_DUMP -static void hex_dump(UINT8 *buf, int size) +void print_report(AVFormatContext **output_files, + AVOutputStream **ost_table, int nb_ostreams, + int is_last_report) { - int len, i, j, c; + char buf[1024]; + AVOutputStream *ost; + AVFormatContext *oc, *os; + INT64 total_size; + AVCodecContext *enc; + int frame_number, vid, i; + double bitrate, ti1, pts; + static INT64 last_time = -1; + + if (!is_last_report) { + INT64 cur_time; + /* display the report every 0.5 seconds */ + cur_time = av_gettime(); + if (last_time == -1) { + last_time = cur_time; + return; + } + if ((cur_time - last_time) < 500000) + return; + last_time = cur_time; + } - for(i=0;i 16) - len = 16; - printf("%08x ", i); - for(j=0;j<16;j++) { - if (j < len) - printf(" %02x", buf[i+j]); - else - printf(" "); - } - printf(" "); - for(j=0;j '~') - c = '.'; - printf("%c", c); + + 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; + if (!vid && enc->codec_type == CODEC_TYPE_VIDEO) { + frame_number = ost->frame_number; + sprintf(buf + strlen(buf), "frame=%5d q=%2d ", + frame_number, enc->quality); + if (do_psnr) + sprintf(buf + strlen(buf), "PSNR=%6.2f ", enc->psnr_y); + vid = 1; } - printf("\n"); + /* compute min output value */ + pts = (double)ost->st->pts.val * os->pts_num / os->pts_den; + if ((pts < ti1) && (pts > 0)) + ti1 = pts; + } + if (ti1 < 0.01) + ti1 = 0.01; + bitrate = (double)(total_size * 8) / ti1 / 1000.0; + + sprintf(buf + strlen(buf), + "size=%8.0fkB time=%0.1f bitrate=%6.1fkbits/s", + (double)total_size / 1024, ti1, bitrate); + + fprintf(stderr, "%s ", buf); + + if (is_last_report) { + fprintf(stderr, "\n"); + } else { + fprintf(stderr, "\r"); + fflush(stderr); } } -#endif /* * The following code is the main loop of the file converter @@ -898,25 +729,25 @@ static int av_encode(AVFormatContext **output_files, int nb_input_files, AVStreamMap *stream_maps, int nb_stream_maps) { - int ret, i, j, k, n, nb_istreams = 0, nb_ostreams = 0; + int ret, i, j, k, n, nb_istreams = 0, nb_ostreams = 0, pts_set; AVFormatContext *is, *os; AVCodecContext *codec, *icodec; AVOutputStream *ost, **ost_table = NULL; AVInputStream *ist, **ist_table = NULL; - INT64 min_pts, start_time; AVInputFile *file_table; + AVFormatContext *stream_no_data; + int key; - file_table= (AVInputFile*) malloc(nb_input_files * sizeof(AVInputFile)); + file_table= (AVInputFile*) av_mallocz(nb_input_files * sizeof(AVInputFile)); if (!file_table) goto fail; - memset(file_table, 0, sizeof(file_table)); - /* input stream init */ j = 0; for(i=0;inb_streams; j += is->nb_streams; } nb_istreams = j; @@ -1010,17 +841,6 @@ static int av_encode(AVFormatContext **output_files, } } - /* dump the stream mapping */ - fprintf(stderr, "Stream mapping:\n"); - for(i=0;i #%d.%d\n", - ist_table[ost->source_index]->file_index, - ist_table[ost->source_index]->index, - ost->file_index, - ost->index); - } - /* for each output stream, we compute the right encoding parameters */ for(i=0;ist->codec; icodec = &ist->st->codec; - switch(codec->codec_type) { - case CODEC_TYPE_AUDIO: - /* check if same codec with same parameters. If so, no - reencoding is needed */ - if (codec->codec_id == icodec->codec_id && - codec->bit_rate == icodec->bit_rate && - codec->sample_rate == icodec->sample_rate && - codec->channels == icodec->channels) { - /* no reencoding */ - } else { + if (ost->st->stream_copy) { + /* if stream_copy is selected, no need to decode or encode */ + codec->codec_id = icodec->codec_id; + codec->codec_type = icodec->codec_type; + codec->codec_tag = icodec->codec_tag; + codec->bit_rate = icodec->bit_rate; + switch(codec->codec_type) { + case CODEC_TYPE_AUDIO: + codec->sample_rate = icodec->sample_rate; + codec->channels = icodec->channels; + break; + case CODEC_TYPE_VIDEO: + codec->frame_rate = icodec->frame_rate; + codec->width = icodec->width; + codec->height = icodec->height; + break; + default: + av_abort(); + } + } else { + switch(codec->codec_type) { + 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; } else { - ost->audio_resample = 1; - ost->resample = audio_resample_init(codec->channels, icodec->channels, + if (codec->channels != icodec->channels && + icodec->codec_id == CODEC_ID_AC3) { + /* Special case for 5:1 AC3 input */ + /* and mono or stereo output */ + /* Request specific number of channels */ + icodec->channels = codec->channels; + if (codec->sample_rate == icodec->sample_rate) + ost->audio_resample = 0; + else { + ost->audio_resample = 1; + ost->resample = audio_resample_init(codec->channels, icodec->channels, + codec->sample_rate, + icodec->sample_rate); + } + /* Request specific number of channels */ + icodec->channels = codec->channels; + } else { + ost->audio_resample = 1; + ost->resample = audio_resample_init(codec->channels, icodec->channels, codec->sample_rate, icodec->sample_rate); + } } ist->decoding_needed = 1; ost->encoding_needed = 1; - } - break; - case CODEC_TYPE_VIDEO: - /* check if same codec with same parameters. If so, no - reencoding is needed */ - if (codec->codec_id == icodec->codec_id && - codec->bit_rate == icodec->bit_rate && - codec->frame_rate == icodec->frame_rate && - codec->width == icodec->width && - codec->height == icodec->height) { - /* no reencoding */ - } else { + break; + case CODEC_TYPE_VIDEO: if (codec->width == icodec->width && codec->height == icodec->height) { ost->video_resample = 0; } else { UINT8 *buf; ost->video_resample = 1; - buf = malloc((codec->width * codec->height * 3) / 2); + buf = av_malloc((codec->width * codec->height * 3) / 2); if (!buf) goto fail; ost->pict_tmp.data[0] = buf; @@ -1081,18 +921,78 @@ static int av_encode(AVFormatContext **output_files, ost->pict_tmp.linesize[1] = codec->width / 2; ost->pict_tmp.linesize[2] = codec->width / 2; - ost->img_resample_ctx = img_resample_init( + ost->img_resample_ctx = img_resample_full_init( ost->st->codec.width, ost->st->codec.height, - ist->st->codec.width, ist->st->codec.height); + ist->st->codec.width, ist->st->codec.height, + frame_topBand, frame_bottomBand, + frame_leftBand, frame_rightBand); } ost->encoding_needed = 1; ist->decoding_needed = 1; + break; + default: + av_abort(); + } + /* two pass mode */ + 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 ? + pass_logfilename : DEFAULT_PASS_LOGFILENAME, i); + if (codec->flags & CODEC_FLAG_PASS1) { + f = fopen(logfilename, "w"); + if (!f) { + perror(logfilename); + exit(1); + } + ost->logfile = f; + } else { + /* read the log file */ + f = fopen(logfilename, "r"); + if (!f) { + perror(logfilename); + exit(1); + } + fseek(f, 0, SEEK_END); + size = ftell(f); + fseek(f, 0, SEEK_SET); + logbuffer = av_malloc(size + 1); + if (!logbuffer) { + fprintf(stderr, "Could not allocate log buffer\n"); + exit(1); + } + fread(logbuffer, 1, size, f); + fclose(f); + logbuffer[size] = '\0'; + codec->stats_in = logbuffer; + } } - break; } } - /* open each encoder */ + /* dump the file output parameters - cannot be done before in case + of stream copy */ + for(i=0;ifilename, 1); + } + + /* dump the stream mapping */ + fprintf(stderr, "Stream mapping:\n"); + for(i=0;i #%d.%d\n", + ist_table[ost->source_index]->file_index, + ist_table[ost->source_index]->index, + ost->file_index, + ost->index); + } + + /* open each encoder */ for(i=0;iencoding_needed) { @@ -1127,14 +1027,15 @@ static int av_encode(AVFormatContext **output_files, ist->file_index, ist->index); exit(1); } + //if (ist->st->codec.codec_type == CODEC_TYPE_VIDEO) + // ist->st->codec.flags |= CODEC_FLAG_REPEAT_FIELD; + ist->frame_decoded = 1; } } /* init pts */ for(i=0;ipts = 0; - ist->frame_number = 0; } /* compute buffer size max (should use a complete heuristic) */ @@ -1145,11 +1046,25 @@ static int av_encode(AVFormatContext **output_files, /* open files and write file headers */ for(i=0;iformat->write_header(os); + if (av_write_header(os) < 0) { + fprintf(stderr, "Could not write header for output file #%d (incorrect codec paramters ?)\n", i); + ret = -EINVAL; + goto fail; + } } - start_time = gettime(); - min_pts = 0; +#ifndef CONFIG_WIN32 + if (!do_play) { + fprintf(stderr, "Press [q] to stop encoding\n"); + } else { + fprintf(stderr, "Press [q] to stop playing\n"); + } +#endif + term_init(); + + stream_no_data = 0; + key = -1; + for(;;) { int file_index, ist_index; AVPacket pkt; @@ -1159,76 +1074,115 @@ static int av_encode(AVFormatContext **output_files, int data_size, got_picture; AVPicture picture; short samples[AVCODEC_MAX_AUDIO_FRAME_SIZE / 2]; - - /* select the input file with the smallest pts */ + double pts_min; + redo: + /* if 'q' pressed, exits */ + if (key) { + /* read_key() returns 0 on EOF */ + key = read_key(); + if (key == 'q') + break; + } + + /* select the stream that we must read now by looking at the + smallest output pts */ file_index = -1; - min_pts = MAXINT64; - for(i=0;idiscard && !file_table[ist->file_index].eof_reached && ist->pts < min_pts) { - min_pts = ist->pts; + pts_min = 1e10; + for(i=0;ifile_index]; + ist = ist_table[ost->source_index]; + pts = (double)ost->st->pts.val * os->pts_num / os->pts_den; + if (!file_table[ist->file_index].eof_reached && + pts < pts_min) { + pts_min = pts; file_index = ist->file_index; } } /* if none, if is finished */ - if (file_index < 0) + if (file_index < 0) { break; + } + /* finish if recording time exhausted */ - if (recording_time > 0 && min_pts >= recording_time) + if (recording_time > 0 && pts_min >= (recording_time / 1000000.0)) break; + /* read a packet from it and output it in the fifo */ - is = input_files[file_index]; if (av_read_packet(is, &pkt) < 0) { file_table[file_index].eof_reached = 1; continue; } + if (!pkt.size) { + stream_no_data = is; + } else { + stream_no_data = 0; + } + /* the following test is needed in case new streams appear + dynamically in stream : we ignore them */ + if (pkt.stream_index >= file_table[file_index].nb_streams) + goto discard_packet; ist_index = file_table[file_index].ist_index + pkt.stream_index; ist = ist_table[ist_index]; - if (ist->discard) { - continue; - } + if (ist->discard) + goto discard_packet; -#ifdef HEX_DUMP - printf("stream #%d, size=%d:\n", pkt.stream_index, pkt.size); - hex_dump(pkt.data, pkt.size); -#endif + if (do_hex_dump) { + printf("stream #%d, size=%d:\n", pkt.stream_index, pkt.size); + av_hex_dump(pkt.data, pkt.size); + } // printf("read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size); len = pkt.size; ptr = pkt.data; + pts_set = 0; while (len > 0) { + INT64 ipts; + + ipts = AV_NOPTS_VALUE; /* decode the packet if needed */ data_buf = NULL; /* fail safe */ data_size = 0; if (ist->decoding_needed) { + /* NOTE1: we only take into account the PTS if a new + frame has begun (MPEG semantics) */ + /* NOTE2: even if the fraction is not initialized, + av_frac_set can be used to set the integer part */ + if (ist->frame_decoded && + pkt.pts != AV_NOPTS_VALUE && + !pts_set) { + ipts = pkt.pts; + ist->frame_decoded = 0; + pts_set = 1; + } + switch(ist->st->codec.codec_type) { case CODEC_TYPE_AUDIO: - if (ist->st->codec.codec_id == CODEC_ID_PCM) { - /* no need to call a codec */ - data_buf = ptr; - data_size = len; - ret = len; - } else { - ret = avcodec_decode_audio(&ist->st->codec, samples, &data_size, - ptr, len); - if (ret < 0) - goto fail_decode; - if (data_size == 0) { - /* no audio frame */ - ptr += ret; - len -= ret; - continue; - } - data_buf = (UINT8 *)samples; + /* XXX: could avoid copy if PCM 16 bits with same + endianness as CPU */ + ret = avcodec_decode_audio(&ist->st->codec, samples, &data_size, + ptr, len); + if (ret < 0) + goto fail_decode; + /* Some bug in mpeg audio decoder gives */ + /* data_size < 0, it seems they are overflows */ + if (data_size <= 0) { + /* no audio frame */ + ptr += ret; + len -= ret; + continue; } + data_buf = (UINT8 *)samples; break; case CODEC_TYPE_VIDEO: if (ist->st->codec.codec_id == CODEC_ID_RAWVIDEO) { int size; + size = (ist->st->codec.width * ist->st->codec.height); avpicture_fill(&picture, ptr, ist->st->codec.pix_fmt, @@ -1252,6 +1206,7 @@ static int av_encode(AVFormatContext **output_files, len -= ret; continue; } + } break; default: @@ -1262,144 +1217,101 @@ static int av_encode(AVFormatContext **output_files, data_size = len; ret = len; } - /* update pts */ - switch(ist->st->codec.codec_type) { - case CODEC_TYPE_AUDIO: - ist->pts = (INT64)1000000 * ist->sample_index / ist->st->codec.sample_rate; - ist->sample_index += data_size / (2 * ist->st->codec.channels); - break; - case CODEC_TYPE_VIDEO: - ist->frame_number++; - ist->pts = ((INT64)ist->frame_number * 1000000 * FRAME_RATE_BASE) / - ist->st->codec.frame_rate; - break; - } ptr += ret; len -= ret; + ist->frame_decoded = 1; + +#if 0 + /* mpeg PTS deordering : if it is a P or I frame, the PTS + is the one of the next displayed one */ + /* XXX: add mpeg4 too ? */ + if (ist->st->codec.codec_id == CODEC_ID_MPEG1VIDEO) { + if (ist->st->codec.pict_type != B_TYPE) { + INT64 tmp; + tmp = ist->last_ip_pts; + ist->last_ip_pts = ist->frac_pts.val; + ist->frac_pts.val = tmp; + } + } +#endif /* transcode raw format, encode packets and output them */ - + for(i=0;isource_index == ist_index) { os = output_files[ost->file_index]; + if (ipts != AV_NOPTS_VALUE) { +#if 0 + printf("%d: got pts=%f %f\n", + i, pkt.pts / 90000.0, + (ipts - ost->st->pts.val) / 90000.0); +#endif + /* set the input output pts pairs */ + ost->sync_ipts = (double)ipts * is->pts_num / + is->pts_den; + /* XXX: take into account the various fifos, + in particular for audio */ + ost->sync_opts = ost->st->pts.val; + } + if (ost->encoding_needed) { switch(ost->st->codec.codec_type) { case CODEC_TYPE_AUDIO: do_audio_out(os, ost, ist, data_buf, data_size); break; case CODEC_TYPE_VIDEO: - do_video_out(os, ost, ist, &picture); + /* find an audio stream for synchro */ + { + int i; + AVOutputStream *audio_sync, *ost1; + audio_sync = NULL; + for(i=0;ifile_index == ost->file_index && + ost1->st->codec.codec_type == CODEC_TYPE_AUDIO) { + audio_sync = ost1; + break; + } + } + + do_video_out(os, ost, ist, &picture, &frame_size, audio_sync); + if (do_vstats) + do_video_stats(os, ost, frame_size); + } break; + default: + av_abort(); } } else { /* no reencoding needed : output the packet directly */ - os->format->write_packet(os, ost->index, data_buf, data_size); + /* force the input stream PTS */ + av_write_frame(os, ost->index, data_buf, data_size); + ost->st->codec.frame_number++; } } } + ipts = AV_NOPTS_VALUE; } + discard_packet: av_free_packet(&pkt); - /* dump report by using the first video and audio streams */ - { - char buf[1024]; - AVFormatContext *oc; - INT64 total_size, ti; - AVCodecContext *enc; - int frame_number, vid; - double bitrate, ti1; - static INT64 last_time; - - if ((min_pts - last_time) >= 500000) { - last_time = min_pts; - - oc = output_files[0]; - - total_size = url_ftell(&oc->pb); - - buf[0] = '\0'; - ti = MAXINT64; - vid = 0; - for(i=0;ist->codec; - ist = ist_table[ost->source_index]; - if (!vid && enc->codec_type == CODEC_TYPE_VIDEO) { - frame_number = ist->frame_number; - sprintf(buf + strlen(buf), "frame=%5d q=%2d ", - frame_number, enc->quality); - vid = 1; - } - /* compute min pts value */ - if (!ist->discard && ist->pts < ti) { - ti = ist->pts; - } - } - - ti1 = (double)ti / 1000000.0; - if (ti1 < 0.1) - ti1 = 0.1; - bitrate = (double)(total_size * 8) / ti1 / 1000.0; - - sprintf(buf + strlen(buf), - "size=%8.0fkB time=%0.1f bitrate=%6.1fkbits/s", - (double)total_size / 1024, ti1, bitrate); - - fprintf(stderr, "%s \r", buf); - fflush(stderr); - } - } + /* dump report by using the output first video and audio streams */ + print_report(output_files, ost_table, nb_ostreams, 0); } + term_exit(); /* dump report by using the first video and audio streams */ - { - char buf[1024]; - AVFormatContext *oc; - INT64 total_size, ti; - AVCodecContext *enc; - int frame_number, vid; - double bitrate, ti1; - - oc = output_files[0]; - - total_size = url_ftell(&oc->pb); - - buf[0] = '\0'; - ti = MAXINT64; - vid = 0; - for(i=0;ist->codec; - ist = ist_table[ost->source_index]; - if (!vid && enc->codec_type == CODEC_TYPE_VIDEO) { - frame_number = ist->frame_number; - sprintf(buf + strlen(buf), "frame=%5d q=%2d ", - frame_number, enc->quality); - vid = 1; - } - /* compute min pts value */ - if (!ist->discard && ist->pts < ti) { - ti = ist->pts; - } - } - - ti1 = ti / 1000000.0; - if (ti1 < 0.1) - ti1 = 0.1; - bitrate = (double)(total_size * 8) / ti1 / 1000.0; - - sprintf(buf + strlen(buf), - "size=%8.0fkB time=%0.1f bitrate=%6.1fkbits/s", - (double)total_size / 1024, ti1, bitrate); - - fprintf(stderr, "%s \n", buf); - } + print_report(output_files, ost_table, nb_ostreams, 1); + /* close each encoder */ for(i=0;iencoding_needed) { + av_freep(&ost->st->codec.stats_in); avcodec_close(&ost->st->codec); } } @@ -1416,37 +1328,40 @@ static int av_encode(AVFormatContext **output_files, /* write the trailer if needed and close file */ for(i=0;iformat->write_trailer(os); + av_write_trailer(os); } /* finished ! */ ret = 0; fail1: - free(file_table); + av_free(file_table); if (ist_table) { for(i=0;ipict_tmp.data[0]) - free(ost->pict_tmp.data[0]); + if (ost->logfile) { + fclose(ost->logfile); + ost->logfile = NULL; + } + fifo_free(&ost->fifo); /* works even if fifo is not + initialized but set to zero */ + av_free(ost->pict_tmp.data[0]); if (ost->video_resample) img_resample_close(ost->img_resample_ctx); if (ost->audio_resample) audio_resample_close(ost->resample); - free(ost); + av_free(ost); } } - free(ost_table); + av_free(ost_table); } return ret; fail: @@ -1480,34 +1395,32 @@ void show_licence(void) { printf( "ffmpeg version " FFMPEG_VERSION "\n" - "Copyright (c) 2000,2001 Gerard Lantau\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" + "Copyright (c) 2000, 2001, 2002 Fabrice Bellard\n" + "This library is free software; you can redistribute it and/or\n" + "modify it under the terms of the GNU Lesser General Public\n" + "License as published by the Free Software Foundation; either\n" + "version 2 of the License, or (at your option) any later version.\n" "\n" - "This program is distributed in the hope that it will be useful,\n" + "This library is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" + "Lesser General Public License for more details.\n" "\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., 675 Mass Ave, Cambridge, MA 02139, USA.\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" ); exit(1); } void opt_format(const char *arg) { - AVFormat *f; - f = first_format; - while (f != NULL && strcmp(f->name, arg) != 0) f = f->next; - if (f == NULL) { - fprintf(stderr, "Invalid format: %s\n", arg); + file_iformat = av_find_input_format(arg); + file_oformat = guess_format(arg, NULL, NULL); + if (!file_iformat && !file_oformat) { + fprintf(stderr, "Unknown input or output format: %s\n", arg); exit(1); } - file_format = f; } void opt_video_bitrate(const char *arg) @@ -1515,11 +1428,142 @@ void opt_video_bitrate(const char *arg) video_bit_rate = atoi(arg) * 1000; } +void opt_video_bitrate_tolerance(const char *arg) +{ + video_bit_rate_tolerance = atoi(arg) * 1000; +} + +void opt_video_bitrate_max(const char *arg) +{ + video_rc_max_rate = atoi(arg) * 1000; +} + +void opt_video_bitrate_min(const char *arg) +{ + video_rc_min_rate = atoi(arg) * 1000; +} + +void opt_video_buffer_size(const char *arg) +{ + video_rc_buffer_size = atoi(arg) * 1000; +} + +void opt_video_rc_eq(char *arg) +{ + video_rc_eq = arg; +} + +void opt_video_rc_override_string(char *arg) +{ + video_rc_override_string = arg; +} + + +void opt_workaround_bugs(const char *arg) +{ + workaround_bugs = atoi(arg); +} + +void opt_dct_algo(const char *arg) +{ + dct_algo = atoi(arg); +} + +void opt_idct_algo(const char *arg) +{ + idct_algo = atoi(arg); +} + + +void opt_error_resilience(const char *arg) +{ + error_resilience = atoi(arg); +} + +void opt_error_concealment(const char *arg) +{ + error_concealment = atoi(arg); +} + + void opt_frame_rate(const char *arg) { frame_rate = (int)(strtod(arg, 0) * FRAME_RATE_BASE); } + +void opt_frame_crop_top(const char *arg) +{ + frame_topBand = atoi(arg); + if (frame_topBand < 0) { + fprintf(stderr, "Incorrect top crop size\n"); + exit(1); + } + if ((frame_topBand % 2) != 0) { + fprintf(stderr, "Top crop size must be a multiple of 2\n"); + 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"); + exit(1); + } + frame_height -= frame_topBand; +} + +void opt_frame_crop_bottom(const char *arg) +{ + frame_bottomBand = atoi(arg); + if (frame_bottomBand < 0) { + fprintf(stderr, "Incorrect bottom crop size\n"); + exit(1); + } + if ((frame_bottomBand % 2) != 0) { + fprintf(stderr, "Bottom crop size must be a multiple of 2\n"); + 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"); + exit(1); + } + frame_height -= frame_bottomBand; +} + +void opt_frame_crop_left(const char *arg) +{ + frame_leftBand = atoi(arg); + if (frame_leftBand < 0) { + fprintf(stderr, "Incorrect left crop size\n"); + exit(1); + } + if ((frame_leftBand % 2) != 0) { + fprintf(stderr, "Left crop size must be a multiple of 2\n"); + 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"); + exit(1); + } + frame_width -= frame_leftBand; +} + +void opt_frame_crop_right(const char *arg) +{ + frame_rightBand = atoi(arg); + if (frame_rightBand < 0) { + fprintf(stderr, "Incorrect right crop size\n"); + exit(1); + } + if ((frame_rightBand % 2) != 0) { + fprintf(stderr, "Right crop size must be a multiple of 2\n"); + 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"); + exit(1); + } + frame_width -= frame_rightBand; +} + void opt_frame_size(const char *arg) { parse_image_size(&frame_width, &frame_height, arg); @@ -1538,6 +1582,18 @@ void opt_gop_size(const char *arg) gop_size = atoi(arg); } +void opt_b_frames(const char *arg) +{ + b_frames = atoi(arg); + if (b_frames > FF_MAX_B_FRAMES) { + fprintf(stderr, "\nCannot have more than %d B frames, increase FF_MAX_B_FRAMES.\n", FF_MAX_B_FRAMES); + exit(1); + } else if (b_frames < 1) { + fprintf(stderr, "\nNumber of B frames must be higher than 0\n"); + exit(1); + } +} + void opt_qscale(const char *arg) { video_qscale = atoi(arg); @@ -1548,6 +1604,71 @@ void opt_qscale(const char *arg) } } +void opt_qmin(const char *arg) +{ + video_qmin = atoi(arg); + if (video_qmin < 0 || + video_qmin > 31) { + fprintf(stderr, "qmin must be >= 1 and <= 31\n"); + exit(1); + } +} + +void opt_qmax(const char *arg) +{ + video_qmax = atoi(arg); + if (video_qmax < 0 || + video_qmax > 31) { + fprintf(stderr, "qmax must be >= 1 and <= 31\n"); + exit(1); + } +} + +void opt_qdiff(const char *arg) +{ + video_qdiff = atoi(arg); + if (video_qdiff < 0 || + video_qdiff > 31) { + fprintf(stderr, "qdiff must be >= 1 and <= 31\n"); + exit(1); + } +} + +void opt_qblur(const char *arg) +{ + video_qblur = atof(arg); +} + +void opt_qcomp(const char *arg) +{ + video_qcomp = atof(arg); +} + +void opt_rc_initial_cplx(const char *arg) +{ + video_rc_initial_cplx = atof(arg); +} +void opt_b_qfactor(const char *arg) +{ + video_b_qfactor = atof(arg); +} +void opt_i_qfactor(const char *arg) +{ + video_i_qfactor = atof(arg); +} +void opt_b_qoffset(const char *arg) +{ + video_b_qoffset = atof(arg); +} +void opt_i_qoffset(const char *arg) +{ + video_i_qoffset = atof(arg); +} + +void opt_packet_size(const char *arg) +{ + packet_size= atoi(arg); +} void opt_audio_bitrate(const char *arg) { @@ -1564,7 +1685,6 @@ void opt_audio_channels(const char *arg) audio_channels = atoi(arg); } -#ifdef CONFIG_GRAB void opt_video_device(const char *arg) { v4l_device = strdup(arg); @@ -1574,23 +1694,26 @@ void opt_audio_device(const char *arg) { audio_device = strdup(arg); } -#endif void opt_audio_codec(const char *arg) { AVCodec *p; - p = first_avcodec; - while (p) { - if (!strcmp(p->name, arg) && p->type == CODEC_TYPE_AUDIO) - break; - p = p->next; - } - if (p == NULL) { - fprintf(stderr, "Unknown audio codec '%s'\n", arg); - exit(1); + if (!strcmp(arg, "copy")) { + audio_stream_copy = 1; } else { - audio_codec_id = p->id; + p = first_avcodec; + while (p) { + if (!strcmp(p->name, arg) && p->type == CODEC_TYPE_AUDIO) + break; + p = p->next; + } + if (p == NULL) { + fprintf(stderr, "Unknown audio codec '%s'\n", arg); + exit(1); + } else { + audio_codec_id = p->id; + } } } @@ -1599,6 +1722,8 @@ const char *motion_str[] = { "full", "log", "phods", + "epzs", + "x1", NULL, }; @@ -1615,24 +1740,28 @@ void opt_motion_estimation(const char *arg) break; p++; } - motion_estimation_method = p - motion_str; + me_method = (p - motion_str) + 1; } void opt_video_codec(const char *arg) { AVCodec *p; - 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); + if (!strcmp(arg, "copy")) { + video_stream_copy = 1; } else { - video_codec_id = p->id; + 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; + } } } @@ -1647,7 +1776,8 @@ void opt_map(const char *arg) m->file_index = strtol(arg, (char **)&p, 0); if (*p) p++; - m->stream_index = strtol(arg, (char **)&p, 0); + + m->stream_index = strtol(p, (char **)&p, 0); } void opt_recording_time(const char *arg) @@ -1655,185 +1785,52 @@ void opt_recording_time(const char *arg) recording_time = parse_date(arg, 1); } -/* return the number of packet read to find the codec parameters */ -int find_codec_parameters(AVFormatContext *ic) +void print_error(const char *filename, int err) { - int val, i, count, ret, got_picture, size; - AVCodec *codec; - AVCodecContext *enc; - AVStream *st; - AVPacket *pkt; - AVPicture picture; - AVPacketList *pktl, **ppktl; - short samples[AVCODEC_MAX_AUDIO_FRAME_SIZE / 2]; - UINT8 *ptr; - - count = 0; - ppktl = &ic->packet_buffer; - for(;;) { - for(i=0;inb_streams;i++) { - enc = &ic->streams[i]->codec; - - switch(enc->codec_type) { - case CODEC_TYPE_AUDIO: - val = enc->sample_rate; - break; - case CODEC_TYPE_VIDEO: - val = enc->width; - break; - default: - val = 1; - break; - } - /* if no parameters supplied, then we should read it from - the stream */ - if (val == 0) - break; - } - if (i == ic->nb_streams) { - ret = count; - break; - } - - if (count == 0) { - /* open each codec */ - for(i=0;inb_streams;i++) { - st = ic->streams[i]; - codec = avcodec_find_decoder(st->codec.codec_id); - if (codec == NULL) { - ret = -1; - goto the_end; - } - avcodec_open(&st->codec, codec); - } - } - pktl = av_mallocz(sizeof(AVPacketList)); - if (!pktl) { - ret = -1; - break; - } - - /* add the packet in the buffered packet list */ - *ppktl = pktl; - ppktl = &pktl->next; - - pkt = &pktl->pkt; - if (ic->format->read_packet(ic, pkt) < 0) { - ret = -1; - break; - } - st = ic->streams[pkt->stream_index]; - - /* decode the data and update codec parameters */ - ptr = pkt->data; - size = pkt->size; - while (size > 0) { - switch(st->codec.codec_type) { - case CODEC_TYPE_VIDEO: - ret = avcodec_decode_video(&st->codec, &picture, &got_picture, ptr, size); - break; - case CODEC_TYPE_AUDIO: - ret = avcodec_decode_audio(&st->codec, samples, &got_picture, ptr, size); - break; - default: - ret = -1; - break; - } - if (ret < 0) { - ret = -1; - goto the_end; - } - if (got_picture) - break; - ptr += ret; - size -= ret; - } - - count++; - } - the_end: - if (count > 0) { - /* close each codec */ - for(i=0;inb_streams;i++) { - st = ic->streams[i]; - avcodec_close(&st->codec); - } + switch(err) { + case AVERROR_NUMEXPECTED: + fprintf(stderr, "%s: Incorrect image filename syntax.\n" + "Use '%%d' to specify the image number:\n" + " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n" + " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n", + filename); + break; + case AVERROR_INVALIDDATA: + fprintf(stderr, "%s: Error while parsing header\n", filename); + break; + case AVERROR_NOFMT: + fprintf(stderr, "%s: Unknown format\n", filename); + break; + default: + fprintf(stderr, "%s: Error while opening file\n", filename); + break; } - return ret; } - void opt_input_file(const char *filename) { AVFormatContext *ic; AVFormatParameters params, *ap = ¶ms; - URLFormat url_format; - AVFormat *fmt; - int err, i, ret; - - ic = av_mallocz(sizeof(AVFormatContext)); - strcpy(ic->filename, filename); - /* first format guess to know if we must open file */ - fmt = file_format; - if (!fmt) - fmt = guess_format(NULL, filename, NULL); - - if (fmt == NULL || !(fmt->flags & AVFMT_NOFILE)) { - /* open file */ - if (url_fopen(&ic->pb, filename, URL_RDONLY) < 0) { - fprintf(stderr, "Could not open '%s'\n", filename); - exit(1); - } - - /* find format and set default parameters */ - fmt = file_format; - err = url_getformat(url_fileno(&ic->pb), &url_format); - if (err >= 0) { - if (!fmt) - fmt = guess_format(url_format.format_name, NULL, NULL); - ap->sample_rate = url_format.sample_rate; - ap->frame_rate = url_format.frame_rate; - ap->channels = url_format.channels; - ap->width = url_format.width; - ap->height = url_format.height; - ap->pix_fmt = url_format.pix_fmt; - } else { - if (!fmt) - fmt = guess_format(NULL, filename, NULL); - memset(ap, 0, sizeof(*ap)); - } - } else { - memset(ap, 0, sizeof(*ap)); - } - - if (!fmt || !fmt->read_header) { - fprintf(stderr, "%s: Unknown file format\n", filename); - exit(1); - } - ic->format = fmt; + int err, i, ret, rfps; /* get default parameters from command line */ - if (!ap->sample_rate) - ap->sample_rate = audio_sample_rate; - if (!ap->channels) - ap->channels = audio_channels; - - if (!ap->frame_rate) - ap->frame_rate = frame_rate; - if (!ap->width) - ap->width = frame_width; - if (!ap->height) - ap->height = frame_height; - - err = ic->format->read_header(ic, ap); + memset(ap, 0, sizeof(*ap)); + ap->sample_rate = audio_sample_rate; + ap->channels = audio_channels; + ap->frame_rate = frame_rate; + ap->width = frame_width; + ap->height = frame_height; + + /* open the input file with generic libav function */ + err = av_open_input_file(&ic, filename, file_iformat, 0, ap); if (err < 0) { - fprintf(stderr, "%s: Error while parsing header\n", filename); + print_error(filename, err); exit(1); } - /* If not enough info for the codecs, we decode the first frames - to get it. (used in mpeg case for example) */ - ret = find_codec_parameters(ic); + /* 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); if (ret < 0) { fprintf(stderr, "%s: could not find codec parameters\n", filename); exit(1); @@ -1844,14 +1841,28 @@ void opt_input_file(const char *filename) AVCodecContext *enc = &ic->streams[i]->codec; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: + //fprintf(stderr, "\nInput Audio channels: %d", enc->channels); audio_channels = enc->channels; audio_sample_rate = enc->sample_rate; break; case CODEC_TYPE_VIDEO: frame_height = enc->height; frame_width = enc->width; - frame_rate = enc->frame_rate; + rfps = ic->streams[i]->r_frame_rate; + enc->workaround_bugs = workaround_bugs; + enc->error_resilience = error_resilience; + enc->error_concealment = error_concealment; + enc->idct_algo= idct_algo; + if (enc->frame_rate != rfps) { + fprintf(stderr,"\nSeems that stream %d comes from film source: %2.2f->%2.2f\n", + i, (float)enc->frame_rate / FRAME_RATE_BASE, + (float)rfps / FRAME_RATE_BASE); + } + /* update the current frame rate to match the stream frame rate */ + frame_rate = rfps; break; + default: + av_abort(); } } @@ -1859,14 +1870,42 @@ void opt_input_file(const char *filename) /* dump the file content */ dump_format(ic, nb_input_files, filename, 0); nb_input_files++; - file_format = NULL; + file_iformat = NULL; + file_oformat = NULL; +} + +void check_audio_video_inputs(int *has_video_ptr, int *has_audio_ptr) +{ + int has_video, has_audio, i, j; + AVFormatContext *ic; + + has_video = 0; + has_audio = 0; + for(j=0;jnb_streams;i++) { + AVCodecContext *enc = &ic->streams[i]->codec; + switch(enc->codec_type) { + case CODEC_TYPE_AUDIO: + has_audio = 1; + break; + case CODEC_TYPE_VIDEO: + has_video = 1; + break; + default: + av_abort(); + } + } + } + *has_video_ptr = has_video; + *has_audio_ptr = has_audio; } void opt_output_file(const char *filename) { AVStream *st; AVFormatContext *oc; - int use_video, use_audio, nb_streams; + int use_video, use_audio, nb_streams, input_has_video, input_has_audio; int codec_id; if (!strcmp(filename, "-")) @@ -1874,15 +1913,18 @@ void opt_output_file(const char *filename) oc = av_mallocz(sizeof(AVFormatContext)); - if (!file_format) { - file_format = guess_format(NULL, filename, NULL); - if (!file_format) - file_format = &mpeg_mux_format; + if (!file_oformat) { + file_oformat = guess_format(NULL, filename, NULL); + if (!file_oformat) { + fprintf(stderr, "Unable for find a suitable output format for '%s'\n", + filename); + exit(1); + } } - oc->format = file_format; + oc->oformat = file_oformat; - if (!strcmp(file_format->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 */ @@ -1891,9 +1933,20 @@ void opt_output_file(const char *filename) exit(1); } } else { - use_video = file_format->video_codec != CODEC_ID_NONE; - use_audio = file_format->audio_codec != CODEC_ID_NONE; - + use_video = file_oformat->video_codec != CODEC_ID_NONE; + use_audio = file_oformat->audio_codec != CODEC_ID_NONE; + + /* disable if no corresponding type found and at least one + input file */ + if (nb_input_files > 0) { + check_audio_video_inputs(&input_has_video, &input_has_audio); + if (!input_has_video) + use_video = 0; + if (!input_has_audio) + use_audio = 0; + } + + /* manual disable */ if (audio_disable) { use_audio = 0; } @@ -1910,34 +1963,129 @@ void opt_output_file(const char *filename) fprintf(stderr, "Could not alloc stream\n"); exit(1); } - video_enc = &st->codec; - - codec_id = file_format->video_codec; - if (video_codec_id != CODEC_ID_NONE) - codec_id = video_codec_id; - video_enc->codec_id = codec_id; - video_enc->codec_type = CODEC_TYPE_VIDEO; + video_enc = &st->codec; + if (video_stream_copy) { + st->stream_copy = 1; + video_enc->codec_type = CODEC_TYPE_VIDEO; + } else { + char *p; + int i; - video_enc->bit_rate = video_bit_rate; - video_enc->frame_rate = frame_rate; + codec_id = file_oformat->video_codec; + if (video_codec_id != CODEC_ID_NONE) + codec_id = video_codec_id; + + video_enc->codec_id = 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->width = frame_width; + video_enc->height = frame_height; + + 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->quality = video_qscale; + } - video_enc->width = frame_width; - video_enc->height = frame_height; - 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->quality = video_qscale; - } - /* XXX: need to find a way to set codec parameters */ - if (oc->format == &ppm_format || - oc->format == &ppmpipe_format) { - video_enc->pix_fmt = PIX_FMT_RGB24; - } + if (use_hq) { + video_enc->flags |= CODEC_FLAG_HQ; + } + + if (use_4mv) { + video_enc->flags |= CODEC_FLAG_HQ; + video_enc->flags |= CODEC_FLAG_4MV; + } + + if(use_part) + video_enc->flags |= CODEC_FLAG_PART; + + + if (b_frames) { + if (codec_id != CODEC_ID_MPEG4) { + fprintf(stderr, "\nB frames encoding only supported by MPEG-4.\n"); + exit(1); + } + video_enc->max_b_frames = b_frames; + video_enc->b_frame_strategy = 0; + video_enc->b_quant_factor = 2.0; + } + + video_enc->qmin = video_qmin; + video_enc->qmax = video_qmax; + video_enc->max_qdiff = video_qdiff; + video_enc->qblur = video_qblur; + video_enc->qcompress = video_qcomp; + video_enc->rc_eq = video_rc_eq; + + 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= + 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_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->dct_algo = dct_algo; + video_enc->idct_algo = idct_algo; + if(packet_size){ + video_enc->rtp_mode= 1; + video_enc->rtp_payload_size= packet_size; + } + + if (do_psnr) + video_enc->get_psnr = 1; + else + video_enc->get_psnr = 0; + + 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; + } + } + + /* XXX: need to find a way to set codec parameters */ + if (oc->oformat->flags & AVFMT_RGB24) { + video_enc->pix_fmt = PIX_FMT_RGB24; + } + } oc->streams[nb_streams] = st; nb_streams++; } @@ -1950,16 +2098,26 @@ void opt_output_file(const char *filename) fprintf(stderr, "Could not alloc stream\n"); exit(1); } + audio_enc = &st->codec; - codec_id = file_format->audio_codec; - if (audio_codec_id != CODEC_ID_NONE) - codec_id = audio_codec_id; - audio_enc->codec_id = codec_id; audio_enc->codec_type = CODEC_TYPE_AUDIO; - - audio_enc->bit_rate = audio_bit_rate; - audio_enc->sample_rate = audio_sample_rate; - audio_enc->channels = audio_channels; + if (audio_stream_copy) { + st->stream_copy = 1; + } else { + codec_id = file_oformat->audio_codec; + if (audio_codec_id != CODEC_ID_NONE) + codec_id = audio_codec_id; + audio_enc->codec_id = codec_id; + + audio_enc->bit_rate = audio_bit_rate; + audio_enc->sample_rate = audio_sample_rate; + /* For audio codecs other than AC3 we limit */ + /* the number of coded channels to stereo */ + if (audio_channels > 2 && codec_id != CODEC_ID_AC3) { + audio_enc->channels = 2; + } else + audio_enc->channels = audio_channels; + } oc->streams[nb_streams] = st; nb_streams++; } @@ -1967,27 +2125,33 @@ void opt_output_file(const char *filename) oc->nb_streams = nb_streams; if (!nb_streams) { - fprintf(stderr, "No audio or video selected\n"); + fprintf(stderr, "No audio or video streams available\n"); exit(1); } if (str_title) - nstrcpy(oc->title, sizeof(oc->title), str_title); + pstrcpy(oc->title, sizeof(oc->title), str_title); if (str_author) - nstrcpy(oc->author, sizeof(oc->author), str_author); + pstrcpy(oc->author, sizeof(oc->author), str_author); if (str_copyright) - nstrcpy(oc->copyright, sizeof(oc->copyright), str_copyright); + pstrcpy(oc->copyright, sizeof(oc->copyright), str_copyright); if (str_comment) - nstrcpy(oc->comment, sizeof(oc->comment), str_comment); + pstrcpy(oc->comment, sizeof(oc->comment), str_comment); } - output_files[nb_output_files] = oc; - /* dump the file content */ - dump_format(oc, nb_output_files, filename, 1); - nb_output_files++; + output_files[nb_output_files++] = oc; strcpy(oc->filename, filename); - if (!(oc->format->flags & AVFMT_NOFILE)) { + + /* check filename in case of an image number is expected */ + if (oc->oformat->flags & AVFMT_NEEDNUMBER) { + if (filename_number_test(oc->filename) < 0) { + print_error(oc->filename, AVERROR_NUMEXPECTED); + exit(1); + } + } + + if (!(oc->oformat->flags & AVFMT_NOFILE)) { /* test if it already exists to avoid loosing precious files */ if (!file_overwrite && (strchr(filename, ':') == NULL || @@ -2013,11 +2177,109 @@ void opt_output_file(const char *filename) } /* reset some options */ - file_format = NULL; + file_oformat = NULL; + file_iformat = 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 */ +void prepare_grab(void) +{ + int has_video, has_audio, i, j; + AVFormatContext *oc; + AVFormatContext *ic; + AVFormatParameters ap1, *ap = &ap1; + + /* see if audio/video inputs are needed */ + has_video = 0; + has_audio = 0; + memset(ap, 0, sizeof(*ap)); + for(j=0;jnb_streams;i++) { + AVCodecContext *enc = &oc->streams[i]->codec; + switch(enc->codec_type) { + case CODEC_TYPE_AUDIO: + if (enc->sample_rate > ap->sample_rate) + ap->sample_rate = enc->sample_rate; + if (enc->channels > ap->channels) + ap->channels = enc->channels; + has_audio = 1; + break; + case CODEC_TYPE_VIDEO: + if (enc->width > ap->width) + ap->width = enc->width; + if (enc->height > ap->height) + ap->height = enc->height; + if (enc->frame_rate > ap->frame_rate) + ap->frame_rate = enc->frame_rate; + has_video = 1; + break; + default: + av_abort(); + } + } + } + + if (has_video == 0 && has_audio == 0) { + fprintf(stderr, "Output file must have at least one audio or video stream\n"); + exit(1); + } + + if (has_video) { + AVInputFormat *fmt1; + fmt1 = av_find_input_format("video_grab_device"); + if (av_open_input_file(&ic, "", fmt1, 0, ap) < 0) { + fprintf(stderr, "Could not find video grab device\n"); + exit(1); + } + /* by now video grab has one stream */ + ic->streams[0]->r_frame_rate = ap->frame_rate; + input_files[nb_input_files] = ic; + dump_format(ic, nb_input_files, v4l_device, 0); + nb_input_files++; + } + if (has_audio) { + AVInputFormat *fmt1; + fmt1 = av_find_input_format("audio_device"); + if (av_open_input_file(&ic, "", fmt1, 0, ap) < 0) { + fprintf(stderr, "Could not find audio grab device\n"); + exit(1); + } + input_files[nb_input_files] = ic; + dump_format(ic, nb_input_files, audio_device, 0); + nb_input_files++; + } +} + +/* open the necessary output devices for playing */ +void prepare_play(void) +{ + file_iformat = NULL; + file_oformat = guess_format("audio_device", NULL, NULL); + if (!file_oformat) { + fprintf(stderr, "Could not find audio device\n"); + exit(1); + } + + opt_output_file(audio_device); +} + +/* same option as mencoder */ +void opt_pass(const char *pass_str) +{ + int pass; + pass = atoi(pass_str); + if (pass != 1 && pass != 2) { + fprintf(stderr, "pass number can be only 1 or 2\n"); + exit(1); + } + do_pass = pass; } #ifndef CONFIG_WIN32 @@ -2031,28 +2293,36 @@ INT64 getutime(void) #else INT64 getutime(void) { - return gettime(); + return av_gettime(); } #endif +extern int ffm_nopts; + +void opt_bitexact(void) +{ + avcodec_set_bit_exact(); + /* disable generate of real time pts in ffm (need to be supressed anyway) */ + ffm_nopts = 1; +} + void show_formats(void) { - AVFormat *f; + AVInputFormat *ifmt; + AVOutputFormat *ofmt; URLProtocol *up; AVCodec *p; const char **pp; printf("File formats:\n"); printf(" Encoding:"); - for(f = first_format; f != NULL; f = f->next) { - if (f->write_header) - printf(" %s", f->name); + for(ofmt = first_oformat; ofmt != NULL; ofmt = ofmt->next) { + printf(" %s", ofmt->name); } printf("\n"); printf(" Decoding:"); - for(f = first_format; f != NULL; f = f->next) { - if (f->read_header) - printf(" %s", f->name); + for(ifmt = first_iformat; ifmt != NULL; ifmt = ifmt->next) { + printf(" %s", ifmt->name); } printf("\n"); @@ -2081,11 +2351,11 @@ void show_formats(void) pp = motion_str; while (*pp) { printf(" %s", *pp); - if ((pp - motion_str) == ME_ZERO) + if ((pp - motion_str + 1) == ME_ZERO) printf("(fastest)"); - else if ((pp - motion_str) == ME_FULL) + else if ((pp - motion_str + 1) == ME_FULL) printf("(slowest)"); - else if ((pp - motion_str) == ME_LOG) + else if ((pp - motion_str + 1) == ME_EPZS) printf("(default)"); pp++; } @@ -2095,13 +2365,24 @@ void show_formats(void) void show_help(void) { + const char *prog; const OptionDef *po; int i, expert; + + prog = do_play ? "ffplay" : "ffmpeg"; - printf("ffmpeg version " FFMPEG_VERSION ", Copyright (c) 2000,2001 Gerard Lantau\n" - "usage: ffmpeg [[options] -i input_file]... {[options] outfile}...\n" - "Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder\n" - "\n" + printf("%s version " FFMPEG_VERSION ", Copyright (c) 2000, 2001, 2002 Fabrice Bellard\n", + prog); + + if (!do_play) { + printf("usage: ffmpeg [[options] -i input_file]... {[options] outfile}...\n" + "Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder\n"); + } else { + printf("usage: ffplay [options] input_file...\n" + "Simple audio player\n"); + } + + printf("\n" "Main options are:\n"); for(i=0;i<2;i++) { if (i == 1) @@ -2136,20 +2417,50 @@ 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" }, + { "pass", HAS_ARG, {(void*)&opt_pass}, "select the pass number (1 or 2)", "n" }, + { "passlogfile", HAS_ARG | OPT_STRING, {(void*)&pass_logfilename}, "select two pass log file name", "file" }, /* video options */ { "b", HAS_ARG, {(void*)opt_video_bitrate}, "set video bitrate (in kbit/s)", "bitrate" }, { "r", HAS_ARG, {(void*)opt_frame_rate}, "set frame rate (in Hz)", "rate" }, { "s", HAS_ARG, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" }, + { "croptop", HAS_ARG, {(void*)opt_frame_crop_top}, "set top crop band size (in pixels)", "size" }, + { "cropbottom", HAS_ARG, {(void*)opt_frame_crop_bottom}, "set bottom crop band size (in pixels)", "size" }, + { "cropleft", HAS_ARG, {(void*)opt_frame_crop_left}, "set left crop band size (in pixels)", "size" }, + { "cropright", HAS_ARG, {(void*)opt_frame_crop_right}, "set right crop band size (in pixels)", "size" }, { "g", HAS_ARG | OPT_EXPERT, {(void*)opt_gop_size}, "set the group of picture size", "gop_size" }, { "intra", OPT_BOOL | OPT_EXPERT, {(void*)&intra_only}, "use only intra frames"}, { "vn", OPT_BOOL, {(void*)&video_disable}, "disable video" }, { "qscale", HAS_ARG | OPT_EXPERT, {(void*)opt_qscale}, "use fixed video quantiser scale (VBR)", "q" }, -#ifdef CONFIG_GRAB - { "vd", HAS_ARG | OPT_EXPERT, {(void*)opt_video_device}, "set video device", "device" }, -#endif - { "vcodec", HAS_ARG | OPT_EXPERT, {(void*)opt_video_codec}, "force video codec", "codec" }, + { "qmin", HAS_ARG | OPT_EXPERT, {(void*)opt_qmin}, "min video quantiser scale (VBR)", "q" }, + { "qmax", HAS_ARG | OPT_EXPERT, {(void*)opt_qmax}, "max video quantiser scale (VBR)", "q" }, + { "qdiff", HAS_ARG | OPT_EXPERT, {(void*)opt_qdiff}, "max difference between the quantiser scale (VBR)", "q" }, + { "qblur", HAS_ARG | OPT_EXPERT, {(void*)opt_qblur}, "video quantiser scale blur (VBR)", "blur" }, + { "qcomp", HAS_ARG | OPT_EXPERT, {(void*)opt_qcomp}, "video quantiser scale compression (VBR)", "compression" }, + { "rc_init_cplx", HAS_ARG | OPT_EXPERT, {(void*)opt_rc_initial_cplx}, "initial complexity for 1-pass encoding", "complexity" }, + { "b_qfactor", HAS_ARG | OPT_EXPERT, {(void*)opt_b_qfactor}, "qp factor between p and b frames", "factor" }, + { "i_qfactor", HAS_ARG | OPT_EXPERT, {(void*)opt_i_qfactor}, "qp factor between p and i frames", "factor" }, + { "b_qoffset", HAS_ARG | OPT_EXPERT, {(void*)opt_b_qoffset}, "qp offset between p and b frames", "offset" }, + { "i_qoffset", HAS_ARG | OPT_EXPERT, {(void*)opt_i_qoffset}, "qp offset between p and i frames", "offset" }, + { "rc_eq", HAS_ARG | OPT_EXPERT, {(void*)opt_video_rc_eq}, "", "equation" }, + { "rc_override", HAS_ARG | OPT_EXPERT, {(void*)opt_video_rc_override_string}, "Rate control override", "qualities for specific intervals" }, + { "bt", HAS_ARG, {(void*)opt_video_bitrate_tolerance}, "set video bitrate tolerance (in kbit/s)", "tolerance" }, + { "maxrate", HAS_ARG, {(void*)opt_video_bitrate_max}, "set max video bitrate tolerance (in kbit/s)", "bitrate" }, + { "minrate", HAS_ARG, {(void*)opt_video_bitrate_min}, "set min video bitrate tolerance (in kbit/s)", "bitrate" }, + { "bufsize", HAS_ARG, {(void*)opt_video_buffer_size}, "set ratecontrol buffere size (in kbit)", "size" }, + { "vd", HAS_ARG | OPT_EXPERT, {(void*)opt_video_device}, "set video grab device", "device" }, + { "vcodec", HAS_ARG | OPT_EXPERT, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" }, { "me", HAS_ARG | OPT_EXPERT, {(void*)opt_motion_estimation}, "set motion estimation method", "method" }, + { "dct_algo", HAS_ARG | OPT_EXPERT, {(void*)opt_dct_algo}, "set dct algo", "algo" }, + { "idct_algo", HAS_ARG | OPT_EXPERT, {(void*)opt_idct_algo}, "set idct algo", "algo" }, + { "er", HAS_ARG | OPT_EXPERT, {(void*)opt_error_resilience}, "set error resilience", "" }, + { "ec", HAS_ARG | OPT_EXPERT, {(void*)opt_error_resilience}, "set error concealment", "" }, + { "bf", HAS_ARG | OPT_EXPERT, {(void*)opt_b_frames}, "use 'frames' B frames (only MPEG-4)", "frames" }, + { "hq", OPT_BOOL | OPT_EXPERT, {(void*)&use_hq}, "activate high quality settings" }, + { "4mv", OPT_BOOL | OPT_EXPERT, {(void*)&use_4mv}, "use four motion vector by macroblock (only MPEG-4)" }, + { "part", OPT_BOOL | OPT_EXPERT, {(void*)&use_part}, "use data partitioning (only MPEG-4)" }, + { "bug", HAS_ARG | OPT_EXPERT, {(void*)opt_workaround_bugs}, "workaround not auto detected encoder bugs", "param" }, + { "ps", HAS_ARG | OPT_EXPERT, {(void*)opt_packet_size}, "packet size", "size in bits" }, { "sameq", OPT_BOOL, {(void*)&same_quality}, "use same video quality as source (implies VBR)" }, /* audio options */ @@ -2157,15 +2468,17 @@ const OptionDef options[] = { { "ar", HAS_ARG, {(void*)opt_audio_rate}, "set audio sampling rate (in Hz)", "rate" }, { "ac", HAS_ARG, {(void*)opt_audio_channels}, "set number of audio channels", "channels" }, { "an", OPT_BOOL, {(void*)&audio_disable}, "disable audio" }, -#ifdef CONFIG_GRAB { "ad", HAS_ARG | OPT_EXPERT, {(void*)opt_audio_device}, "set audio device", "device" }, -#endif - { "acodec", HAS_ARG | OPT_EXPERT, {(void*)opt_audio_codec}, "force audio codec", "codec" }, + { "acodec", HAS_ARG | OPT_EXPERT, {(void*)opt_audio_codec}, "force audio codec ('copy' to copy stream)", "codec" }, { "deinterlace", OPT_BOOL | OPT_EXPERT, {(void*)&do_deinterlace}, "deinterlace pictures" }, { "benchmark", OPT_BOOL | OPT_EXPERT, {(void*)&do_benchmark}, "add timings for benchmarking" }, - + { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump}, + "dump each input packet" }, + { "psnr", OPT_BOOL | OPT_EXPERT, {(void*)&do_psnr}, "calculate PSNR of compressed frames" }, + { "vstats", OPT_BOOL | OPT_EXPERT, {(void*)&do_vstats}, "dump video coding statistics to file" }, + { "bitexact", OPT_EXPERT, {(void*)opt_bitexact}, "only use bit exact algorithms (for codec testing)" }, { NULL, }, }; @@ -2174,12 +2487,19 @@ int main(int argc, char **argv) int optindex, i; const char *opt, *arg; const OptionDef *po; + INT64 ti; - register_all(); + av_register_all(); + + /* detect if invoked as player */ + i = strlen(argv[0]); + if (i >= 6 && !strcmp(argv[0] + i - 6, "ffplay")) + do_play = 1; if (argc <= 1) show_help(); - + + /* parse options */ optindex = 1; while (optindex < argc) { opt = argv[optindex++]; @@ -2208,46 +2528,49 @@ int main(int argc, char **argv) po->u.func_arg(arg); } } else { - opt_output_file(opt); + if (!do_play) { + opt_output_file(opt); + } else { + opt_input_file(opt); + } } } - if (nb_input_files == 0) { -#ifdef CONFIG_GRAB - if (nb_output_files != 1) { - fprintf(stderr, "Only one output file supported when grabbing\n"); - exit(1); - } - av_grab(output_files[0]); -#else - fprintf(stderr, "Must supply at least one input file\n"); -#endif - } else { - INT64 ti; - + if (!do_play) { + /* file converter / grab */ if (nb_output_files <= 0) { fprintf(stderr, "Must supply at least one output file\n"); exit(1); } - ti = getutime(); - av_encode(output_files, nb_output_files, input_files, nb_input_files, - stream_maps, nb_stream_maps); - ti = getutime() - ti; - if (do_benchmark) { - printf("bench: utime=%0.3fs\n", ti / 1000000.0); + + if (nb_input_files == 0) { + prepare_grab(); } + } else { + /* player */ + if (nb_input_files <= 0) { + fprintf(stderr, "Must supply at least one input file\n"); + exit(1); + } + prepare_play(); + } + + ti = getutime(); + av_encode(output_files, nb_output_files, input_files, nb_input_files, + stream_maps, nb_stream_maps); + ti = getutime() - ti; + if (do_benchmark) { + printf("bench: utime=%0.3fs\n", ti / 1000000.0); } /* close files */ for(i=0;iformat->flags & AVFMT_NOFILE)) + if (!(output_files[i]->oformat->flags & AVFMT_NOFILE)) url_fclose(&output_files[i]->pb); } - for(i=0;iformat->flags & AVFMT_NOFILE)) - url_fclose(&input_files[i]->pb); - } + for(i=0;i