Skip to content

F
ffmpeg
Commit 13b965ea authored by Nicolas George's avatar Nicolas George
Browse files
Options

ffmpeg: reindent after last commit.

parent 429c6cab
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 62 deletions
ffmpeg.c
View file @ 13b965ea
...@@ -963,76 +963,75 @@ static int reap_filters(void) ...@@ -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)
continue;
if (!ost->filtered_frame && !(ost->filtered_frame = avcodec_alloc_frame())) { if (!ost->filter)
return AVERROR(ENOMEM); continue;
} else
avcodec_get_frame_defaults(ost->filtered_frame);
filtered_frame = ost->filtered_frame;
while (1) { if (!ost->filtered_frame && !(ost->filtered_frame = avcodec_alloc_frame())) {
ret = av_buffersink_get_buffer_ref(ost->filter->filter, &picref, return AVERROR(ENOMEM);
AV_BUFFERSINK_FLAG_NO_REQUEST); } else
if (ret < 0) { avcodec_get_frame_defaults(ost->filtered_frame);
if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) { filtered_frame = ost->filtered_frame;
char buf[256];
av_strerror(ret, buf, sizeof(buf)); while (1) {
av_log(NULL, AV_LOG_WARNING, ret = av_buffersink_get_buffer_ref(ost->filter->filter, &picref,
"Error in av_buffersink_get_buffer_ref(): %s\n", buf); AV_BUFFERSINK_FLAG_NO_REQUEST);
} if (ret < 0) {
break; if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
char buf[256];
av_strerror(ret, buf, sizeof(buf));
av_log(NULL, AV_LOG_WARNING,
"Error in av_buffersink_get_buffer_ref(): %s\n", buf);
} }
frame_pts = AV_NOPTS_VALUE; break;
if (picref->pts != AV_NOPTS_VALUE) { }
filtered_frame->pts = frame_pts = av_rescale_q(picref->pts, frame_pts = AV_NOPTS_VALUE;
ost->filter->filter->inputs[0]->time_base, if (picref->pts != AV_NOPTS_VALUE) {
ost->st->codec->time_base) - filtered_frame->pts = frame_pts = av_rescale_q(picref->pts,
av_rescale_q(of->start_time, ost->filter->filter->inputs[0]->time_base,
AV_TIME_BASE_Q, ost->st->codec->time_base) -
ost->st->codec->time_base); av_rescale_q(of->start_time,
AV_TIME_BASE_Q,
if (of->start_time && filtered_frame->pts < 0) { ost->st->codec->time_base);
avfilter_unref_buffer(picref);
continue; 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 //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); 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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment