RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-14 11:14:44 +00:00
Code Issues Projects Releases Wiki Activity

ffmpeg: reindent after last commit.

Browse Source
This commit is contained in:
Nicolas George 2012-08-19 11:23:59 +02:00
parent 429c6cab1c
commit 13b965ead4
1 changed files with 63 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
ffmpeg.c
View File

@ -963,76 +963,75 @@ static int reap_filters(void)
int i; int i;
int64_t frame_pts; int64_t frame_pts;
/* TODO reindent */ /* Reap all buffers present in the buffer sinks */
/* Reap all buffers present in the buffer sinks */ for (i = 0; i < nb_output_streams; i++) {
for (i = 0; i < nb_output_streams; i++) { OutputStream *ost = output_streams[i];
OutputStream *ost = output_streams[i]; OutputFile *of = output_files[ost->file_index];
OutputFile *of = output_files[ost->file_index]; int ret = 0;
int ret = 0;
if (!ost->filter) if (!ost->filter)
continue; continue;
if (!ost->filtered_frame && !(ost->filtered_frame = avcodec_alloc_frame())) { if (!ost->filtered_frame && !(ost->filtered_frame = avcodec_alloc_frame())) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} else } else
avcodec_get_frame_defaults(ost->filtered_frame); avcodec_get_frame_defaults(ost->filtered_frame);
filtered_frame = ost->filtered_frame; filtered_frame = ost->filtered_frame;
while (1) { while (1) {
ret = av_buffersink_get_buffer_ref(ost->filter->filter, &picref, ret = av_buffersink_get_buffer_ref(ost->filter->filter, &picref,
AV_BUFFERSINK_FLAG_NO_REQUEST); AV_BUFFERSINK_FLAG_NO_REQUEST);
if (ret < 0) { if (ret < 0) {
if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) { if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
char buf[256]; char buf[256];
av_strerror(ret, buf, sizeof(buf)); av_strerror(ret, buf, sizeof(buf));
av_log(NULL, AV_LOG_WARNING, av_log(NULL, AV_LOG_WARNING,
"Error in av_buffersink_get_buffer_ref(): %s\n", buf); "Error in av_buffersink_get_buffer_ref(): %s\n", buf);
}
break;
} }
frame_pts = AV_NOPTS_VALUE; break;
if (picref->pts != AV_NOPTS_VALUE) {
filtered_frame->pts = frame_pts = av_rescale_q(picref->pts,
ost->filter->filter->inputs[0]->time_base,
ost->st->codec->time_base) -
av_rescale_q(of->start_time,
AV_TIME_BASE_Q,
ost->st->codec->time_base);
if (of->start_time && filtered_frame->pts < 0) {
avfilter_unref_buffer(picref);
continue;
}
}
//if (ost->source_index >= 0)
// *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold
switch (ost->filter->filter->inputs[0]->type) {
case AVMEDIA_TYPE_VIDEO:
avfilter_copy_buf_props(filtered_frame, picref);
filtered_frame->pts = frame_pts;
if (!ost->frame_aspect_ratio)
ost->st->codec->sample_aspect_ratio = picref->video->sample_aspect_ratio;
do_video_out(of->ctx, ost, filtered_frame,
same_quant ? ost->last_quality :
ost->st->codec->global_quality);
break;
case AVMEDIA_TYPE_AUDIO:
avfilter_copy_buf_props(filtered_frame, picref);
filtered_frame->pts = frame_pts;
do_audio_out(of->ctx, ost, filtered_frame);
break;
default:
// TODO support subtitle filters
av_assert0(0);
}
avfilter_unref_buffer(picref);
} }
frame_pts = AV_NOPTS_VALUE;
if (picref->pts != AV_NOPTS_VALUE) {
filtered_frame->pts = frame_pts = av_rescale_q(picref->pts,
ost->filter->filter->inputs[0]->time_base,
ost->st->codec->time_base) -
av_rescale_q(of->start_time,
AV_TIME_BASE_Q,
ost->st->codec->time_base);
if (of->start_time && filtered_frame->pts < 0) {
avfilter_unref_buffer(picref);
continue;
}
}
//if (ost->source_index >= 0)
// *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold
switch (ost->filter->filter->inputs[0]->type) {
case AVMEDIA_TYPE_VIDEO:
avfilter_copy_buf_props(filtered_frame, picref);
filtered_frame->pts = frame_pts;
if (!ost->frame_aspect_ratio)
ost->st->codec->sample_aspect_ratio = picref->video->sample_aspect_ratio;
do_video_out(of->ctx, ost, filtered_frame,
same_quant ? ost->last_quality :
ost->st->codec->global_quality);
break;
case AVMEDIA_TYPE_AUDIO:
avfilter_copy_buf_props(filtered_frame, picref);
filtered_frame->pts = frame_pts;
do_audio_out(of->ctx, ost, filtered_frame);
break;
default:
// TODO support subtitle filters
av_assert0(0);
}
avfilter_unref_buffer(picref);
} }
}
return 0; return 0;
} }