highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg_filter: return error codes from ofilter_bind_ost() instead of aborting

Browse Source
This commit is contained in:
Anton Khirnov 2023-07-13 15:11:07 +02:00
parent 6298dd683b
commit ab16e324ea
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.h
View File

@ -743,7 +743,7 @@ void ifilter_sub2video_heartbeat(InputFilter *ifilter, int64_t pts, AVRational t
*/ */
int ifilter_parameters_from_dec(InputFilter *ifilter, const AVCodecContext *dec); int ifilter_parameters_from_dec(InputFilter *ifilter, const AVCodecContext *dec);
void ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost); int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost);
/** /**
* Create a new filtergraph in the global filtergraph list. * Create a new filtergraph in the global filtergraph list.

12
fftools/ffmpeg_filter.c
View File

@ -624,7 +624,7 @@ static void set_channel_layout(OutputFilterPriv *f, OutputStream *ost)
av_channel_layout_default(&f->ch_layout, ost->enc_ctx->ch_layout.nb_channels); av_channel_layout_default(&f->ch_layout, ost->enc_ctx->ch_layout.nb_channels);
} }
void ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost) int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost)
{ {
OutputFilterPriv *ofp = ofp_from_ofilter(ofilter); OutputFilterPriv *ofp = ofp_from_ofilter(ofilter);
FilterGraph *fg = ofilter->graph; FilterGraph *fg = ofilter->graph;
@ -699,15 +699,17 @@ void ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost)
for (int i = 0; i < fg->nb_outputs; i++) for (int i = 0; i < fg->nb_outputs; i++)
if (!fg->outputs[i]->ost) if (!fg->outputs[i]->ost)
return; return 0;
ret = configure_filtergraph(fg); ret = configure_filtergraph(fg);
if (ret < 0) { if (ret < 0) {
av_log(fg, AV_LOG_ERROR, "Error configuring filter graph: %s\n", av_log(fg, AV_LOG_ERROR, "Error configuring filter graph: %s\n",
av_err2str(ret)); av_err2str(ret));
exit_program(1); return ret;
} }
} }
return 0;
} }
static InputFilter *ifilter_alloc(FilterGraph *fg) static InputFilter *ifilter_alloc(FilterGraph *fg)
@ -899,7 +901,9 @@ int init_simple_filtergraph(InputStream *ist, OutputStream *ost,
if (ret < 0) if (ret < 0)
return ret; return ret;
ofilter_bind_ost(fg->outputs[0], ost); ret = ofilter_bind_ost(fg->outputs[0], ost);
if (ret < 0)
return ret;
return 0; return 0;
} }

4
fftools/ffmpeg_mux_init.c
View File

@ -1382,7 +1382,9 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type,
(type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) { (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) {
if (ofilter) { if (ofilter) {
ost->filter = ofilter; ost->filter = ofilter;
ofilter_bind_ost(ofilter, ost); ret = ofilter_bind_ost(ofilter, ost);
if (ret < 0)
return ret;
} else { } else {
ret = init_simple_filtergraph(ost->ist, ost, filters); ret = init_simple_filtergraph(ost->ist, ost, filters);
if (ret < 0) { if (ret < 0) {