virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Anton Khirnov
2023-07-13 15:11:07 +02:00
parent 5ba7aa2ce8
commit cb8242db8d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fftools/ffmpeg_filter.c
View File

@@ -583,7 +583,7 @@ static int ifilter_bind_ist(InputFilter *ifilter, InputStream *ist)
return 0; return 0;
} }
static void set_channel_layout(OutputFilterPriv *f, OutputStream *ost) static int set_channel_layout(OutputFilterPriv *f, OutputStream *ost)
{ {
const AVCodec *c = ost->enc_ctx->codec; const AVCodec *c = ost->enc_ctx->codec;
int i, err; int i, err;
@@ -592,8 +592,8 @@ static void set_channel_layout(OutputFilterPriv *f, OutputStream *ost)
/* Pass the layout through for all orders but UNSPEC */ /* Pass the layout through for all orders but UNSPEC */
err = av_channel_layout_copy(&f->ch_layout, &ost->enc_ctx->ch_layout); err = av_channel_layout_copy(&f->ch_layout, &ost->enc_ctx->ch_layout);
if (err < 0) if (err < 0)
report_and_exit(AVERROR(ENOMEM)); return err;
return; return 0;
} }
/* Requested layout is of order UNSPEC */ /* Requested layout is of order UNSPEC */
@@ -601,7 +601,7 @@ static void set_channel_layout(OutputFilterPriv *f, OutputStream *ost)
/* Use the default native layout for the requested amount of channels when the /* Use the default native layout for the requested amount of channels when the
encoder doesn't have a list of supported layouts */ encoder doesn't have a list of supported layouts */
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);
return; return 0;
} }
/* Encoder has a list of supported layouts. Pick the first layout in it with the /* Encoder has a list of supported layouts. Pick the first layout in it with the
same amount of channels as the requested layout */ same amount of channels as the requested layout */
@@ -613,12 +613,14 @@ static void set_channel_layout(OutputFilterPriv *f, OutputStream *ost)
/* Use it if one is found */ /* Use it if one is found */
err = av_channel_layout_copy(&f->ch_layout, &c->ch_layouts[i]); err = av_channel_layout_copy(&f->ch_layout, &c->ch_layouts[i]);
if (err < 0) if (err < 0)
report_and_exit(AVERROR(ENOMEM)); return err;
return; return 0;
} }
/* If no layout for the amount of channels requested was found, use the default /* If no layout for the amount of channels requested was found, use the default
native layout for it. */ native layout for it. */
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);
return 0;
} }
int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost) int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost)
@@ -682,7 +684,9 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost)
ofp->sample_rates = c->supported_samplerates; ofp->sample_rates = c->supported_samplerates;
} }
if (ost->enc_ctx->ch_layout.nb_channels) { if (ost->enc_ctx->ch_layout.nb_channels) {
set_channel_layout(ofp, ost); int ret = set_channel_layout(ofp, ost);
if (ret < 0)
return ret;
} else if (c->ch_layouts) { } else if (c->ch_layouts) {
ofp->ch_layouts = c->ch_layouts; ofp->ch_layouts = c->ch_layouts;
} }