---
avconv.c | 398 +++++++++++++++++++++++++++++++-------------------------------
1 files changed, 200 insertions(+), 198 deletions(-)
diff --git a/avconv.c b/avconv.c
index ecbf523..f9258bb 100644
--- a/avconv.c
+++ b/avconv.c
@@ -109,10 +109,10 @@ static int do_hex_dump = 0;
static int do_pkt_dump = 0;
static int do_pass = 0;
static char *pass_logfilename_prefix = NULL;
-static int video_sync_method= -1;
-static int audio_sync_method= 0;
-static float audio_drift_threshold= 0.1;
-static int copy_ts= 0;
+static int video_sync_method = -1;
+static int audio_sync_method = 0;
+static float audio_drift_threshold = 0.1;
+static int copy_ts = 0;
static int copy_tb = 1;
static int opt_shortest = 0;
static char *vstats_filename;
@@ -409,9 +409,9 @@ static int configure_video_filters(InputStream *ist,
OutputStream *ost)
ost->graph = avfilter_graph_alloc();
- if (ist->st->sample_aspect_ratio.num){
+ if (ist->st->sample_aspect_ratio.num) {
sample_aspect_ratio = ist->st->sample_aspect_ratio;
- }else
+ } else
sample_aspect_ratio = ist->st->codec->sample_aspect_ratio;
snprintf(args, 255, "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width,
@@ -517,14 +517,14 @@ void exit_program(int ret)
int i;
/* close files */
- for(i=0;i<nb_output_files;i++) {
+ for (i = 0; i < nb_output_files; i++) {
AVFormatContext *s = output_files[i].ctx;
if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
avio_close(s->pb);
avformat_free_context(s);
av_dict_free(&output_files[i].opts);
}
- for(i=0;i<nb_input_files;i++) {
+ for (i = 0; i<nb_input_files; i++) {
avformat_close_input(&input_files[i].ctx);
}
for (i = 0; i < nb_input_streams; i++) {
@@ -545,7 +545,7 @@ void exit_program(int ret)
uninit_opts();
av_free(audio_buf);
av_free(audio_out);
- allocated_audio_buf_size= allocated_audio_out_size= 0;
+ allocated_audio_buf_size = allocated_audio_out_size = 0;
#if CONFIG_AVFILTER
avfilter_uninit();
@@ -589,10 +589,10 @@ static void assert_codec_experimental(AVCodecContext *c,
int encoder)
static void choose_sample_fmt(AVStream *st, AVCodec *codec)
{
- if(codec && codec->sample_fmts){
- const enum AVSampleFormat *p= codec->sample_fmts;
- for(; *p!=-1; p++){
- if(*p == st->codec->sample_fmt)
+ if (codec && codec->sample_fmts) {
+ const enum AVSampleFormat *p = codec->sample_fmts;
+ for (; *p != -1; p++) {
+ if (*p == st->codec->sample_fmt)
break;
}
if (*p == -1) {
@@ -648,41 +648,41 @@ static void update_sample_fmt(AVCodecContext *dec,
AVCodec *dec_codec,
static void choose_sample_rate(AVStream *st, AVCodec *codec)
{
- if(codec && codec->supported_samplerates){
- const int *p= codec->supported_samplerates;
- int best=0;
- int best_dist=INT_MAX;
- for(; *p; p++){
+ if (codec && codec->supported_samplerates) {
+ const int *p = codec->supported_samplerates;
+ int best = 0;
+ int best_dist = INT_MAX;
+ for (; *p; p++) {
int dist= abs(st->codec->sample_rate - *p);
- if(dist < best_dist){
- best_dist= dist;
- best= *p;
+ if (dist < best_dist) {
+ best_dist = dist;
+ best = *p;
}
}
- if(best_dist){
+ if (best_dist) {
av_log(st->codec, AV_LOG_WARNING, "Requested sampling rate
unsupported using closest supported (%d)\n", best);
}
- st->codec->sample_rate= best;
+ st->codec->sample_rate = best;
}
}
static void choose_pixel_fmt(AVStream *st, AVCodec *codec)
{
- if(codec && codec->pix_fmts){
- const enum PixelFormat *p= codec->pix_fmts;
- if(st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL){
- if(st->codec->codec_id==CODEC_ID_MJPEG){
- p= (const enum PixelFormat[]){PIX_FMT_YUVJ420P,
PIX_FMT_YUVJ422P, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE};
- }else if(st->codec->codec_id==CODEC_ID_LJPEG){
- p= (const enum PixelFormat[]){PIX_FMT_YUVJ420P,
PIX_FMT_YUVJ422P, PIX_FMT_YUVJ444P, PIX_FMT_YUV420P, PIX_FMT_YUV422P,
PIX_FMT_YUV444P, PIX_FMT_BGRA, PIX_FMT_NONE};
+ if (codec && codec->pix_fmts) {
+ const enum PixelFormat *p = codec->pix_fmts;
+ if (st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) {
+ if (st->codec->codec_id == CODEC_ID_MJPEG) {
+ p = (const enum PixelFormat[]) {PIX_FMT_YUVJ420P,
PIX_FMT_YUVJ422P, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE};
+ } else if (st->codec->codec_id == CODEC_ID_LJPEG) {
+ p = (const enum PixelFormat[]) {PIX_FMT_YUVJ420P,
PIX_FMT_YUVJ422P, PIX_FMT_YUVJ444P, PIX_FMT_YUV420P, PIX_FMT_YUV422P,
PIX_FMT_YUV444P, PIX_FMT_BGRA, PIX_FMT_NONE};
}
}
for (; *p != PIX_FMT_NONE; p++) {
- if(*p == st->codec->pix_fmt)
+ if (*p == st->codec->pix_fmt)
break;
}
if (*p == PIX_FMT_NONE) {
- if(st->codec->pix_fmt != PIX_FMT_NONE)
+ if (st->codec->pix_fmt != PIX_FMT_NONE)
av_log(NULL, AV_LOG_WARNING,
"Incompatible pixel format '%s' for codec '%s',
auto-selecting format '%s'\n",
av_pix_fmt_descriptors[st->codec->pix_fmt].name,
@@ -698,22 +698,22 @@ get_sync_ipts(const OutputStream *ost)
{
const InputStream *ist = ost->sync_ist;
OutputFile *of = &output_files[ost->file_index];
- return (double)(ist->pts - of->start_time)/AV_TIME_BASE;
+ return (double)(ist->pts - of->start_time) / AV_TIME_BASE;
}
-static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext
*avctx, AVBitStreamFilterContext *bsfc){
+static void write_frame(AVFormatContext *s, AVPacket *pkt, AVCodecContext
*avctx, AVBitStreamFilterContext *bsfc) {
int ret;
- while(bsfc){
- AVPacket new_pkt= *pkt;
- int a= av_bitstream_filter_filter(bsfc, avctx, NULL,
+ while (bsfc) {
+ AVPacket new_pkt = *pkt;
+ int a = av_bitstream_filter_filter(bsfc, avctx, NULL,
&new_pkt.data, &new_pkt.size,
pkt->data, pkt->size,
pkt->flags & AV_PKT_FLAG_KEY);
- if(a>0){
+ if (a > 0) {
av_free_packet(pkt);
new_pkt.destruct= av_destruct_packet;
- } else if(a<0){
+ } else if (a < 0) {
av_log(NULL, AV_LOG_ERROR, "%s failed for stream %d, codec %s",
bsfc->filter->name, pkt->stream_index,
avctx->codec ? avctx->codec->name : "copy");
@@ -721,13 +721,13 @@ static void write_frame(AVFormatContext *s, AVPacket
*pkt, AVCodecContext *avctx
if (exit_on_error)
exit_program(1);
}
- *pkt= new_pkt;
+ *pkt = new_pkt;
- bsfc= bsfc->next;
+ bsfc = bsfc->next;
}
- ret= av_interleaved_write_frame(s, pkt);
- if(ret < 0){
+ ret = av_interleaved_write_frame(s, pkt);
+ if (ret < 0) {
print_error("av_interleaved_write_frame()", ret);
exit_program(1);
}
@@ -748,8 +748,8 @@ static void do_audio_out(AVFormatContext *s, OutputStream
*ost,
int64_t audio_out_size, audio_buf_size;
int size_out, frame_bytes, ret, resample_changed;
- AVCodecContext *enc= ost->st->codec;
- AVCodecContext *dec= ist->st->codec;
+ AVCodecContext *enc = ost->st->codec;
+ AVCodecContext *dec = ist->st->codec;
int osize = av_get_bytes_per_sample(enc->sample_fmt);
int isize = av_get_bytes_per_sample(dec->sample_fmt);
const int coded_bps = av_get_bits_per_sample(enc->codec->id);
@@ -758,25 +758,25 @@ static void do_audio_out(AVFormatContext *s, OutputStream
*ost,
int64_t allocated_for_size = size;
need_realloc:
- audio_buf_size= (allocated_for_size + isize*dec->channels - 1) /
(isize*dec->channels);
- audio_buf_size= (audio_buf_size*enc->sample_rate + dec->sample_rate) /
dec->sample_rate;
- audio_buf_size= audio_buf_size*2 + 10000; //safety factors for the
deprecated resampling API
- audio_buf_size= FFMAX(audio_buf_size, enc->frame_size);
- audio_buf_size*= osize*enc->channels;
-
- audio_out_size= FFMAX(audio_buf_size, enc->frame_size * osize *
enc->channels);
- if(coded_bps > 8*osize)
- audio_out_size= audio_out_size * coded_bps / (8*osize);
+ audio_buf_size = (allocated_for_size + isize*dec->channels - 1) /
(isize*dec->channels);
+ audio_buf_size = (audio_buf_size*enc->sample_rate + dec->sample_rate) /
dec->sample_rate;
+ audio_buf_size = audio_buf_size*2 + 10000; //safety factors for the
deprecated resampling API
+ audio_buf_size = FFMAX(audio_buf_size, enc->frame_size);
+ audio_buf_size *= osize * enc->channels;
+
+ audio_out_size = FFMAX(audio_buf_size, enc->frame_size * osize *
enc->channels);
+ if (coded_bps > 8 * osize)
+ audio_out_size = audio_out_size * coded_bps / (8*osize);
audio_out_size += FF_MIN_BUFFER_SIZE;
- if(audio_out_size > INT_MAX || audio_buf_size > INT_MAX){
+ if (audio_out_size > INT_MAX || audio_buf_size > INT_MAX) {
av_log(NULL, AV_LOG_FATAL, "Buffer sizes too large\n");
exit_program(1);
}
av_fast_malloc(&audio_buf, &allocated_audio_buf_size, audio_buf_size);
av_fast_malloc(&audio_out, &allocated_audio_out_size, audio_out_size);
- if (!audio_buf || !audio_out){
+ if (!audio_buf || !audio_out) {
av_log(NULL, AV_LOG_FATAL, "Out of memory in do_audio_out\n");
exit_program(1);
}
@@ -824,8 +824,8 @@ need_realloc:
}
#define MAKE_SFMT_PAIR(a,b) ((a)+AV_SAMPLE_FMT_NB*(b))
- if (!ost->audio_resample && dec->sample_fmt!=enc->sample_fmt &&
- MAKE_SFMT_PAIR(enc->sample_fmt,dec->sample_fmt)!=ost->reformat_pair) {
+ if (!ost->audio_resample && dec->sample_fmt != enc->sample_fmt &&
+ MAKE_SFMT_PAIR(enc->sample_fmt,dec->sample_fmt) != ost->reformat_pair)
{
if (ost->reformat_ctx)
av_audio_convert_free(ost->reformat_ctx);
ost->reformat_ctx = av_audio_convert_alloc(enc->sample_fmt, 1,
@@ -836,45 +836,45 @@ need_realloc:
av_get_sample_fmt_name(enc->sample_fmt));
exit_program(1);
}
- ost->reformat_pair=MAKE_SFMT_PAIR(enc->sample_fmt,dec->sample_fmt);
+ ost->reformat_pair = MAKE_SFMT_PAIR(enc->sample_fmt,dec->sample_fmt);
}
- if(audio_sync_method){
+ if (audio_sync_method) {
double delta = get_sync_ipts(ost) * enc->sample_rate - ost->sync_opts
- av_fifo_size(ost->fifo)/(enc->channels * osize);
int idelta = delta * dec->sample_rate / enc->sample_rate;
int byte_delta = idelta * isize * dec->channels;
//FIXME resample delay
- if(fabs(delta) > 50){
- if(ist->is_start || fabs(delta) >
audio_drift_threshold*enc->sample_rate){
- if(byte_delta < 0){
- byte_delta= FFMAX(byte_delta, -size);
+ if (fabs(delta) > 50) {
+ if (ist->is_start || fabs(delta) >
audio_drift_threshold*enc->sample_rate) {
+ if (byte_delta < 0) {
+ byte_delta = FFMAX(byte_delta, -size);
size += byte_delta;
buf -= byte_delta;
av_log(NULL, AV_LOG_VERBOSE, "discarding %d audio
samples\n",
-byte_delta / (isize * dec->channels));
- if(!size)
+ if (!size)
return;
- ist->is_start=0;
- }else{
- static uint8_t *input_tmp= NULL;
+ ist->is_start = 0;
+ } else {
+ static uint8_t *input_tmp = NULL;
input_tmp= av_realloc(input_tmp, byte_delta + size);
- if(byte_delta > allocated_for_size - size){
- allocated_for_size= byte_delta + (int64_t)size;
+ if (byte_delta > allocated_for_size - size) {
+ allocated_for_size = byte_delta + (int64_t)size;
goto need_realloc;
}
ist->is_start=0;
generate_silence(input_tmp, dec->sample_fmt, byte_delta);
memcpy(input_tmp + byte_delta, buf, size);
- buf= input_tmp;
+ buf = input_tmp;
size += byte_delta;
av_log(NULL, AV_LOG_VERBOSE, "adding %d audio samples of
silence\n", idelta);
}
- }else if(audio_sync_method>1){
- int comp= av_clip(delta, -audio_sync_method,
audio_sync_method);
+ } else if (audio_sync_method>1) {
+ int comp = av_clip(delta, -audio_sync_method,
audio_sync_method);
av_assert0(ost->audio_resample);
av_log(NULL, AV_LOG_VERBOSE, "compensating audio timestamp
drift:%f compensation:%d in:%d\n",
delta, comp, enc->sample_rate);
@@ -882,7 +882,7 @@ need_realloc:
av_resample_compensate(*(struct
AVResampleContext**)ost->resample, comp, enc->sample_rate);
}
}
- }else
+ } else
ost->sync_opts= lrintf(get_sync_ipts(ost) * enc->sample_rate)
- av_fifo_size(ost->fifo)/(enc->channels * osize);
//FIXME wrong
@@ -897,13 +897,13 @@ need_realloc:
size_out = size;
}
- if (!ost->audio_resample && dec->sample_fmt!=enc->sample_fmt) {
- const void *ibuf[6]= {buftmp};
- void *obuf[6]= {audio_buf};
- int istride[6]= {isize};
- int ostride[6]= {osize};
- int len= size_out/istride[0];
- if (av_audio_convert(ost->reformat_ctx, obuf, ostride, ibuf, istride,
len)<0) {
+ if (!ost->audio_resample && dec->sample_fmt != enc->sample_fmt) {
+ const void *ibuf[6] = {buftmp};
+ void *obuf[6] = {audio_buf};
+ int istride[6] = {isize};
+ int ostride[6] = {osize};
+ int len = size_out/istride[0];
+ if (av_audio_convert(ost->reformat_ctx, obuf, ostride, ibuf, istride,
len) < 0) {
printf("av_audio_convert() failed\n");
if (exit_on_error)
exit_program(1);
@@ -939,11 +939,11 @@ need_realloc:
exit_program(1);
}
audio_size += ret;
- pkt.stream_index= ost->index;
- pkt.data= audio_out;
- 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);
+ pkt.stream_index = ost->index;
+ pkt.data = audio_out;
+ 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);
pkt.flags |= AV_PKT_FLAG_KEY;
write_frame(s, &pkt, enc, ost->bitstream_filters);
@@ -961,7 +961,7 @@ need_realloc:
if (coded_bps)
size_out = size_out*coded_bps/8;
- if(size_out > audio_out_size){
+ if (size_out > audio_out_size) {
av_log(NULL, AV_LOG_FATAL, "Internal error, buffer size too
small\n");
exit_program(1);
}
@@ -974,10 +974,10 @@ need_realloc:
exit_program(1);
}
audio_size += ret;
- pkt.stream_index= ost->index;
- pkt.data= audio_out;
- pkt.size= ret;
- if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
+ pkt.stream_index = ost->index;
+ pkt.data = audio_out;
+ 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);
pkt.flags |= AV_PKT_FLAG_KEY;
write_frame(s, &pkt, enc, ost->bitstream_filters);
@@ -1006,7 +1006,7 @@ static void pre_process_video_frame(InputStream *ist,
AVPicture *picture, void *
picture2 = &picture_tmp;
avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height);
- if(avpicture_deinterlace(picture2, picture,
+ if (avpicture_deinterlace(picture2, picture,
dec->pix_fmt, dec->width, dec->height) < 0) {
/* if error, do not deinterlace */
av_log(NULL, AV_LOG_WARNING, "Deinterlacing failed\n");
@@ -1056,10 +1056,10 @@ static void do_subtitle_out(AVFormatContext *s,
else
nb = 1;
- for(i = 0; i < nb; i++) {
+ for (i = 0; i < nb; i++) {
sub->pts = av_rescale_q(pts, ist->st->time_base, AV_TIME_BASE_Q);
// start_display_time is required to be 0
- sub->pts += av_rescale_q(sub->start_display_time,
(AVRational){1, 1000}, AV_TIME_BASE_Q);
+ sub->pts += av_rescale_q(sub->start_display_time,
(AVRational) {1, 1000}, AV_TIME_BASE_Q);
sub->end_display_time -= sub->start_display_time;
sub->start_display_time = 0;
subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out,
@@ -1086,7 +1086,7 @@ static void do_subtitle_out(AVFormatContext *s,
}
}
-static int bit_buffer_size= 1024*256;
+static int bit_buffer_size = 1024*256;
static uint8_t *bit_buffer= NULL;
static void do_video_resample(OutputStream *ost,
@@ -1108,7 +1108,7 @@ static void do_video_resample(OutputStream *ost,
ist->file_index, ist->st->index,
ost->resample_width, ost->resample_height,
av_get_pix_fmt_name(ost->resample_pix_fmt),
dec->width , dec->height ,
av_get_pix_fmt_name(dec->pix_fmt));
- if(!ost->video_resample)
+ if (!ost->video_resample)
ost->video_resample = 1;
}
@@ -1182,21 +1182,21 @@ static void do_video_out(AVFormatContext *s,
if (vdelta < -1.1)
nb_frames = 0;
else if (format_video_sync == 2) {
- if(vdelta<=-0.6){
+ if (vdelta<=-0.6) {
nb_frames=0;
- }else if(vdelta>0.6)
+ } else if (vdelta>0.6)
ost->sync_opts= lrintf(sync_ipts);
- }else if (vdelta > 1.1)
+ } else if (vdelta > 1.1)
nb_frames = lrintf(vdelta);
//fprintf(stderr, "vdelta:%f, ost->sync_opts:%"PRId64", ost->sync_ipts:%f
nb_frames:%d\n", vdelta, ost->sync_opts, get_sync_ipts(ost), nb_frames);
- if (nb_frames == 0){
+ if (nb_frames == 0) {
++nb_frames_drop;
av_log(NULL, AV_LOG_VERBOSE, "*** drop!\n");
- }else if (nb_frames > 1) {
+ } else if (nb_frames > 1) {
nb_frames_dup += nb_frames - 1;
av_log(NULL, AV_LOG_VERBOSE, "*** %d dup!\n", nb_frames-1);
}
- }else
+ } else
ost->sync_opts= lrintf(sync_ipts);
nb_frames = FFMIN(nb_frames, ost->max_frames - ost->frame_number);
@@ -1206,7 +1206,7 @@ static void do_video_out(AVFormatContext *s,
do_video_resample(ost, ist, in_picture, &final_picture);
/* duplicates frame if needed */
- for(i=0;i<nb_frames;i++) {
+ for (i = 0; i<nb_frames; i++) {
AVPacket pkt;
av_init_packet(&pkt);
pkt.stream_index= ost->index;
@@ -1218,8 +1218,8 @@ static void do_video_out(AVFormatContext *s,
method. */
enc->coded_frame->interlaced_frame = in_picture->interlaced_frame;
enc->coded_frame->top_field_first = in_picture->top_field_first;
- pkt.data= (uint8_t *)final_picture;
- pkt.size= sizeof(AVPicture);
+ pkt.data = (uint8_t *)final_picture;
+ pkt.size = sizeof(AVPicture);
pkt.pts= av_rescale_q(ost->sync_opts, enc->time_base,
ost->st->time_base);
pkt.flags |= AV_PKT_FLAG_KEY;
@@ -1227,7 +1227,7 @@ static void do_video_out(AVFormatContext *s,
} else {
AVFrame big_picture;
- big_picture= *final_picture;
+ big_picture = *final_picture;
/* better than nothing: use input picture interlaced
settings */
big_picture.interlaced_frame = in_picture->interlaced_frame;
@@ -1260,16 +1260,16 @@ static void do_video_out(AVFormatContext *s,
exit_program(1);
}
- if(ret>0){
- pkt.data= bit_buffer;
- pkt.size= ret;
- if(enc->coded_frame->pts != AV_NOPTS_VALUE)
+ if (ret>0) {
+ pkt.data = bit_buffer;
+ pkt.size = ret;
+ if (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 -> %"PRId64"/%"PRId64"\n",
pkt.pts != AV_NOPTS_VALUE ? av_rescale(pkt.pts, enc->time_base.den,
AV_TIME_BASE*(int64_t)enc->time_base.num) : -1,
pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->time_base.den,
AV_TIME_BASE*(int64_t)enc->time_base.num) : -1);*/
- if(enc->coded_frame->key_frame)
+ if (enc->coded_frame->key_frame)
pkt.flags |= AV_PKT_FLAG_KEY;
write_frame(s, &pkt, ost->st->codec, ost->bitstream_filters);
*frame_size = ret;
@@ -1287,8 +1287,9 @@ static void do_video_out(AVFormatContext *s,
}
}
-static double psnr(double d){
- return -10.0*log(d)/log(10.0);
+static double psnr(double d)
+{
+ return -10.0 * log(d) / log(10.0);
}
static void do_video_stats(AVFormatContext *os, OutputStream *ost,
@@ -1362,13 +1363,13 @@ static void print_report(OutputFile *output_files,
oc = output_files[0].ctx;
total_size = avio_size(oc->pb);
- if(total_size<0) // FIXME improve avio_size() so it works with non
seekable output too
- total_size= avio_tell(oc->pb);
+ if (total_size<0) // FIXME improve avio_size() so it works with non
seekable output too
+ total_size = avio_tell(oc->pb);
buf[0] = '\0';
ti1 = 1e10;
vid = 0;
- for(i=0;i<nb_ostreams;i++) {
+ for (i = 0; i < nb_ostreams; i++) {
float q = -1;
ost = &ost_table[i];
enc = ost->st->codec;
@@ -1383,31 +1384,32 @@ static void print_report(OutputFile *output_files,
frame_number = ost->frame_number;
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "frame=%5d
fps=%3d q=%3.1f ",
frame_number, (t>1)?(int)(frame_number/t+0.5) : 0, q);
- if(is_last_report)
+ if (is_last_report)
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "L");
- if(qp_hist){
+ if (qp_hist) {
int j;
int qp = lrintf(q);
- if(qp>=0 && qp<FF_ARRAY_ELEMS(qp_histogram))
+ if (qp >= 0 && qp < FF_ARRAY_ELEMS(qp_histogram))
qp_histogram[qp]++;
- for(j=0; j<32; j++)
+ for (j = 0; j < 32; j++)
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
"%X", (int)lrintf(log(qp_histogram[j]+1)/log(2)));
}
- if (enc->flags&CODEC_FLAG_PSNR){
+ if (enc->flags&CODEC_FLAG_PSNR) {
int j;
- double error, error_sum=0;
- double scale, scale_sum=0;
+ double error, error_sum =0;
+ double scale, scale_sum =0;
char type[3]= {'Y','U','V'};
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
"PSNR=");
- for(j=0; j<3; j++){
- if(is_last_report){
+ for (j = 0; j < 3; j++) {
+ if (is_last_report) {
error= enc->error[j];
- scale= enc->width*enc->height*255.0*255.0*frame_number;
- }else{
+ scale =
enc->width*enc->height*255.0*255.0*frame_number;
+ } else {
error= enc->coded_frame->error[j];
- scale= enc->width*enc->height*255.0*255.0;
+ scale = enc->width*enc->height*255.0*255.0;
}
- if(j) scale/=4;
+ if (j)
+ scale /= 4;
error_sum += error;
scale_sum += scale;
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
"%c:%2.2f ", type[j], psnr(error/scale));
@@ -1467,7 +1469,7 @@ static void flush_encoders(OutputStream *ost_table, int
nb_ostreams)
if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
(os->oformat->flags & AVFMT_RAWPICTURE) && enc->codec->id == CODEC_ID_RAWVIDEO)
continue;
- for(;;) {
+ for (;;) {
AVPacket pkt;
int fifo_bytes;
av_init_packet(&pkt);
@@ -1514,7 +1516,7 @@ static void flush_encoders(OutputStream *ost_table, int
nb_ostreams)
exit_program(1);
}
video_size += ret;
- if(enc->coded_frame && enc->coded_frame->key_frame)
+ if (enc->coded_frame && enc->coded_frame->key_frame)
pkt.flags |= AV_PKT_FLAG_KEY;
if (ost->logfile && enc->stats_out) {
fprintf(ost->logfile, "%s", enc->stats_out);
@@ -1551,7 +1553,7 @@ static int check_output_constraints(InputStream *ist,
OutputStream *ost)
if (of->recording_time != INT64_MAX &&
av_compare_ts(ist->pts, AV_TIME_BASE_Q, of->recording_time +
of->start_time,
- (AVRational){1, 1000000}) >= 0) {
+ (AVRational) {1, 1000000}) >= 0) {
ost->is_past_recording_time = 1;
return 0;
}
@@ -1595,7 +1597,7 @@ static void do_streamcopy(InputStream *ist, OutputStream
*ost, const AVPacket *p
opkt.flags = pkt->flags;
//FIXME remove the following 2 lines they shall be replaced by the
bitstream filters
- if( ost->st->codec->codec_id != CODEC_ID_H264
+ if ( ost->st->codec->codec_id != CODEC_ID_H264
&& ost->st->codec->codec_id != CODEC_ID_MPEG1VIDEO
&& ost->st->codec->codec_id != CODEC_ID_MPEG2VIDEO
) {
@@ -1870,9 +1872,9 @@ static int output_packet(InputStream *ist,
avpkt = *pkt;
}
- if(pkt->dts != AV_NOPTS_VALUE)
+ if (pkt->dts != AV_NOPTS_VALUE)
ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base,
AV_TIME_BASE_Q);
- if(pkt->pts != AV_NOPTS_VALUE)
+ if (pkt->pts != AV_NOPTS_VALUE)
pkt_pts = av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q);
//while we have more to decode or while the decoder did output something
on EOF
@@ -1888,7 +1890,7 @@ static int output_packet(InputStream *ist,
ist->showed_multi_packet_warning = 1;
}
- switch(ist->st->codec->codec_type) {
+ switch (ist->st->codec->codec_type) {
case AVMEDIA_TYPE_AUDIO:
ret = transcode_audio (ist, &avpkt, &got_output);
break;
@@ -2084,9 +2086,9 @@ static int transcode_init(OutputFile *output_files,
} else
codec->time_base = ist->st->time_base;
- switch(codec->codec_type) {
+ switch (codec->codec_type) {
case AVMEDIA_TYPE_AUDIO:
- if(audio_volume != 256) {
+ if (audio_volume != 256) {
av_log(NULL, AV_LOG_FATAL, "-acodec copy and -vol are
incompatible (frames are not decoded)\n");
exit_program(1);
}
@@ -2107,7 +2109,7 @@ static int transcode_init(OutputFile *output_files,
ost->st->sample_aspect_ratio =
ist->st->sample_aspect_ratio.num ?
ist->st->sample_aspect_ratio :
ist->st->codec->sample_aspect_ratio.num ?
- ist->st->codec->sample_aspect_ratio : (AVRational){0,
1};
+ ist->st->codec->sample_aspect_ratio : (AVRational) {0,
1};
}
break;
case AVMEDIA_TYPE_SUBTITLE:
@@ -2127,7 +2129,7 @@ static int transcode_init(OutputFile *output_files,
ist->decoding_needed = 1;
ost->encoding_needed = 1;
- switch(codec->codec_type) {
+ switch (codec->codec_type) {
case AVMEDIA_TYPE_AUDIO:
ost->fifo = av_fifo_alloc(1024);
if (!ost->fifo) {
@@ -2138,7 +2140,7 @@ static int transcode_init(OutputFile *output_files,
if (!codec->sample_rate)
codec->sample_rate = icodec->sample_rate;
choose_sample_rate(ost->st, ost->enc);
- codec->time_base = (AVRational){1, codec->sample_rate};
+ codec->time_base = (AVRational) {1, codec->sample_rate};
if (codec->sample_fmt == AV_SAMPLE_FMT_NONE)
codec->sample_fmt = icodec->sample_fmt;
@@ -2177,7 +2179,7 @@ static int transcode_init(OutputFile *output_files,
if (ost->video_resample) {
#if !CONFIG_AVFILTER
avcodec_get_frame_defaults(&ost->pict_tmp);
- if(avpicture_alloc((AVPicture*)&ost->pict_tmp,
codec->pix_fmt,
+ if (avpicture_alloc((AVPicture*)&ost->pict_tmp,
codec->pix_fmt,
codec->width, codec->height)) {
av_log(NULL, AV_LOG_FATAL, "Cannot allocate temp
picture, check pix fmt\n");
exit_program(1);
@@ -2195,7 +2197,7 @@ static int transcode_init(OutputFile *output_files,
exit_program(1);
}
#endif
- codec->bits_per_raw_sample= 0;
+ codec->bits_per_raw_sample = 0;
}
ost->resample_height = icodec->height;
@@ -2203,12 +2205,12 @@ static int transcode_init(OutputFile *output_files,
ost->resample_pix_fmt = icodec->pix_fmt;
if (!ost->frame_rate.num)
- ost->frame_rate = ist->st->r_frame_rate.num ?
ist->st->r_frame_rate : (AVRational){25,1};
+ ost->frame_rate = ist->st->r_frame_rate.num ?
ist->st->r_frame_rate : (AVRational) {25,1};
if (ost->enc && ost->enc->supported_framerates &&
!ost->force_fps) {
int idx = av_find_nearest_q_idx(ost->frame_rate,
ost->enc->supported_framerates);
ost->frame_rate = ost->enc->supported_framerates[idx];
}
- codec->time_base = (AVRational){ost->frame_rate.den,
ost->frame_rate.num};
+ codec->time_base = (AVRational) {ost->frame_rate.den,
ost->frame_rate.num};
#if CONFIG_AVFILTER
if (configure_video_filters(ist, ost)) {
@@ -2251,7 +2253,7 @@ static int transcode_init(OutputFile *output_files,
}
}
}
- if(codec->codec_type == AVMEDIA_TYPE_VIDEO){
+ if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {
int size = codec->width * codec->height;
bit_buffer_size = FFMAX(bit_buffer_size, 6*size + 200);
}
@@ -2416,7 +2418,7 @@ static int transcode(OutputFile *output_files,
timer_start = av_gettime();
- for(; received_sigterm == 0;) {
+ for (; received_sigterm == 0;) {
int file_index, ist_index;
AVPacket pkt;
int64_t ipts_min;
@@ -2441,14 +2443,14 @@ static int transcode(OutputFile *output_files,
continue;
opts = ost->st->pts.val * av_q2d(ost->st->time_base);
ipts = ist->pts;
- if (!input_files[ist->file_index].eof_reached){
- if(ipts < ipts_min) {
+ if (!input_files[ist->file_index].eof_reached) {
+ if (ipts < ipts_min) {
ipts_min = ipts;
- if(input_sync ) file_index = ist->file_index;
+ if (input_sync ) file_index = ist->file_index;
}
- if(opts < opts_min) {
+ if (opts < opts_min) {
opts_min = opts;
- if(!input_sync) file_index = ist->file_index;
+ if (!input_sync) file_index = ist->file_index;
}
}
if (ost->frame_number >= ost->max_frames) {
@@ -2460,7 +2462,7 @@ static int transcode(OutputFile *output_files,
}
/* if none, if is finished */
if (file_index < 0) {
- if(no_packet_count){
+ if (no_packet_count) {
no_packet_count=0;
memset(no_packet, 0, nb_input_files);
usleep(10000);
@@ -2472,7 +2474,7 @@ static int transcode(OutputFile *output_files,
/* read a frame from it and output it in the fifo */
is = input_files[file_index].ctx;
ret= av_read_frame(is, &pkt);
- if(ret == AVERROR(EAGAIN)){
+ if (ret == AVERROR(EAGAIN)) {
no_packet[file_index]=1;
no_packet_count++;
continue;
@@ -2506,22 +2508,22 @@ static int transcode(OutputFile *output_files,
if (pkt.pts != AV_NOPTS_VALUE)
pkt.pts += av_rescale_q(input_files[ist->file_index].ts_offset,
AV_TIME_BASE_Q, ist->st->time_base);
- if(pkt.pts != AV_NOPTS_VALUE)
+ if (pkt.pts != AV_NOPTS_VALUE)
pkt.pts *= ist->ts_scale;
- if(pkt.dts != AV_NOPTS_VALUE)
+ if (pkt.dts != AV_NOPTS_VALUE)
pkt.dts *= ist->ts_scale;
// fprintf(stderr, "next:%"PRId64" dts:%"PRId64" off:%"PRId64" %d\n",
ist->next_pts, pkt.dts, input_files[ist->file_index].ts_offset,
ist->st->codec->codec_type);
if (pkt.dts != AV_NOPTS_VALUE && ist->next_pts != AV_NOPTS_VALUE
&& (is->iformat->flags & AVFMT_TS_DISCONT)) {
int64_t pkt_dts= av_rescale_q(pkt.dts, ist->st->time_base,
AV_TIME_BASE_Q);
- int64_t delta= pkt_dts - ist->next_pts;
- if((FFABS(delta) > 1LL*dts_delta_threshold*AV_TIME_BASE ||
pkt_dts+1<ist->pts)&& !copy_ts){
+ int64_t delta = pkt_dts - ist->next_pts;
+ if ((FFABS(delta) > 1LL*dts_delta_threshold*AV_TIME_BASE ||
pkt_dts+1<ist->pts)&& !copy_ts) {
input_files[ist->file_index].ts_offset -= delta;
av_log(NULL, AV_LOG_DEBUG, "timestamp discontinuity %"PRId64",
new offset= %"PRId64"\n",
delta, input_files[ist->file_index].ts_offset);
pkt.dts-= av_rescale_q(delta, AV_TIME_BASE_Q,
ist->st->time_base);
- if(pkt.pts != AV_NOPTS_VALUE)
+ if (pkt.pts != AV_NOPTS_VALUE)
pkt.pts-= av_rescale_q(delta, AV_TIME_BASE_Q,
ist->st->time_base);
}
}
@@ -2556,7 +2558,7 @@ static int transcode(OutputFile *output_files,
term_exit();
/* write the trailer if needed and close file */
- for(i=0;i<nb_output_files;i++) {
+ for (i = 0; i < nb_output_files; i++) {
os = output_files[i].ctx;
av_write_trailer(os);
}
@@ -2868,11 +2870,11 @@ static AVCodec *find_codec_or_die(const char *name,
enum AVMediaType type, int e
codec = encoder ?
avcodec_find_encoder_by_name(name) :
avcodec_find_decoder_by_name(name);
- if(!codec) {
+ if (!codec) {
av_log(NULL, AV_LOG_FATAL, "Unknown %s '%s'\n", codec_string, name);
exit_program(1);
}
- if(codec->type != type) {
+ if (codec->type != type) {
av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string,
name);
exit_program(1);
}
@@ -2920,7 +2922,7 @@ static void add_input_streams(OptionsContext *o,
AVFormatContext *ic)
switch (dec->codec_type) {
case AVMEDIA_TYPE_AUDIO:
if (o->audio_disable)
- st->discard= AVDISCARD_ALL;
+ st->discard = AVDISCARD_ALL;
break;
case AVMEDIA_TYPE_VIDEO:
rfps = ic->streams[i]->r_frame_rate.num;
@@ -2939,9 +2941,9 @@ static void add_input_streams(OptionsContext *o,
AVFormatContext *ic)
}
if (o->video_disable)
- st->discard= AVDISCARD_ALL;
- else if(video_discard)
- st->discard= video_discard;
+ st->discard = AVDISCARD_ALL;
+ else if (video_discard)
+ st->discard = video_discard;
break;
case AVMEDIA_TYPE_DATA:
break;
@@ -3321,12 +3323,12 @@ static void parse_matrix_coeffs(uint16_t *dest, const
char *str)
{
int i;
const char *p = str;
- for(i = 0;; i++) {
+ for (i = 0;; i++) {
dest[i] = atoi(p);
- if(i == 63)
+ if (i == 63)
break;
p = strchr(p, ',');
- if(!p) {
+ if (!p) {
av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff
%d\n", str, i);
exit_program(1);
}
@@ -3392,33 +3394,33 @@ static OutputStream *new_video_stream(OptionsContext
*o, AVFormatContext *oc)
}
MATCH_PER_STREAM_OPT(rc_overrides, str, p, oc, st);
- for(i=0; p; i++){
+ for (i = 0; p; i++) {
int start, end, q;
- int e=sscanf(p, "%d,%d,%d", &start, &end, &q);
- if(e!=3){
+ int e = sscanf(p, "%d,%d,%d", &start, &end, &q);
+ if (e != 3) {
av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n");
exit_program(1);
}
- 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].start_frame = start;
video_enc->rc_override[i].end_frame = end;
- if(q>0){
- video_enc->rc_override[i].qscale= q;
+ 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;
+ else {
+ video_enc->rc_override[i].qscale = 0;
+ video_enc->rc_override[i].quality_factor = -q/100.0;
}
- p= strchr(p, '/');
- if(p) p++;
+ p = strchr(p, '/');
+ if (p) p++;
}
- video_enc->rc_override_count=i;
+ video_enc->rc_override_count = i;
if (!video_enc->rc_initial_buffer_occupancy)
video_enc->rc_initial_buffer_occupancy =
video_enc->rc_buffer_size*3/4;
- video_enc->intra_dc_precision= intra_dc_precision - 8;
+ video_enc->intra_dc_precision = intra_dc_precision - 8;
/* two pass mode */
if (do_pass) {
@@ -3950,34 +3952,34 @@ static int opt_target(OptionsContext *o, const char
*opt, const char *arg)
enum { PAL, NTSC, FILM, UNKNOWN } norm = UNKNOWN;
static const char *const frame_rates[] = {"25", "30000/1001",
"24000/1001"};
- if(!strncmp(arg, "pal-", 4)) {
+ if (!strncmp(arg, "pal-", 4)) {
norm = PAL;
arg += 4;
- } else if(!strncmp(arg, "ntsc-", 5)) {
+ } else if (!strncmp(arg, "ntsc-", 5)) {
norm = NTSC;
arg += 5;
- } else if(!strncmp(arg, "film-", 5)) {
+ } else if (!strncmp(arg, "film-", 5)) {
norm = FILM;
arg += 5;
} else {
/* Try to determine PAL/NTSC by peeking in the input files */
- if(nb_input_files) {
+ if (nb_input_files) {
int i, j, fr;
for (j = 0; j < nb_input_files; j++) {
for (i = 0; i < input_files[j].nb_streams; i++) {
AVCodecContext *c = input_files[j].ctx->streams[i]->codec;
- if(c->codec_type != AVMEDIA_TYPE_VIDEO)
+ if (c->codec_type != AVMEDIA_TYPE_VIDEO)
continue;
fr = c->time_base.den * 1000 / c->time_base.num;
- if(fr == 25000) {
+ if (fr == 25000) {
norm = PAL;
break;
- } else if((fr == 29970) || (fr == 23976)) {
+ } else if ((fr == 29970) || (fr == 23976)) {
norm = NTSC;
break;
}
}
- if(norm != UNKNOWN)
+ if (norm != UNKNOWN)
break;
}
}
@@ -3985,14 +3987,14 @@ static int opt_target(OptionsContext *o, const char
*opt, const char *arg)
av_log(NULL, AV_LOG_INFO, "Assuming %s for target.\n", norm == PAL
? "PAL" : "NTSC");
}
- if(norm == UNKNOWN) {
+ if (norm == UNKNOWN) {
av_log(NULL, AV_LOG_FATAL, "Could not determine norm
(PAL/NTSC/NTSC-Film) for target.\n");
av_log(NULL, AV_LOG_FATAL, "Please prefix target with \"pal-\",
\"ntsc-\" or \"film-\",\n");
av_log(NULL, AV_LOG_FATAL, "or set a framerate with \"-r xxx\".\n");
exit_program(1);
}
- if(!strcmp(arg, "vcd")) {
+ if (!strcmp(arg, "vcd")) {
opt_video_codec(o, "c:v", "mpeg1video");
opt_audio_codec(o, "c:a", "mp2");
parse_option(o, "f", "vcd", options);
@@ -4019,7 +4021,7 @@ static int opt_target(OptionsContext *o, const char *opt,
const char *arg)
been written before.
So the real data starts at SCR 36000+3*1200. */
o->mux_preload = (36000+3*1200) / 90000.0; //0.44
- } else if(!strcmp(arg, "svcd")) {
+ } else if (!strcmp(arg, "svcd")) {
opt_video_codec(o, "c:v", "mpeg2video");
opt_audio_codec(o, "c:a", "mp2");
@@ -4041,7 +4043,7 @@ static int opt_target(OptionsContext *o, const char *opt,
const char *arg)
opt_default("packetsize", "2324");
- } else if(!strcmp(arg, "dvd")) {
+ } else if (!strcmp(arg, "dvd")) {
opt_video_codec(o, "c:v", "mpeg2video");
opt_audio_codec(o, "c:a", "ac3");
@@ -4062,7 +4064,7 @@ static int opt_target(OptionsContext *o, const char *opt,
const char *arg)
opt_default("b:a", "448000");
parse_option(o, "ar", "48000", options);
- } else if(!strncmp(arg, "dv", 2)) {
+ } else if (!strncmp(arg, "dv", 2)) {
parse_option(o, "f", "dv", options);
@@ -4084,7 +4086,7 @@ static int opt_target(OptionsContext *o, const char *opt,
const char *arg)
static int opt_vstats_file(const char *opt, const char *arg)
{
av_free (vstats_filename);
- vstats_filename=av_strdup (arg);
+ vstats_filename = av_strdup (arg);
return 0;
}
@@ -4272,7 +4274,7 @@ int main(int argc, char **argv)
/* parse options */
parse_options(&o, argc, argv, options, opt_output_file);
- if(nb_output_files <= 0 && nb_input_files == 0) {
+ if (nb_output_files <= 0 && nb_input_files == 0) {
show_usage();
av_log(NULL, AV_LOG_WARNING, "Use -h to get full help or, even better,
run 'man %s'\n", program_name);
exit_program(1);
--
1.7.4.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
