mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-07-22 20:21:30 +02:00
fftools/ffmpeg: move unconfigured graph handling to ffmpeg_filter
This code more properly belongs there.
This commit is contained in:
parent
c26a6c5a52
commit
dd1c67d539
@ -2018,34 +2018,11 @@ static int transcode_step(OutputStream *ost)
|
|||||||
InputStream *ist = NULL;
|
InputStream *ist = NULL;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (ost->filter && !ost->filter->graph->graph) {
|
if (ost->filter) {
|
||||||
if (ifilter_has_all_input_formats(ost->filter->graph)) {
|
|
||||||
ret = configure_filtergraph(ost->filter->graph);
|
|
||||||
if (ret < 0) {
|
|
||||||
av_log(NULL, AV_LOG_ERROR, "Error reinitializing filters!\n");
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ost->filter && ost->filter->graph->graph) {
|
|
||||||
if ((ret = fg_transcode_step(ost->filter->graph, &ist)) < 0)
|
if ((ret = fg_transcode_step(ost->filter->graph, &ist)) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
if (!ist)
|
if (!ist)
|
||||||
return 0;
|
return 0;
|
||||||
} else if (ost->filter) {
|
|
||||||
int i;
|
|
||||||
for (i = 0; i < ost->filter->graph->nb_inputs; i++) {
|
|
||||||
InputFilter *ifilter = ost->filter->graph->inputs[i];
|
|
||||||
if (!ifilter->ist->got_output && !input_files[ifilter->ist->file_index]->eof_reached) {
|
|
||||||
ist = ifilter->ist;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!ist) {
|
|
||||||
ost->inputs_done = 1;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
ist = ost->ist;
|
ist = ost->ist;
|
||||||
av_assert0(ist);
|
av_assert0(ist);
|
||||||
|
@ -1623,6 +1623,33 @@ int fg_transcode_step(FilterGraph *graph, InputStream **best_ist)
|
|||||||
InputFilter *ifilter;
|
InputFilter *ifilter;
|
||||||
InputStream *ist;
|
InputStream *ist;
|
||||||
|
|
||||||
|
if (!graph->graph && ifilter_has_all_input_formats(graph)) {
|
||||||
|
// graph has not been configured yet, but everything is ready;
|
||||||
|
// this can happen for graphs with no inputs, or when some input
|
||||||
|
// EOF'ed with zero frames and fallback parameters were used
|
||||||
|
ret = configure_filtergraph(graph);
|
||||||
|
if (ret < 0) {
|
||||||
|
av_log(NULL, AV_LOG_ERROR, "Error reinitializing filters!\n");
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!graph->graph) {
|
||||||
|
for (int i = 0; i < graph->nb_inputs; i++) {
|
||||||
|
InputFilter *ifilter = graph->inputs[i];
|
||||||
|
if (!ifilter->ist->got_output && !input_files[ifilter->ist->file_index]->eof_reached) {
|
||||||
|
*best_ist = ifilter->ist;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// graph not configured, but all inputs are either initialized or EOF
|
||||||
|
for (int i = 0; i < graph->nb_outputs; i++)
|
||||||
|
graph->outputs[i]->ost->inputs_done = 1;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
*best_ist = NULL;
|
*best_ist = NULL;
|
||||||
ret = avfilter_graph_request_oldest(graph->graph);
|
ret = avfilter_graph_request_oldest(graph->graph);
|
||||||
if (ret >= 0)
|
if (ret >= 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user