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

fftools/ffmpeg_filter: consolidate decoder/filter type checks

Browse Source 
Also perform them earlier.
This commit is contained in:
Anton Khirnov
2024-01-10 12:31:58 +01:00
parent b43d4a0692
commit d47bb91f8b
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fftools/ffmpeg_filter.c
View File

@@ -663,6 +663,13 @@ static int ifilter_bind_ist(InputFilter *ifilter, InputStream *ist)
av_assert0(!ifp->ist); av_assert0(!ifp->ist);
if (ifp->type != ist->par->codec_type &&
!(ifp->type == AVMEDIA_TYPE_VIDEO && ist->par->codec_type == AVMEDIA_TYPE_SUBTITLE)) {
av_log(fgp, AV_LOG_ERROR, "Tried to connect %s stream to %s filtergraph input\n",
av_get_media_type_string(ist->par->codec_type), av_get_media_type_string(ifp->type));
return AVERROR(EINVAL);
}
ifp->ist = ist; ifp->ist = ist;
ifp->type_src = ist->st->codecpar->codec_type; ifp->type_src = ist->st->codecpar->codec_type;
@@ -1476,12 +1483,6 @@ static int configure_input_video_filter(FilterGraph *fg, AVFilterGraph *graph,
if (!par) if (!par)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (ist->dec_ctx->codec_type == AVMEDIA_TYPE_AUDIO) {
av_log(fg, AV_LOG_ERROR, "Cannot connect video filter to audio input\n");
ret = AVERROR(EINVAL);
goto fail;
}
if (!fr.num) if (!fr.num)
fr = ist->framerate_guessed; fr = ist->framerate_guessed;
@@ -1598,11 +1599,6 @@ static int configure_input_audio_filter(FilterGraph *fg, AVFilterGraph *graph,
int ret, pad_idx = 0; int ret, pad_idx = 0;
int64_t tsoffset = 0; int64_t tsoffset = 0;
if (ist->dec_ctx->codec_type != AVMEDIA_TYPE_AUDIO) {
av_log(fg, AV_LOG_ERROR, "Cannot connect audio filter to non audio input\n");
return AVERROR(EINVAL);
}
ifp->time_base = (AVRational){ 1, ifp->sample_rate }; ifp->time_base = (AVRational){ 1, ifp->sample_rate };
av_bprint_init(&args, 0, AV_BPRINT_SIZE_AUTOMATIC); av_bprint_init(&args, 0, AV_BPRINT_SIZE_AUTOMATIC);