/*
* 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"
#include <sys/ioctl.h>
#include <sys/time.h>
#include <termios.h>
-#include <time.h>
#include <sys/resource.h>
-#include <ctype.h>
#endif
+#include <time.h>
+#include <ctype.h>
#define MAXINT64 INT64_C(0x7fffffffffffffff)
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_tolerance = 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 = 3;
-static int video_qmax = 15;
+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;
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;
int audio_resample;
ReSampleContext *resample; /* for audio resampling */
FifoBuffer fifo; /* for compression: one audio fifo per codec */
+ FILE *logfile;
} AVOutputStream;
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 {
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
tcsetattr (0, TCSANOW, &tty);
atexit(term_exit);
+#ifdef CONFIG_BEOS_NETSERVER
+ fcntl(0, F_SETFL, fcntl(0, F_GETFL) | O_NONBLOCK);
+#endif
}
/* read a key without blocking */
static int read_key(void)
{
- struct timeval tv;
- int n;
+ int n = 1;
unsigned char ch;
+#ifndef CONFIG_BEOS_NETSERVER
+ struct timeval tv;
fd_set rfds;
FD_ZERO(&rfds);
tv.tv_sec = 0;
tv.tv_usec = 0;
n = select(1, &rfds, NULL, NULL, &tv);
+#endif
if (n > 0) {
- if (read(0, &ch, 1) == 1)
+ n = read(0, &ch, 1);
+ if (n == 1)
return ch;
+
+ return n;
}
return -1;
}
static int read_key(void)
{
- return -1;
+ return 0;
}
#endif
int read_ffserver_streams(AVFormatContext *s, const char *filename)
{
- int i;
+ int i, err;
AVFormatContext *ic;
- ic = av_open_input_file(filename, NULL, FFM_PACKET_SIZE, NULL);
- 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;i<ic->nb_streams;i++) {
&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, 0);
+ av_write_frame(s, ost->index, audio_out, ret);
}
} else {
/* output a pcm frame */
}
ret = avcodec_encode_audio(enc, audio_out, size_out,
(short *)buftmp);
- s->format->write_packet(s, ost->index, audio_out, ret, 0);
+ av_write_frame(s, ost->index, audio_out, ret);
}
}
switch(pix_fmt) {
case PIX_FMT_YUV420P:
size = avpicture_get_size(pix_fmt, w, h);
- buf = malloc(size);
+ buf = av_malloc(size);
if (!buf)
return;
dest = buf;
break;
case PIX_FMT_YUV422P:
size = (w * h) * 2;
- buf = malloc(size);
+ buf = av_malloc(size);
if (!buf)
return;
dest = buf;
break;
case PIX_FMT_YUV444P:
size = (w * h) * 3;
- buf = malloc(size);
+ buf = av_malloc(size);
if (!buf)
return;
dest = buf;
break;
case PIX_FMT_YUV422:
size = (w * h) * 2;
- buf = malloc(size);
+ buf = av_malloc(size);
if (!buf)
return;
dest = buf;
case PIX_FMT_RGB24:
case PIX_FMT_BGR24:
size = (w * h) * 3;
- buf = malloc(size);
+ buf = av_malloc(size);
if (!buf)
return;
dest = buf;
default:
return;
}
- s->format->write_packet(s, index, buf, size, 0);
- 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,
- int *frame_size)
+ 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 */
/* create temporary picture */
size = avpicture_get_size(dec->pix_fmt, dec->width, dec->height);
- buf1 = malloc(size);
+ buf1 = av_malloc(size);
if (!buf1)
return;
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;
}
/* 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;
} else {
picture = pict;
}
-
/* duplicates frame if needed */
/* XXX: pb because no interleaving */
- for(i=0;i<nb;i++) {
+ for(i=0;i<nb_frames;i++) {
if (enc->codec_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, 0);
+ //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);
}
-static void do_video_stats(AVOutputStream *ost,
- AVInputStream *ist,
- int frame_size)
+static void do_video_stats(AVFormatContext *os, AVOutputStream *ost,
+ int frame_size)
{
static FILE *fvstats=NULL;
static INT64 total_size = 0;
- struct tm *today;
- time_t today2;
char filename[40];
+ time_t today2;
+ struct tm *today;
AVCodecContext *enc;
int frame_number;
INT64 ti;
enc = &ost->st->codec;
total_size += frame_size;
if (enc->codec_type == CODEC_TYPE_VIDEO) {
- frame_number = ist->frame_number;
+ 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 min pts value */
- if (!ist->discard && ist->pts < ti) {
- ti = ist->pts;
- }
- ti1 = (double)ti / 1000000.0;
+ /* compute pts value */
+ ti1 = (double)ost->st->pts.val * os->pts_num / os->pts_den;
if (ti1 < 0.01)
ti1 = 0.01;
(double)total_size / 1024, ti1, bitrate, avg_bitrate);
fprintf(fvstats,"type= %s\n", enc->key_frame == 1 ? "I" : "P");
}
-
-
-
}
-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<size;i+=16) {
- len = size - i;
- if (len > 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<len;j++) {
- c = buf[i+j];
- if (c < ' ' || c > '~')
- c = '.';
- printf("%c", c);
+
+ oc = output_files[0];
+
+ total_size = url_ftell(&oc->pb);
+
+ buf[0] = '\0';
+ ti1 = 1e10;
+ vid = 0;
+ for(i=0;i<nb_ostreams;i++) {
+ ost = ost_table[i];
+ os = output_files[ost->file_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);
}
}
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;i<nb_input_files;i++) {
is = input_files[i];
file_table[i].ist_index = j;
+ file_table[i].nb_streams = is->nb_streams;
j += is->nb_streams;
}
nb_istreams = j;
}
}
- /* dump the stream mapping */
- fprintf(stderr, "Stream mapping:\n");
- for(i=0;i<nb_ostreams;i++) {
- ost = ost_table[i];
- fprintf(stderr, " Stream #%d.%d -> #%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;i<nb_ostreams;i++) {
ost = ost_table[i];
codec = &ost->st->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 */
- /* use the same frame size */
- codec->frame_size = icodec->frame_size;
- //codec->frame_size = 8*icodec->sample_rate*icodec->frame_size/
- // icodec->bit_rate;
- //fprintf(stderr,"\nFrame size: %d", codec->frame_size);
- } 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;
icodec->codec_id == CODEC_ID_AC3) {
/* Special case for 5:1 AC3 input */
/* and mono or stereo output */
- ost->audio_resample = 0;
+ /* 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 {
}
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;
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;
}
}
+ /* dump the file output parameters - cannot be done before in case
+ of stream copy */
+ for(i=0;i<nb_output_files;i++) {
+ dump_format(output_files[i], i, output_files[i]->filename, 1);
+ }
+
+ /* dump the stream mapping */
+ fprintf(stderr, "Stream mapping:\n");
+ for(i=0;i<nb_ostreams;i++) {
+ ost = ost_table[i];
+ fprintf(stderr, " Stream #%d.%d -> #%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;i<nb_ostreams;i++) {
ost = ost_table[i];
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;i<nb_istreams;i++) {
ist = ist_table[i];
- ist->pts = 0;
- ist->frame_number = 0;
}
/* compute buffer size max (should use a complete heuristic) */
/* open files and write file headers */
for(i=0;i<nb_output_files;i++) {
os = output_files[i];
- if (os->format->write_header(os) < 0) {
+ 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;
#endif
term_init();
- start_time = gettime();
- min_pts = 0;
+ stream_no_data = 0;
+ key = -1;
+
for(;;) {
int file_index, ist_index;
AVPacket pkt;
int data_size, got_picture;
AVPicture picture;
short samples[AVCODEC_MAX_AUDIO_FRAME_SIZE / 2];
-
+ double pts_min;
+
redo:
/* if 'q' pressed, exits */
- if (read_key() == 'q')
- break;
+ if (key) {
+ /* read_key() returns 0 on EOF */
+ key = read_key();
+ if (key == 'q')
+ break;
+ }
- /* select the input file with the smallest pts */
+ /* select the stream that we must read now by looking at the
+ smallest output pts */
file_index = -1;
- min_pts = MAXINT64;
- for(i=0;i<nb_istreams;i++) {
- ist = ist_table[i];
- if (!ist->discard && !file_table[ist->file_index].eof_reached && ist->pts < min_pts) {
- min_pts = ist->pts;
+ pts_min = 1e10;
+ for(i=0;i<nb_ostreams;i++) {
+ double pts;
+ ost = ost_table[i];
+ os = output_files[ost->file_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;
if (do_hex_dump) {
printf("stream #%d, size=%d:\n", pkt.stream_index, pkt.size);
- hex_dump(pkt.data, 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:
/* XXX: could avoid copy if PCM 16 bits with same
ptr, len);
if (ret < 0)
goto fail_decode;
- if (data_size == 0) {
+ /* 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;
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,
len -= ret;
continue;
}
+
}
break;
default:
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;i<nb_ostreams;i++) {
int frame_size;
+
ost = ost_table[i];
if (ost->source_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, &frame_size);
- if (do_vstats)
- do_video_stats(ost, ist, frame_size);
+ /* find an audio stream for synchro */
+ {
+ int i;
+ AVOutputStream *audio_sync, *ost1;
+ audio_sync = NULL;
+ for(i=0;i<nb_ostreams;i++) {
+ ost1 = ost_table[i];
+ if (ost1->file_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 */
/* force the input stream PTS */
- os->format->write_packet(os, ost->index, data_buf, data_size, pkt.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;i<nb_ostreams;i++) {
- ost = ost_table[i];
- enc = &ost->st->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);
- if (do_psnr)
- sprintf(buf + strlen(buf), "PSNR=%6.2f ", enc->psnr_y);
- vid = 1;
- }
- /* compute min pts value */
- if (!ist->discard && ist->pts < ti) {
- ti = ist->pts;
- }
- }
-
- ti1 = (double)ti / 1000000.0;
- 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 \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;i<nb_ostreams;i++) {
- ost = ost_table[i];
- enc = &ost->st->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);
- if (do_psnr)
- sprintf(buf + strlen(buf), "PSNR=%6.2f ", enc->psnr_y);
- vid = 1;
- }
- /* compute min pts value */
- if (!ist->discard && ist->pts < ti) {
- ti = ist->pts;
- }
- }
-
- ti1 = ti / 1000000.0;
- 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 \n", buf);
- }
+ print_report(output_files, ost_table, nb_ostreams, 1);
+
/* close each encoder */
for(i=0;i<nb_ostreams;i++) {
ost = ost_table[i];
if (ost->encoding_needed) {
+ av_freep(&ost->st->codec.stats_in);
avcodec_close(&ost->st->codec);
}
}
/* write the trailer if needed and close file */
for(i=0;i<nb_output_files;i++) {
os = output_files[i];
- os->format->write_trailer(os);
+ av_write_trailer(os);
}
/* finished ! */
ret = 0;
fail1:
- free(file_table);
+ av_free(file_table);
if (ist_table) {
for(i=0;i<nb_istreams;i++) {
ist = ist_table[i];
- if (ist) {
- free(ist);
- }
+ av_free(ist);
}
- free(ist_table);
+ av_free(ist_table);
}
if (ost_table) {
for(i=0;i<nb_ostreams;i++) {
ost = ost_table[i];
if (ost) {
- if (ost->pict_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:
{
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)
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);
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);
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)
{
audio_bit_rate = atoi(arg) * 1000;
audio_channels = atoi(arg);
}
-#ifdef CONFIG_GRAB
void opt_video_device(const char *arg)
{
v4l_device = strdup(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;
+ }
}
}
{
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;
+ }
}
}
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)
recording_time = parse_date(arg, 1);
}
-/* return the number of packet read to find the codec parameters */
-int find_codec_parameters(AVFormatContext *ic)
-{
- 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;i<ic->nb_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;i<ic->nb_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;i<ic->nb_streams;i++) {
- st = ic->streams[i];
- avcodec_close(&st->codec);
- }
- }
- return ret;
-}
-
-int filename_number_test(const char *filename)
+void print_error(const char *filename, int err)
{
- char buf[1024];
-
- if (get_frame_filename(buf, sizeof(buf), filename, 1) < 0) {
+ 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);
- return -1;
- } else {
- return 0;
+ 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;
}
}
{
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;
-
- /* check filename in case of an image number is expected */
- if (ic->format->flags & AVFMT_NEEDNUMBER) {
- if (filename_number_test(ic->filename) < 0)
- exit(1);
- }
-
- 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);
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();
}
}
/* 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)
case CODEC_TYPE_VIDEO:
has_video = 1;
break;
+ default:
+ av_abort();
}
}
}
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 */
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 */
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->bit_rate_tolerance = video_bit_rate_tolerance;
- 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;
- }
+ if (use_hq) {
+ video_enc->flags |= CODEC_FLAG_HQ;
+ }
- 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_4mv) {
- video_enc->flags |= CODEC_FLAG_HQ;
- video_enc->flags |= CODEC_FLAG_4MV;
- }
- 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;
+ if(use_part)
+ video_enc->flags |= CODEC_FLAG_PART;
+
- if (do_psnr)
- video_enc->get_psnr = 1;
- else
- video_enc->get_psnr = 0;
+ 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;
+ }
- video_enc->me_method = me_method;
+ if (do_psnr)
+ video_enc->get_psnr = 1;
+ else
+ video_enc->get_psnr = 0;
- /* 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;
- }
+ 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++;
}
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;
- /* 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;
+ 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++;
}
}
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);
/* check filename in case of an image number is expected */
- if (oc->format->flags & AVFMT_NEEDNUMBER) {
- if (filename_number_test(oc->filename) < 0)
+ if (oc->oformat->flags & AVFMT_NEEDNUMBER) {
+ if (filename_number_test(oc->filename) < 0) {
+ print_error(oc->filename, AVERROR_NUMEXPECTED);
exit(1);
+ }
}
- if (!(oc->format->flags & AVFMT_NOFILE)) {
+ if (!(oc->oformat->flags & AVFMT_NOFILE)) {
/* test if it already exists to avoid loosing precious files */
if (!file_overwrite &&
(strchr(filename, ':') == NULL ||
}
/* 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;
}
-#ifdef CONFIG_GRAB
-
/* prepare dummy protocols for grab */
void prepare_grab(void)
{
ap->frame_rate = enc->frame_rate;
has_video = 1;
break;
+ default:
+ av_abort();
}
}
}
}
if (has_video) {
- ic = av_open_input_file("", "video_grab_device", 0, ap);
- if (!ic) {
- fprintf(stderr, "Could not open video grab device\n");
+ 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) {
- ic = av_open_input_file("", "audio_device", 0, ap);
- if (!ic) {
- fprintf(stderr, "Could not open audio grab device\n");
+ 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;
}
}
-#else
-
-void prepare_grab(void)
-{
- fprintf(stderr, "Must supply at least one input file\n");
- exit(1);
-}
-
-#endif
-
/* open the necessary output devices for playing */
void prepare_play(void)
{
-#ifndef __BEOS__
- file_format = guess_format("audio_device", NULL, NULL);
- if (!file_format) {
+ 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);
-#endif
}
+/* 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
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");
prog = do_play ? "ffplay" : "ffmpeg";
- printf("%s version " FFMPEG_VERSION ", Copyright (c) 2000, 2001 Gerard Lantau\n",
+ printf("%s version " FFMPEG_VERSION ", Copyright (c) 2000, 2001, 2002 Fabrice Bellard\n",
prog);
if (!do_play) {
{ "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" },
{ "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" },
-#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" },
+ { "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 */
{ "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},
"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, },
};
const OptionDef *po;
INT64 ti;
- register_all();
+ av_register_all();
/* detect if invoked as player */
i = strlen(argv[0]);
/* close files */
for(i=0;i<nb_output_files;i++) {
- if (!(output_files[i]->format->flags & AVFMT_NOFILE))
+ if (!(output_files[i]->oformat->flags & AVFMT_NOFILE))
url_fclose(&output_files[i]->pb);
}
- for(i=0;i<nb_input_files;i++) {
- if (!(input_files[i]->format->flags & AVFMT_NOFILE))
- url_fclose(&input_files[i]->pb);
- }
+ for(i=0;i<nb_input_files;i++)
+ av_close_input_file(input_files[i]);
return 0;
}