summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c432
1 files changed, 216 insertions, 216 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 3d3b65b72e..51e7189b70 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1,5 +1,5 @@
/*
- * FFmpeg main
+ * FFmpeg main
* Copyright (c) 2000-2003 Fabrice Bellard
*
* This library is free software; you can redistribute it and/or
@@ -269,13 +269,13 @@ typedef struct AVOutputStream {
int video_crop; /* video_resample and video_crop are mutually exclusive */
int topBand; /* cropping area sizes */
int leftBand;
-
+
int video_pad; /* video_resample and video_pad are mutually exclusive */
int padtop; /* padding area sizes */
int padbottom;
int padleft;
int padright;
-
+
/* audio only */
int audio_resample;
ReSampleContext *resample; /* for audio resampling */
@@ -342,7 +342,7 @@ static void term_init(void)
tty.c_cflag |= CS8;
tty.c_cc[VMIN] = 1;
tty.c_cc[VTIME] = 0;
-
+
tcsetattr (0, TCSANOW, &tty);
signal(SIGINT , sigterm_handler); /* Interrupt (ANSI). */
@@ -441,8 +441,8 @@ get_sync_ipts(const AVOutputStream *ost)
#define MAX_AUDIO_PACKET_SIZE (128 * 1024)
-static void do_audio_out(AVFormatContext *s,
- AVOutputStream *ost,
+static void do_audio_out(AVFormatContext *s,
+ AVOutputStream *ost,
AVInputStream *ist,
unsigned char *buf, int size)
{
@@ -463,7 +463,7 @@ static void do_audio_out(AVFormatContext *s,
return; /* Should signal an error ! */
if(audio_sync_method){
- double delta = get_sync_ipts(ost) * enc->sample_rate - ost->sync_opts
+ double delta = get_sync_ipts(ost) * enc->sample_rate - ost->sync_opts
- fifo_size(&ost->fifo, ost->fifo.rptr)/(ost->st->codec->channels * 2);
double idelta= delta*ist->st->codec->sample_rate / enc->sample_rate;
int byte_delta= ((int)idelta)*2*ist->st->codec->channels;
@@ -504,14 +504,14 @@ static void do_audio_out(AVFormatContext *s,
// fprintf(stderr, "drift:%f len:%d opts:%lld ipts:%lld fifo:%d\n", delta, -1, ost->sync_opts, (int64_t)(get_sync_ipts(ost) * enc->sample_rate), fifo_size(&ost->fifo, ost->fifo.rptr)/(ost->st->codec->channels * 2));
av_resample_compensate(*(struct AVResampleContext**)ost->resample, comp, enc->sample_rate);
}
- }
+ }
}else
ost->sync_opts= lrintf(get_sync_ipts(ost) * enc->sample_rate)
- fifo_size(&ost->fifo, ost->fifo.rptr)/(ost->st->codec->channels * 2); //FIXME wrong
if (ost->audio_resample) {
buftmp = audio_buf;
- size_out = audio_resample(ost->resample,
+ size_out = audio_resample(ost->resample,
(short *)buftmp, (short *)buf,
size / (ist->st->codec->channels * 2));
size_out = size_out * enc->channels * 2;
@@ -523,17 +523,17 @@ static void do_audio_out(AVFormatContext *s,
/* now encode as many frames as possible */
if (enc->frame_size > 1) {
/* output resampled raw samples */
- fifo_write(&ost->fifo, buftmp, size_out,
+ fifo_write(&ost->fifo, buftmp, size_out,
&ost->fifo.wptr);
frame_bytes = enc->frame_size * 2 * enc->channels;
-
- while (fifo_read(&ost->fifo, audio_buf, frame_bytes,
+
+ while (fifo_read(&ost->fifo, audio_buf, frame_bytes,
&ost->fifo.rptr) == 0) {
AVPacket pkt;
av_init_packet(&pkt);
- ret = avcodec_encode_audio(enc, audio_out, audio_out_size,
+ ret = avcodec_encode_audio(enc, audio_out, audio_out_size,
(short *)audio_buf);
audio_size += ret;
pkt.stream_index= ost->index;
@@ -543,7 +543,7 @@ static void do_audio_out(AVFormatContext *s,
pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
pkt.flags |= PKT_FLAG_KEY;
av_interleaved_write_frame(s, &pkt);
-
+
ost->sync_opts += enc->frame_size;
}
} else {
@@ -577,7 +577,7 @@ static void do_audio_out(AVFormatContext *s,
size_out = size_out >> 1;
break;
}
- ret = avcodec_encode_audio(enc, audio_out, size_out,
+ ret = avcodec_encode_audio(enc, audio_out, size_out,
(short *)buftmp);
audio_size += ret;
pkt.stream_index= ost->index;
@@ -608,12 +608,12 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void
buf = av_malloc(size);
if (!buf)
return;
-
+
picture2 = &picture_tmp;
avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height);
if (do_deinterlace){
- if(avpicture_deinterlace(picture2, picture,
+ if(avpicture_deinterlace(picture2, picture,
dec->pix_fmt, dec->width, dec->height) < 0) {
/* if error, do not deinterlace */
av_free(buf);
@@ -621,7 +621,7 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void
picture2 = picture;
}
} else {
- if (img_convert(picture2, dec->pix_fmt, picture,
+ if (img_convert(picture2, dec->pix_fmt, picture,
dec->pix_fmt, dec->width, dec->height) < 0) {
/* if error, do not copy */
av_free(buf);
@@ -647,15 +647,15 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void
/* Expects img to be yuv420 */
static void fill_pad_region(AVPicture* img, int height, int width,
int padtop, int padbottom, int padleft, int padright, int *color) {
-
+
int i, y, shift;
uint8_t *optr;
-
+
for (i = 0; i < 3; i++) {
shift = (i == 0) ? 0 : 1;
-
+
if (padtop || padleft) {
- memset(img->data[i], color[i], (((img->linesize[i] * padtop) +
+ memset(img->data[i], color[i], (((img->linesize[i] * padtop) +
padleft) >> shift));
}
@@ -668,7 +668,7 @@ static void fill_pad_region(AVPicture* img, int height, int width,
optr += img->linesize[i];
}
}
-
+
if (padbottom || padright) {
optr = img->data[i] + (((img->linesize[i] * (height - padbottom)) - padright) >> shift);
memset(optr, color[i], (((img->linesize[i] * padbottom) + padright) >> shift));
@@ -676,8 +676,8 @@ static void fill_pad_region(AVPicture* img, int height, int width,
}
}
-static void do_subtitle_out(AVFormatContext *s,
- AVOutputStream *ost,
+static void do_subtitle_out(AVFormatContext *s,
+ AVOutputStream *ost,
AVInputStream *ist,
AVSubtitle *sub,
int64_t pts)
@@ -708,9 +708,9 @@ static void do_subtitle_out(AVFormatContext *s,
nb = 1;
for(i = 0; i < nb; i++) {
- subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out,
+ subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out,
subtitle_out_max_size, sub);
-
+
av_init_packet(&pkt);
pkt.stream_index = ost->index;
pkt.data = subtitle_out;
@@ -731,8 +731,8 @@ static void do_subtitle_out(AVFormatContext *s,
static int bit_buffer_size= 1024*256;
static uint8_t *bit_buffer= NULL;
-static void do_video_out(AVFormatContext *s,
- AVOutputStream *ost,
+static void do_video_out(AVFormatContext *s,
+ AVOutputStream *ost,
AVInputStream *ist,
AVFrame *in_picture,
int *frame_size)
@@ -743,7 +743,7 @@ static void do_video_out(AVFormatContext *s,
uint8_t *buf = NULL, *buf1 = NULL;
AVCodecContext *enc, *dec;
enum PixelFormat target_pixfmt;
-
+
avcodec_get_frame_defaults(&picture_format_temp);
avcodec_get_frame_defaults(&picture_crop_temp);
@@ -777,7 +777,7 @@ static void do_video_out(AVFormatContext *s,
ost->sync_opts= lrintf(get_sync_ipts(ost) / av_q2d(enc->time_base));
nb_frames= FFMIN(nb_frames, max_frames[CODEC_TYPE_VIDEO] - ost->frame_number);
- if (nb_frames <= 0)
+ if (nb_frames <= 0)
return;
/* convert pixel format if needed */
@@ -793,9 +793,9 @@ static void do_video_out(AVFormatContext *s,
return;
formatted_picture = &picture_format_temp;
avpicture_fill((AVPicture*)formatted_picture, buf, target_pixfmt, dec->width, dec->height);
-
- if (img_convert((AVPicture*)formatted_picture, target_pixfmt,
- (AVPicture *)in_picture, dec->pix_fmt,
+
+ if (img_convert((AVPicture*)formatted_picture, target_pixfmt,
+ (AVPicture *)in_picture, dec->pix_fmt,
dec->width, dec->height) < 0) {
if (verbose >= 0)
@@ -813,16 +813,16 @@ static void do_video_out(AVFormatContext *s,
if (ost->video_resample) {
final_picture = &ost->pict_tmp;
img_resample(ost->img_resample_ctx, (AVPicture*)final_picture, (AVPicture*)formatted_picture);
-
+
if (ost->padtop || ost->padbottom || ost->padleft || ost->padright) {
fill_pad_region((AVPicture*)final_picture, enc->height, enc->width,
ost->padtop, ost->padbottom, ost->padleft, ost->padright,
padcolor);
}
-
+
if (enc->pix_fmt != PIX_FMT_YUV420P) {
int size;
-
+
av_free(buf);
/* create temporary picture */
size = avpicture_get_size(enc->pix_fmt, enc->width, enc->height);
@@ -831,9 +831,9 @@ static void do_video_out(AVFormatContext *s,
return;
final_picture = &picture_format_temp;
avpicture_fill((AVPicture*)final_picture, buf, enc->pix_fmt, enc->width, enc->height);
-
- if (img_convert((AVPicture*)final_picture, enc->pix_fmt,
- (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P,
+
+ if (img_convert((AVPicture*)final_picture, enc->pix_fmt,
+ (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P,
enc->width, enc->height) < 0) {
if (verbose >= 0)
@@ -865,9 +865,9 @@ static void do_video_out(AVFormatContext *s,
uint8_t *optr, *iptr;
int shift = (i == 0) ? 0 : 1;
int y, yheight;
-
+
/* set offset to start writing image into */
- optr = final_picture->data[i] + (((final_picture->linesize[i] *
+ optr = final_picture->data[i] + (((final_picture->linesize[i] *
ost->padtop) + ost->padleft) >> shift);
iptr = formatted_picture->data[i];
@@ -883,7 +883,7 @@ static void do_video_out(AVFormatContext *s,
fill_pad_region((AVPicture*)final_picture, enc->height, enc->width,
ost->padtop, ost->padbottom, ost->padleft, ost->padright,
padcolor);
-
+
if (enc->pix_fmt != PIX_FMT_YUV420P) {
int size;
@@ -896,8 +896,8 @@ static void do_video_out(AVFormatContext *s,
final_picture = &picture_format_temp;
avpicture_fill((AVPicture*)final_picture, buf, enc->pix_fmt, enc->width, enc->height);
- if (img_convert((AVPicture*)final_picture, enc->pix_fmt,
- (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P,
+ if (img_convert((AVPicture*)final_picture, enc->pix_fmt,
+ (AVPicture*)&ost->pict_tmp, PIX_FMT_YUV420P,
enc->width, enc->height) < 0) {
if (verbose >= 0)
@@ -956,7 +956,7 @@ static void do_video_out(AVFormatContext *s,
big_picture.pts= ost->sync_opts;
// big_picture.pts= av_rescale(ost->sync_opts, AV_TIME_BASE*(int64_t)enc->time_base.num, enc->time_base.den);
//av_log(NULL, AV_LOG_DEBUG, "%lld -> encoder\n", ost->sync_opts);
- ret = avcodec_encode_video(enc,
+ ret = avcodec_encode_video(enc,
bit_buffer, bit_buffer_size,
&big_picture);
//enc->frame_number = enc->real_pict_num;
@@ -965,7 +965,7 @@ static void do_video_out(AVFormatContext *s,
pkt.size= ret;
if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
-/*av_log(NULL, AV_LOG_DEBUG, "encoder -> %lld/%lld\n",
+/*av_log(NULL, AV_LOG_DEBUG, "encoder -> %lld/%lld\n",
pkt.pts != AV_NOPTS_VALUE ? av_rescale(pkt.pts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1,
pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1);*/
@@ -995,7 +995,7 @@ static double psnr(double d){
return -10.0*log(d)/log(10.0);
}
-static void do_video_stats(AVFormatContext *os, AVOutputStream *ost,
+static void do_video_stats(AVFormatContext *os, AVOutputStream *ost,
int frame_size)
{
static FILE *fvstats=NULL;
@@ -1006,7 +1006,7 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost,
int frame_number;
int64_t ti;
double ti1, bitrate, avg_bitrate;
-
+
if (!fvstats) {
today2 = time(NULL);
today = localtime(&today2);
@@ -1019,7 +1019,7 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost,
exit(1);
}
}
-
+
ti = MAXINT64;
enc = ost->st->codec;
if (enc->codec_type == CODEC_TYPE_VIDEO) {
@@ -1027,18 +1027,18 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost,
fprintf(fvstats, "frame= %5d q= %2.1f ", frame_number, enc->coded_frame->quality/(float)FF_QP2LAMBDA);
if (enc->flags&CODEC_FLAG_PSNR)
fprintf(fvstats, "PSNR= %6.2f ", psnr(enc->coded_frame->error[0]/(enc->width*enc->height*255.0*255.0)));
-
+
fprintf(fvstats,"f_size= %6d ", frame_size);
/* compute pts value */
ti1 = ost->sync_opts * av_q2d(enc->time_base);
if (ti1 < 0.01)
ti1 = 0.01;
-
+
bitrate = (frame_size * 8) / av_q2d(enc->time_base) / 1000.0;
avg_bitrate = (double)(video_size * 8) / ti1 / 1000.0;
fprintf(fvstats, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ",
(double)video_size / 1024, ti1, bitrate, avg_bitrate);
- fprintf(fvstats,"type= %c\n", av_get_pict_type_char(enc->coded_frame->pict_type));
+ fprintf(fvstats,"type= %c\n", av_get_pict_type_char(enc->coded_frame->pict_type));
}
}
@@ -1054,7 +1054,7 @@ static void print_report(AVFormatContext **output_files,
int frame_number, vid, i;
double bitrate, ti1, pts;
static int64_t last_time = -1;
-
+
if (!is_last_report) {
int64_t cur_time;
/* display the report every 0.5 seconds */
@@ -1062,7 +1062,7 @@ static void print_report(AVFormatContext **output_files,
if (last_time == -1) {
last_time = cur_time;
return;
- }
+ }
if ((cur_time - last_time) < 500000)
return;
last_time = cur_time;
@@ -1072,7 +1072,7 @@ static void print_report(AVFormatContext **output_files,
oc = output_files[0];
total_size = url_ftell(&oc->pb);
-
+
buf[0] = '\0';
ti1 = 1e10;
vid = 0;
@@ -1120,24 +1120,24 @@ static void print_report(AVFormatContext **output_files,
}
if (ti1 < 0.01)
ti1 = 0.01;
-
+
if (verbose || is_last_report) {
bitrate = (double)(total_size * 8) / ti1 / 1000.0;
-
- snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
+
+ snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
"size=%8.0fkB time=%0.1f bitrate=%6.1fkbits/s",
(double)total_size / 1024, ti1, bitrate);
if (verbose > 1)
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
nb_frames_dup, nb_frames_drop);
-
+
if (verbose >= 0)
fprintf(stderr, "%s \r", buf);
fflush(stderr);
}
-
+
if (is_last_report && verbose >= 0){
int64_t raw= audio_size + video_size + extra_size;
fprintf(stderr, "\n");
@@ -1167,7 +1167,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
static short *samples= NULL;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
-
+
if(!pkt){
ist->pts= ist->next_pts; // needed for last packet if vsync=0
} else if (pkt->dts != AV_NOPTS_VALUE) { //FIXME seems redundant, as libavformat does this too
@@ -1175,7 +1175,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
} else {
// assert(ist->pts == ist->next_pts);
}
-
+
if (pkt == NULL) {
/* EOF handling */
ptr = NULL;
@@ -1194,7 +1194,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
if (ist->decoding_needed) {
switch(ist->st->codec->codec_type) {
case CODEC_TYPE_AUDIO:{
- if(pkt)
+ if(pkt)
samples= av_fast_realloc(samples, &samples_size, FFMAX(pkt->size, AVCODEC_MAX_AUDIO_FRAME_SIZE));
/* XXX: could avoid copy if PCM 16 bits with same
endianness as CPU */
@@ -1211,7 +1211,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
continue;
}
data_buf = (uint8_t *)samples;
- ist->next_pts += ((int64_t)AV_TIME_BASE/2 * data_size) /
+ ist->next_pts += ((int64_t)AV_TIME_BASE/2 * data_size) /
(ist->st->codec->sample_rate * ist->st->codec->channels);
break;}
case CODEC_TYPE_VIDEO:
@@ -1219,24 +1219,24 @@ static int output_packet(AVInputStream *ist, int ist_index,
/* XXX: allocate picture correctly */
avcodec_get_frame_defaults(&picture);
- ret = avcodec_decode_video(ist->st->codec,
+ ret = avcodec_decode_video(ist->st->codec,
&picture, &got_picture, ptr, len);
ist->st->quality= picture.quality;
- if (ret < 0)
+ if (ret < 0)
goto fail_decode;
if (!got_picture) {
/* no picture yet */
goto discard_packet;
}
if (ist->st->codec->time_base.num != 0) {
- ist->next_pts += ((int64_t)AV_TIME_BASE *
+ ist->next_pts += ((int64_t)AV_TIME_BASE *
ist->st->codec->time_base.num) /
ist->st->codec->time_base.den;
}
len = 0;
break;
case CODEC_TYPE_SUBTITLE:
- ret = avcodec_decode_subtitle(ist->st->codec,
+ ret = avcodec_decode_subtitle(ist->st->codec,
&subtitle, &got_subtitle, ptr, len);
if (ret < 0)
goto fail_decode;
@@ -1252,12 +1252,12 @@ static int output_packet(AVInputStream *ist, int ist_index,
} else {
switch(ist->st->codec->codec_type) {
case CODEC_TYPE_AUDIO:
- ist->next_pts += ((int64_t)AV_TIME_BASE * ist->st->codec->frame_size) /
+ ist->next_pts += ((int64_t)AV_TIME_BASE * ist->st->codec->frame_size) /
(ist->st->codec->sample_rate * ist->st->codec->channels);
break;
case CODEC_TYPE_VIDEO:
if (ist->st->codec->time_base.num != 0) {
- ist->next_pts += ((int64_t)AV_TIME_BASE *
+ ist->next_pts += ((int64_t)AV_TIME_BASE *
ist->st->codec->time_base.num) /
ist->st->codec->time_base.den;
}
@@ -1271,7 +1271,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
buffer_to_free = NULL;
if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO) {
- pre_process_video_frame(ist, (AVPicture *)&picture,
+ pre_process_video_frame(ist, (AVPicture *)&picture,
&buffer_to_free);
}
@@ -1312,7 +1312,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
}
}
#endif
- /* if output time reached then transcode raw format,
+ /* if output time reached then transcode raw format,
encode packets and output them */
if (start_time == 0 || ist->pts >= start_time)
for(i=0;i<nb_ostreams;i++) {
@@ -1323,9 +1323,9 @@ static int output_packet(AVInputStream *ist, int ist_index,
os = output_files[ost->file_index];
#if 0
- printf("%d: got pts=%0.3f %0.3f\n", i,
- (double)pkt->pts / AV_TIME_BASE,
- ((double)ist->pts / AV_TIME_BASE) -
+ printf("%d: got pts=%0.3f %0.3f\n", i,
+ (double)pkt->pts / AV_TIME_BASE,
+ ((double)ist->pts / AV_TIME_BASE) -
((double)ost->st->pts.val * ost->st->time_base.num / ost->st->time_base.den));
#endif
/* set the input output pts pairs */
@@ -1356,10 +1356,10 @@ static int output_packet(AVInputStream *ist, int ist_index,
/* no reencoding needed : output the packet directly */
/* force the input stream PTS */
-
+
avcodec_get_frame_defaults(&avframe);
ost->st->codec->coded_frame= &avframe;
- avframe.key_frame = pkt->flags & PKT_FLAG_KEY;
+ avframe.key_frame = pkt->flags & PKT_FLAG_KEY;
if(ost->st->codec->codec_type == CODEC_TYPE_AUDIO)
audio_size += data_size;
@@ -1409,13 +1409,13 @@ static int output_packet(AVInputStream *ist, int ist_index,
discard_packet:
if (pkt == NULL) {
/* EOF handling */
-
+
for(i=0;i<nb_ostreams;i++) {
ost = ost_table[i];
if (ost->source_index == ist_index) {
AVCodecContext *enc= ost->st->codec;
os = output_files[ost->file_index];
-
+
if(ost->st->codec->codec_type == CODEC_TYPE_AUDIO && enc->frame_size <=1)
continue;
if(ost->st->codec->codec_type == CODEC_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE))
@@ -1426,9 +1426,9 @@ static int output_packet(AVInputStream *ist, int ist_index,
AVPacket pkt;
av_init_packet(&pkt);
pkt.stream_index= ost->index;
-
+
switch(ost->st->codec->codec_type) {
- case CODEC_TYPE_AUDIO:
+ case CODEC_TYPE_AUDIO:
ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, NULL);
audio_size += ret;
pkt.flags |= PKT_FLAG_KEY;
@@ -1445,7 +1445,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
default:
ret=-1;
}
-
+
if(ret<=0)
break;
pkt.data= bit_buffer;
@@ -1458,7 +1458,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
}
}
}
-
+
return 0;
fail_decode:
return -1;
@@ -1486,7 +1486,7 @@ static int av_encode(AVFormatContext **output_files,
file_table= (AVInputFile*) av_mallocz(nb_input_files * sizeof(AVInputFile));
if (!file_table)
goto fail;
-
+
/* input stream init */
j = 0;
for(i=0;i<nb_input_files;i++) {
@@ -1500,7 +1500,7 @@ static int av_encode(AVFormatContext **output_files,
ist_table = av_mallocz(nb_istreams * sizeof(AVInputStream *));
if (!ist_table)
goto fail;
-
+
for(i=0;i<nb_istreams;i++) {
ist = av_mallocz(sizeof(AVInputStream));
if (!ist)
@@ -1540,7 +1540,7 @@ static int av_encode(AVFormatContext **output_files,
for(i=0;i<nb_stream_maps;i++) {
int fi = stream_maps[i].file_index;
int si = stream_maps[i].stream_index;
-
+
if (fi < 0 || fi > nb_input_files - 1 ||
si < 0 || si > file_table[fi].nb_streams - 1) {
fprintf(stderr,"Could not find input stream #%d.%d\n", fi, si);
@@ -1554,7 +1554,7 @@ static int av_encode(AVFormatContext **output_files,
exit(1);
}
}
-
+
ost_table = av_mallocz(sizeof(AVOutputStream *) * nb_ostreams);
if (!ost_table)
goto fail;
@@ -1564,7 +1564,7 @@ static int av_encode(AVFormatContext **output_files,
goto fail;
ost_table[i] = ost;
}
-
+
n = 0;
for(k=0;k<nb_output_files;k++) {
os = output_files[k];
@@ -1575,9 +1575,9 @@ static int av_encode(AVFormatContext **output_files,
ost->index = i;
ost->st = os->streams[i];
if (nb_stream_maps > 0) {
- ost->source_index = file_table[stream_maps[n-1].file_index].ist_index +
+ ost->source_index = file_table[stream_maps[n-1].file_index].ist_index +
stream_maps[n-1].stream_index;
-
+
/* Sanity check that the stream types match */
if (ist_table[ost->source_index]->st->codec->codec_type != ost->st->codec->codec_type) {
fprintf(stderr, "Codec type mismatch for mapping #%d.%d -> #%d.%d\n",
@@ -1585,20 +1585,20 @@ static int av_encode(AVFormatContext **output_files,
ost->file_index, ost->index);
exit(1);
}
-
+
} else {
/* get corresponding input stream index : we select the first one with the right type */
found = 0;
for(j=0;j<nb_istreams;j++) {
ist = ist_table[j];
- if (ist->discard &&
+ if (ist->discard &&
ist->st->codec->codec_type == ost->st->codec->codec_type) {
ost->source_index = j;
found = 1;
break;
}
}
-
+
if (!found) {
/* try again and reuse existing stream */
for(j=0;j<nb_istreams;j++) {
@@ -1662,7 +1662,7 @@ static int av_encode(AVFormatContext **output_files,
case CODEC_TYPE_AUDIO:
if (fifo_init(&ost->fifo, 2 * MAX_AUDIO_PACKET_SIZE))
goto fail;
-
+
if (codec->channels == icodec->channels &&
codec->sample_rate == icodec->sample_rate) {
ost->audio_resample = 0;
@@ -1680,7 +1680,7 @@ static int av_encode(AVFormatContext **output_files,
ost->audio_resample = 1;
}
} else {
- ost->audio_resample = 1;
+ ost->audio_resample = 1;
}
}
if(audio_sync_method>1)
@@ -1703,7 +1703,7 @@ static int av_encode(AVFormatContext **output_files,
frame_topBand == 0 &&
frame_bottomBand == 0 &&
frame_leftBand == 0 &&
- frame_rightBand == 0 &&
+ frame_rightBand == 0 &&
frame_padtop == 0 &&
frame_padbottom == 0 &&
frame_padleft == 0 &&
@@ -1721,7 +1721,7 @@ static int av_encode(AVFormatContext **output_files,
ost->video_crop = 1;
ost->topBand = frame_topBand;
ost->leftBand = frame_leftBand;
- } else if ((codec->width == icodec->width +
+ } else if ((codec->width == icodec->width +
(frame_padleft + frame_padright)) &&
(codec->height == icodec->height +
(frame_padtop + frame_padbottom))) {
@@ -1744,19 +1744,19 @@ static int av_encode(AVFormatContext **output_files,
codec->width, codec->height ) )
goto fail;
- ost->img_resample_ctx = img_resample_full_init(
+ ost->img_resample_ctx = img_resample_full_init(
codec->width, codec->height,
icodec->width, icodec->height,
frame_topBand, frame_bottomBand,
- frame_leftBand, frame_rightBand,
- frame_padtop, frame_padbottom,
+ frame_leftBand, frame_rightBand,
+ frame_padtop, frame_padbottom,
frame_padleft, frame_padright);
-
+
ost->padtop = frame_padtop;
ost->padleft = frame_padleft;
ost->padbottom = frame_padbottom;
ost->padright = frame_padright;
-
+
}
ost->encoding_needed = 1;
ist->decoding_needed = 1;
@@ -1770,15 +1770,15 @@ static int av_encode(AVFormatContext **output_files,
break;
}
/* two pass mode */
- if (ost->encoding_needed &&
+ if (ost->encoding_needed &&
(codec->flags & (CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2))) {
char logfilename[1024];
FILE *f;
int size;
char *logbuffer;
-
- snprintf(logfilename, sizeof(logfilename), "%s-%d.log",
- pass_logfilename ?
+
+ snprintf(logfilename, sizeof(logfilename), "%s-%d.log",
+ pass_logfilename ?
pass_logfilename : DEFAULT_PASS_LOGFILENAME, i);
if (codec->flags & CODEC_FLAG_PASS1) {
f = fopen(logfilename, "w");
@@ -1834,7 +1834,7 @@ static int av_encode(AVFormatContext **output_files,
fprintf(stderr, " Stream #%d.%d -> #%d.%d",
ist_table[ost->source_index]->file_index,
ist_table[ost->source_index]->index,
- ost->file_index,
+ ost->file_index,
ost->index);
if (ost->sync_ist != ist_table[ost->source_index])
fprintf(stderr, " [sync #%d.%d]",
@@ -1851,12 +1851,12 @@ static int av_encode(AVFormatContext **output_files,
AVCodec *codec;
codec = avcodec_find_encoder(ost->st->codec->codec_id);
if (!codec) {
- fprintf(stderr, "Unsupported codec for output stream #%d.%d\n",
+ fprintf(stderr, "Unsupported codec for output stream #%d.%d\n",
ost->file_index, ost->index);
exit(1);
}
if (avcodec_open(ost->st->codec, codec) < 0) {
- fprintf(stderr, "Error while opening codec for output stream #%d.%d - maybe incorrect parameters such as bit_rate, rate, width or height\n",
+ fprintf(stderr, "Error while opening codec for output stream #%d.%d - maybe incorrect parameters such as bit_rate, rate, width or height\n",
ost->file_index, ost->index);
exit(1);
}
@@ -1871,12 +1871,12 @@ static int av_encode(AVFormatContext **output_files,
AVCodec *codec;
codec = avcodec_find_decoder(ist->st->codec->codec_id);
if (!codec) {
- fprintf(stderr, "Unsupported codec (id=%d) for input stream #%d.%d\n",
+ fprintf(stderr, "Unsupported codec (id=%d) for input stream #%d.%d\n",
ist->st->codec->codec_id, ist->file_index, ist->index);
exit(1);
}
if (avcodec_open(ist->st->codec, codec) < 0) {
- fprintf(stderr, "Error while opening codec for input stream #%d.%d\n",
+ fprintf(stderr, "Error while opening codec for input stream #%d.%d\n",
ist->file_index, ist->index);
exit(1);
}
@@ -1891,7 +1891,7 @@ static int av_encode(AVFormatContext **output_files,
is = input_files[ist->file_index];
ist->pts = 0;
ist->next_pts = av_rescale_q(ist->st->start_time, ist->st->time_base, AV_TIME_BASE_Q);
- if(ist->st->start_time == AV_NOPTS_VALUE)
+ if(ist->st->start_time == AV_NOPTS_VALUE)
ist->next_pts=0;
if(input_files_ts_offset[ist->file_index])
ist->next_pts= AV_NOPTS_VALUE;
@@ -1919,8 +1919,8 @@ static int av_encode(AVFormatContext **output_files,
fprintf(stderr, "Invalid input file index %d map_meta_data(%d,%d)\n", in_file_index, out_file_index, in_file_index);
ret = -EINVAL;
goto fail;
- }
-
+ }
+
out_file = output_files[out_file_index];
in_file = input_files[in_file_index];
@@ -1933,7 +1933,7 @@ static int av_encode(AVFormatContext **output_files,
out_file->track = in_file->track;
strcpy(out_file->genre, in_file->genre);
}
-
+
/* open files and write file headers */
for(i=0;i<nb_output_files;i++) {
os = output_files[i];
@@ -2067,7 +2067,7 @@ static int av_encode(AVFormatContext **output_files,
discard_packet:
av_free_packet(&pkt);
-
+
/* dump report by using the output first video and audio streams */
print_report(output_files, ost_table, nb_ostreams, 0);
}
@@ -2099,7 +2099,7 @@ static int av_encode(AVFormatContext **output_files,
avcodec_close(ost->st->codec);
}
}
-
+
/* close each decoder */
for(i=0;i<nb_istreams;i++) {
ist = ist_table[i];
@@ -2109,7 +2109,7 @@ static int av_encode(AVFormatContext **output_files,
}
/* finished ! */
-
+
ret = 0;
fail1:
av_freep(&bit_buffer);
@@ -2173,7 +2173,7 @@ int file_read(const char *filename)
static void opt_image_format(const char *arg)
{
AVImageFormat *f;
-
+
for(f = first_image_format; f != NULL; f = f->next) {
if (!strcmp(arg, f->name))
break;
@@ -2269,7 +2269,7 @@ static void opt_frame_rate(const char *arg)
static void opt_frame_crop_top(const char *arg)
{
- frame_topBand = atoi(arg);
+ frame_topBand = atoi(arg);
if (frame_topBand < 0) {
fprintf(stderr, "Incorrect top crop size\n");
exit(1);
@@ -2294,7 +2294,7 @@ static void opt_frame_crop_bottom(const char *arg)
}
if ((frame_bottomBand % 2) != 0) {
fprintf(stderr, "Bottom crop size must be a multiple of 2\n");
- exit(1);
+ exit(1);
}
if ((frame_bottomBand) >= frame_height){
fprintf(stderr, "Vertical crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n");
@@ -2330,7 +2330,7 @@ static void opt_frame_crop_right(const char *arg)
}
if ((frame_rightBand % 2) != 0) {
fprintf(stderr, "Right crop size must be a multiple of 2\n");
- exit(1);
+ exit(1);
}
if ((frame_rightBand) >= frame_width){
fprintf(stderr, "Horizontal crop dimensions are outside the range of the original image.\nRemember to crop first and scale second.\n");
@@ -2373,8 +2373,8 @@ static void opt_pad_color(const char *arg) {
how colors are expressed in html tags (but without the #) */
int rgb = strtol(arg, NULL, 16);
int r,g,b;
-
- r = (rgb >> 16);
+
+ r = (rgb >> 16);
g = ((rgb >> 8) & 255);
b = (rgb & 255);
@@ -2385,7 +2385,7 @@ static void opt_pad_color(const char *arg) {
static void opt_frame_pad_top(const char *arg)
{
- frame_padtop = atoi(arg);
+ frame_padtop = atoi(arg);
if (frame_padtop < 0) {
fprintf(stderr, "Incorrect top pad size\n");
exit(1);
@@ -2398,7 +2398,7 @@ static void opt_frame_pad_top(const char *arg)
static void opt_frame_pad_bottom(const char *arg)
{
- frame_padbottom = atoi(arg);
+ frame_padbottom = atoi(arg);
if (frame_padbottom < 0) {
fprintf(stderr, "Incorrect bottom pad size\n");
exit(1);
@@ -2412,7 +2412,7 @@ static void opt_frame_pad_bottom(const char *arg)
static void opt_frame_pad_left(const char *arg)
{
- frame_padleft = atoi(arg);
+ frame_padleft = atoi(arg);
if (frame_padleft < 0) {
fprintf(stderr, "Incorrect left pad size\n");
exit(1);
@@ -2426,7 +2426,7 @@ static void opt_frame_pad_left(const char *arg)
static void opt_frame_pad_right(const char *arg)
{
- frame_padright = atoi(arg);
+ frame_padright = atoi(arg);
if (frame_padright < 0) {
fprintf(stderr, "Incorrect right pad size\n");
exit(1);
@@ -2448,7 +2448,7 @@ static void opt_frame_aspect_ratio(const char *arg)
int x = 0, y = 0;
double ar = 0;
const char *p;
-
+
p = strchr(arg, ':');
if (p) {
x = strtol(arg, (char **)&arg, 10);
@@ -2819,7 +2819,7 @@ static void opt_map_meta_data(const char *arg)
{
AVMetaDataMap *m;
const char *p;
-
+
p = arg;
m = &meta_data_maps[nb_meta_data_maps++];
@@ -2860,7 +2860,7 @@ static void opt_input_file(const char *filename)
if (!strcmp(filename, "-"))
filename = "pipe:";
- using_stdin |= !strncmp(filename, "pipe:", 5) ||
+ using_stdin |= !strncmp(filename, "pipe:", 5) ||
!strcmp( filename, "/dev/stdin" );
/* get default parameters from command line */
@@ -2890,7 +2890,7 @@ static void opt_input_file(const char *filename)
if(genpts)
ic->flags|= AVFMT_FLAG_GENPTS;
-
+
/* If not enough info to get the stream parameters, we decode the
first frames to get it. (used in mpeg case for example) */
ret = av_find_stream_info(ic);
@@ -2908,7 +2908,7 @@ static void opt_input_file(const char *filename)
if (start_time != 0) {
ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD);
if (ret < 0) {
- fprintf(stderr, "%s: could not seek to position %0.3f\n",
+ fprintf(stderr, "%s: could not seek to position %0.3f\n",
filename, (double)timestamp / AV_TIME_BASE);
}
/* reset seek info */
@@ -2956,7 +2956,7 @@ static void opt_input_file(const char *filename)
if(me_threshold)
enc->debug |= FF_DEBUG_MV;
- if (enc->time_base.den != rfps || enc->time_base.num != rfps_base) {
+ if (enc->time_base.den != rfps || enc->time_base.num != rfps_base) {
if (verbose >= 0)
fprintf(stderr,"\nSeems that stream %d comes from film source: %2.2f (%d/%d) -> %2.2f (%d/%d)\n",
@@ -2984,7 +2984,7 @@ static void opt_input_file(const char *filename)
av_abort();
}
}
-
+
input_files[nb_input_files] = ic;
input_files_ts_offset[nb_input_files] = input_ts_offset - (copy_ts ? 0 : timestamp);
/* dump the file content */
@@ -2998,7 +2998,7 @@ static void opt_input_file(const char *filename)
grab_device = NULL;
video_channel = 0;
-
+
rate_emu = 0;
}
@@ -3044,7 +3044,7 @@ static void new_video_stream(AVFormatContext *oc)
AVStream *st;
AVCodecContext *video_enc;
int codec_id;
-
+
st = av_new_stream(oc, oc->nb_streams);
if (!st) {
fprintf(stderr, "Could not alloc stream\n");
@@ -3054,12 +3054,12 @@ static void new_video_stream(AVFormatContext *oc)
if(thread_count>1)
avcodec_thread_init(st->codec, thread_count);
#endif
-
+
video_enc = st->codec;
-
+
if(video_codec_tag)
video_enc->codec_tag= video_codec_tag;
-
+
if( (video_global_header&1)
|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))){
video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
@@ -3077,25 +3077,25 @@ static void new_video_stream(AVFormatContext *oc)
char *p;
int i;
AVCodec *codec;
-
+
codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
if (video_codec_id != CODEC_ID_NONE)
codec_id = video_codec_id;
-
+
video_enc->codec_id = codec_id;
codec = avcodec_find_encoder(codec_id);
-
+
for(i=0; i<opt_name_count; i++){
AVOption *opt;
double d= av_get_double(avctx_opts, opt_names[i], &opt);
if(d==d && (opt->flags&AV_OPT_FLAG_VIDEO_PARAM) && (opt->flags&AV_OPT_FLAG_ENCODING_PARAM))
av_set_double(video_enc, opt_names[i], d);
}
-
+
video_enc->bit_rate = video_bit_rate;
video_enc->bit_rate_tolerance = video_bit_rate_tolerance;
- video_enc->time_base.den = frame_rate;
- video_enc->time_base.num = frame_rate_base;
+ video_enc->time_base.den = frame_rate;
+ video_enc->time_base.num = frame_rate_base;
if(codec && codec->supported_framerates){
const AVRational *p= codec->supported_framerates;
AVRational req= (AVRational){frame_rate, frame_rate_base};
@@ -3112,7 +3112,7 @@ static void new_video_stream(AVFormatContext *oc)
video_enc->time_base.den= best->num;
video_enc->time_base.num= best->den;
}
-
+
video_enc->width = frame_width + frame_padright + frame_padleft;
video_enc->height = frame_height + frame_padtop + frame_padbottom;
video_enc->sample_aspect_ratio = av_d2q(frame_aspect_ratio*frame_height/frame_width, 255);
@@ -3134,7 +3134,7 @@ static void new_video_stream(AVFormatContext *oc)
video_enc->gop_size = 0;
if (video_qscale || same_quality) {
video_enc->flags |= CODEC_FLAG_QSCALE;
- video_enc->global_quality=
+ video_enc->global_quality=
st->quality = FF_QP2LAMBDA * video_qscale;
}
@@ -3144,7 +3144,7 @@ static void new_video_stream(AVFormatContext *oc)
video_enc->inter_matrix = inter_matrix;
video_enc->pre_me = pre_me;
-
+
if (b_frames) {
video_enc->max_b_frames = b_frames;
video_enc->b_frame_strategy = b_strategy;
@@ -3171,8 +3171,8 @@ static void new_video_stream(AVFormatContext *oc)
fprintf(stderr, "error parsing rc_override\n");
exit(1);
}
- video_enc->rc_override=
- av_realloc(video_enc->rc_override,
+ video_enc->rc_override=
+ av_realloc(video_enc->rc_override,
sizeof(RcOverride)*(i+1));
video_enc->rc_override[i].start_frame= start;
video_enc->rc_override[i].end_frame = end;
@@ -3217,10 +3217,10 @@ static void new_video_stream(AVFormatContext *oc)
video_enc->rtp_mode= 1;
video_enc->rtp_payload_size= packet_size;
}
-
+
if (do_psnr)
video_enc->flags|= CODEC_FLAG_PSNR;
-
+
video_enc->me_method = me_method;
/* two pass mode */
@@ -3244,7 +3244,7 @@ static void new_audio_stream(AVFormatContext *oc)
AVStream *st;
AVCodecContext *audio_enc;
int codec_id, i;
-
+
st = av_new_stream(oc, oc->nb_streams);
if (!st) {
fprintf(stderr, "Could not alloc stream\n");
@@ -3254,13 +3254,13 @@ static void new_audio_stream(AVFormatContext *oc)
if(thread_count>1)
avcodec_thread_init(st->codec, thread_count);
#endif
-
+
audio_enc = st->codec;
audio_enc->codec_type = CODEC_TYPE_AUDIO;
-
+
if(audio_codec_tag)
audio_enc->codec_tag= audio_codec_tag;
-
+
if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
audio_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
avctx_opts->flags|= CODEC_FLAG_GLOBAL_HEADER;
@@ -3270,18 +3270,18 @@ static void new_audio_stream(AVFormatContext *oc)
audio_enc->channels = audio_channels;
} else {
codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_AUDIO);
-
+
for(i=0; i<opt_name_count; i++){
AVOption *opt;
double d= av_get_double(avctx_opts, opt_names[i], &opt);
if(d==d && (opt->flags&AV_OPT_FLAG_AUDIO_PARAM) && (opt->flags&AV_OPT_FLAG_ENCODING_PARAM))
av_set_double(audio_enc, opt_names[i], d);
}
-
+
if (audio_codec_id != CODEC_ID_NONE)
codec_id = audio_codec_id;
audio_enc->codec_id = codec_id;
-
+
audio_enc->bit_rate = audio_bit_rate;
if (audio_qscale > QSCALE_NONE) {
audio_enc->flags |= CODEC_FLAG_QSCALE;
@@ -3317,7 +3317,7 @@ static void opt_new_subtitle_stream(void)
AVStream *st;
AVCodecContext *subtitle_enc;
int i;
-
+
if (nb_output_files <= 0) {
fprintf(stderr, "At least one output file must be specified\n");
exit(1);
@@ -3395,11 +3395,11 @@ static void opt_output_file(const char *filename)
exit(1);
}
}
-
+
oc->oformat = file_oformat;
pstrcpy(oc->filename, sizeof(oc->filename), filename);
- if (!strcmp(file_oformat->name, "ffm") &&
+ if (!strcmp(file_oformat->name, "ffm") &&
strstart(filename, "http:", NULL)) {
/* special case for files sent to ffserver: we get the stream
parameters from ffserver */
@@ -3428,11 +3428,11 @@ static void opt_output_file(const char *filename)
if (video_disable) {
use_video = 0;
}
-
+
if (use_video) {
new_video_stream(oc);
}
-
+
if (use_audio) {
new_audio_stream(oc);
}
@@ -3443,7 +3443,7 @@ static void opt_output_file(const char *filename)
}
oc->timestamp = rec_timestamp;
-
+
if (str_title)
pstrcpy(oc->title, sizeof(oc->title), str_title);
if (str_author)
@@ -3466,12 +3466,12 @@ static void opt_output_file(const char *filename)
if (!(oc->oformat->flags & AVFMT_NOFILE)) {
/* test if it already exists to avoid loosing precious files */
- if (!file_overwrite &&
+ if (!file_overwrite &&
(strchr(filename, ':') == NULL ||
strstart(filename, "file:", NULL))) {
if (url_exist(filename)) {
int c;
-
+
if ( !using_stdin ) {
fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename);
fflush(stderr);
@@ -3487,7 +3487,7 @@ static void opt_output_file(const char *filename)
}
}
}
-
+
/* open the file */
if (url_fopen(&oc->pb, filename, URL_WRONLY) < 0) {
fprintf(stderr, "Could not open '%s'\n", filename);
@@ -3523,7 +3523,7 @@ static void prepare_grab(void)
AVFormatContext *ic;
AVFormatParameters vp1, *vp = &vp1;
AVFormatParameters ap1, *ap = &ap1;
-
+
/* see if audio/video inputs are needed */
has_video = 0;
has_audio = 0;
@@ -3547,7 +3547,7 @@ static void prepare_grab(void)
vp->width = enc->width;
if (enc->height > vp->height)
vp->height = enc->height;
-
+
if (vp->time_base.num*(int64_t)enc->time_base.den > enc->time_base.num*(int64_t)vp->time_base.den){
vp->time_base = enc->time_base;
}
@@ -3558,12 +3558,12 @@ static void prepare_grab(void)
}
}
}
-
+
if (has_video == 0 && has_audio == 0) {
fprintf(stderr, "Output file must have at least one audio or video stream\n");
exit(1);
}
-
+
if (has_video) {
AVInputFormat *fmt1;
fmt1 = av_find_input_format(video_grab_format);
@@ -3674,18 +3674,18 @@ static void show_formats(void)
if(name==NULL)
break;
last_name= name;
-
+
printf(
- " %s%s %-15s %s\n",
- decode ? "D":" ",
- encode ? "E":" ",
+ " %s%s %-15s %s\n",
+ decode ? "D":" ",
+ encode ? "E":" ",
name,
long_name ? long_name:" ");
}
printf("\n");
printf("Image formats (filename extensions, if any, follow):\n");
- for(image_fmt = first_image_format; image_fmt != NULL;
+ for(image_fmt = first_image_format; image_fmt != NULL;
image_fmt = image_fmt->next) {
printf(
" %s%s %-6s %s\n",
@@ -3720,7 +3720,7 @@ static void show_formats(void)
if(p2==NULL)
break;
last_name= p2->name;
-
+
switch(p2->type) {
case CODEC_TYPE_VIDEO:
type_str = "V";
@@ -3736,9 +3736,9 @@ static void show_formats(void)
break;
}
printf(
- " %s%s%s%s%s%s %s",
- decode ? "D": (/*p2->decoder ? "d":*/" "),
- encode ? "E":" ",
+ " %s%s%s%s%s%s %s",
+ decode ? "D": (/*p2->decoder ? "d":*/" "),
+ encode ? "E":" ",
type_str,
cap & CODEC_CAP_DRAW_HORIZ_BAND ? "S":" ",
cap & CODEC_CAP_DR1 ? "D":" ",
@@ -3754,17 +3754,17 @@ static void show_formats(void)
for(up = first_protocol; up != NULL; up = up->next)
printf(" %s:", up->name);
printf("\n");
-
+
printf("Frame size, frame rate abbreviations:\n ntsc pal qntsc qpal sntsc spal film ntsc-film sqcif qcif cif 4cif\n");
printf("Motion estimation methods:\n");
pp = motion_str;
while (*pp) {
printf(" %s", *pp);
- if ((pp - motion_str + 1) == ME_ZERO)
+ if ((pp - motion_str + 1) == ME_ZERO)
printf("(fastest)");
- else if ((pp - motion_str + 1) == ME_FULL)
+ else if ((pp - motion_str + 1) == ME_FULL)
printf("(slowest)");
- else if ((pp - motion_str + 1) == ME_EPZS)
+ else if ((pp - motion_str + 1) == ME_EPZS)
printf("(default)");
pp++;
}
@@ -3880,7 +3880,7 @@ static void opt_target(const char *arg)
audio_bit_rate = 224000;
audio_sample_rate = 44100;
-
+
mux_packet_size= 2324;
mux_rate= 2352 * 75 * 8;
@@ -3953,7 +3953,7 @@ static void show_version(void)
{
fprintf(stderr, "ffmpeg " FFMPEG_VERSION "\n"
"libavcodec %d\n"
- "libavformat %d\n",
+ "libavformat %d\n",
avcodec_build(), LIBAVFORMAT_BUILD);
exit(1);
}
@@ -3962,13 +3962,13 @@ static int opt_default(const char *opt, const char *arg){
AVOption *o= av_set_string(avctx_opts, opt, arg);
if(!o)
return -1;
-
+
// av_log(NULL, AV_LOG_ERROR, "%s:%s: %f 0x%0X\n", opt, arg, av_get_double(avctx_opts, opt, NULL), (int)av_get_int(avctx_opts, opt, NULL));
//FIXME we should always use avctx_opts, ... for storing options so there wont be any need to keep track of whats set over this
opt_names= av_realloc(opt_names, sizeof(void*)*(opt_name_count+1));
opt_names[opt_name_count++]= o->name;
-
+
/* disable generate of real time pts in ffm (need to be supressed anyway) */
if(avctx_opts->flags & CODEC_FLAG_BITEXACT)
ffm_nopts = 1;
@@ -3999,11 +3999,11 @@ 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" },
- { "benchmark", OPT_BOOL | OPT_EXPERT, {(void*)&do_benchmark},
+ { "benchmark", OPT_BOOL | OPT_EXPERT, {(void*)&do_benchmark},
"add timings for benchmarking" },
- { "dump", OPT_BOOL | OPT_EXPERT, {(void*)&do_pkt_dump},
+ { "dump", OPT_BOOL | OPT_EXPERT, {(void*)&do_pkt_dump},
"dump each input packet" },
- { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump},
+ { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump},
"when dumping packets, also dump the payload" },
{ "re", OPT_BOOL | OPT_EXPERT, {(void*)&rate_emu}, "read input at native frame rate", "" },
{ "loop", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "loop (current only works with images)" },
@@ -4065,7 +4065,7 @@ const OptionDef options[] = {
{ "minrate", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_min}, "set min video bitrate tolerance (in kbit/s)", "bitrate" },
{ "bufsize", HAS_ARG | OPT_VIDEO, {(void*)opt_video_buffer_size}, "set ratecontrol buffer size (in kByte)", "size" },
{ "vcodec", HAS_ARG | OPT_VIDEO, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" },
- { "me", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_motion_estimation}, "set motion estimation method",
+ { "me", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_motion_estimation}, "set motion estimation method",
"method" },
{ "me_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_threshold}, "motion estimaton threshold", "" },
{ "mb_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_threshold}, "macroblock threshold", "" },
@@ -4075,14 +4075,14 @@ const OptionDef options[] = {
{ "ps", HAS_ARG | OPT_EXPERT, {(void*)opt_packet_size}, "set packet size in bits", "size" },
{ "error", HAS_ARG | OPT_EXPERT, {(void*)opt_error_rate}, "error rate", "rate" },
{ "strict", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_strict}, "how strictly to follow the standards", "strictness" },
- { "sameq", OPT_BOOL | OPT_VIDEO, {(void*)&same_quality},
+ { "sameq", OPT_BOOL | OPT_VIDEO, {(void*)&same_quality},
"use same video quality as source (implies VBR)" },
{ "pass", HAS_ARG | OPT_VIDEO, {(void*)&opt_pass}, "select the pass number (1 or 2)", "n" },
{ "passlogfile", HAS_ARG | OPT_STRING | OPT_VIDEO, {(void*)&pass_logfilename}, "select two pass log file name", "file" },
- { "deinterlace", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_deinterlace},
+ { "deinterlace", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_deinterlace},
"deinterlace pictures" },
{ "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" },
- { "vstats", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_vstats}, "dump video coding statistics to file" },
+ { "vstats", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_vstats}, "dump video coding statistics to file" },
{ "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" },
{ "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" },
{ "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" },
@@ -4114,18 +4114,18 @@ const OptionDef options[] = {
{ "scodec", HAS_ARG | OPT_SUBTITLE, {(void*)opt_subtitle_codec}, "force subtitle codec ('copy' to copy stream)", "codec" },
{ "newsubtitle", OPT_SUBTITLE, {(void*)opt_new_subtitle_stream}, "add a new subtitle stream to the current output stream" },
{ "slang", HAS_ARG | OPT_STRING | OPT_SUBTITLE, {(void *)&subtitle_language}, "set the ISO 639 language code (3 letters) of the current subtitle stream" , "code" },
-
+
/* grab options */
{ "vd", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_GRAB, {(void*)opt_video_device}, "set video grab device", "device" },
{ "vc", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_GRAB, {(void*)opt_video_channel}, "set video grab channel (DV1394 only)", "channel" },
{ "tvstd", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_GRAB, {(void*)opt_video_standard}, "set television standard (NTSC, PAL (SECAM))", "standard" },
{ "ad", HAS_ARG | OPT_EXPERT | OPT_AUDIO | OPT_GRAB, {(void*)opt_audio_device}, "set audio device", "device" },
- /* G.2 grab options */
+ /* G.2 grab options */
{ "grab", HAS_ARG | OPT_EXPERT | OPT_GRAB, {(void*)opt_grab}, "request grabbing using", "format" },
{ "gd", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_GRAB, {(void*)opt_grab_device}, "set grab device", "device" },
-
- /* muxer options */
+
+ /* muxer options */
{ "muxrate", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&mux_rate}, "set mux rate", "rate" },
{ "packetsize", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&mux_packet_size}, "set packet size", "size" },
{ "muxdelay", OPT_FLOAT | HAS_ARG | OPT_EXPERT, {(void*)&mux_max_delay}, "set the maximum demux-decode delay", "seconds" },
@@ -4152,7 +4152,7 @@ static void show_license(void)
show_banner();
#ifdef CONFIG_GPL
printf(
- "This program is free software; you can redistribute it and/or modify\n"
+ "This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n"
@@ -4195,28 +4195,28 @@ static void show_help(void)
show_help_options(options, "Main options:\n",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO, 0);
show_help_options(options, "\nVideo options:\n",
- OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
+ OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
OPT_VIDEO);
show_help_options(options, "\nAdvanced Video options:\n",
- OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
+ OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
OPT_VIDEO | OPT_EXPERT);
show_help_options(options, "\nAudio options:\n",
- OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
+ OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
OPT_AUDIO);
show_help_options(options, "\nAdvanced Audio options:\n",
- OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
+ OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
OPT_AUDIO | OPT_EXPERT);
show_help_options(options, "\nSubtitle options:\n",
- OPT_SUBTITLE | OPT_GRAB,
+ OPT_SUBTITLE | OPT_GRAB,
OPT_SUBTITLE);
show_help_options(options, "\nAudio/Video grab options:\n",
- OPT_GRAB,
+ OPT_GRAB,
OPT_GRAB);
show_help_options(options, "\nAdvanced options:\n",
- OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
+ OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB,
OPT_EXPERT);
av_opt_show(avctx_opts, NULL);
-
+
exit(1);
}
@@ -4231,14 +4231,14 @@ int main(int argc, char **argv)
int64_t ti;
av_register_all();
-
+
avctx_opts= avcodec_alloc_context();
if (argc <= 1)
show_help();
else
show_banner();
-
+
/* parse options */
parse_options(argc, argv, options);
@@ -4247,14 +4247,14 @@ int main(int argc, char **argv)
fprintf(stderr, "Must supply at least one output file\n");
exit(1);
}
-
+
if (nb_input_files == 0) {
input_sync = 1;
prepare_grab();
}
ti = getutime();
- av_encode(output_files, nb_output_files, input_files, nb_input_files,
+ av_encode(output_files, nb_output_files, input_files, nb_input_files,
stream_maps, nb_stream_maps);
ti = getutime() - ti;
if (do_benchmark) {
@@ -4281,7 +4281,7 @@ int main(int argc, char **argv)
av_free(intra_matrix);
if(inter_matrix)
av_free(inter_matrix);
-
+
#ifdef POWERPC_PERFORMANCE_REPORT
extern void powerpc_display_perf_report(void);
powerpc_display_perf_report();
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 01:27:02 +0000