MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fftools/ffmpeg_filter: stop accessing encoder AVCodecContext 

Pass all the necessary value through OutputFilterOptions.

Will allow decoupling filtering from encoding in future commits.
This commit is contained in:
Anton Khirnov 2024-04-01 06:29:16 +02:00
parent 17702c5f7b
commit bc206ed1b3
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fftools/ffmpeg.h
View File

@ -282,6 +282,13 @@ typedef struct OutputFilterOptions {
// A combination of OFilterFlags.
unsigned flags;
int format;
int width;
int height;
int sample_rate;
AVChannelLayout ch_layout;
} OutputFilterOptions;
typedef struct InputFilter {

22
fftools/ffmpeg_filter.c
View File

@ -782,12 +782,12 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost,
ofp->ts_offset = opts->ts_offset;
ofp->enc_timebase = opts->output_tb;
switch (ost->enc_ctx->codec_type) {
switch (ofilter->type) {
case AVMEDIA_TYPE_VIDEO:
ofp->width = ost->enc_ctx->width;
ofp->height = ost->enc_ctx->height;
if (ost->enc_ctx->pix_fmt != AV_PIX_FMT_NONE) {
ofp->format = ost->enc_ctx->pix_fmt;
ofp->width = opts->width;
ofp->height = opts->height;
if (opts->format != AV_PIX_FMT_NONE) {
ofp->format = opts->format;
} else if (opts->pix_fmts)
ofp->formats = opts->pix_fmts;
else if (opts->enc)
@ -812,19 +812,19 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost,
break;
case AVMEDIA_TYPE_AUDIO:
if (ost->enc_ctx->sample_fmt != AV_SAMPLE_FMT_NONE) {
ofp->format = ost->enc_ctx->sample_fmt;
if (opts->format != AV_SAMPLE_FMT_NONE) {
ofp->format = opts->format;
} else if (opts->enc) {
ofp->formats = opts->enc->sample_fmts;
}
if (ost->enc_ctx->sample_rate) {
ofp->sample_rate = ost->enc_ctx->sample_rate;
if (opts->sample_rate) {
ofp->sample_rate = opts->sample_rate;
} else if (opts->enc) {
ofp->sample_rates = opts->enc->supported_samplerates;
}
if (ost->enc_ctx->ch_layout.nb_channels) {
if (opts->ch_layout.nb_channels) {
int ret = set_channel_layout(ofp, opts->enc ? opts->enc->ch_layouts : NULL,
&ost->enc_ctx->ch_layout);
&opts->ch_layout);
if (ret < 0)
return ret;
} else if (opts->enc) {

6
fftools/ffmpeg_mux_init.c
View File

@ -1378,6 +1378,12 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type,
(type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) {
OutputFilterOptions opts = {
.enc = enc,
.format = (type == AVMEDIA_TYPE_VIDEO) ?
ost->enc_ctx->pix_fmt : ost->enc_ctx->sample_fmt,
.width = ost->enc_ctx->width,
.height = ost->enc_ctx->height,
.sample_rate = ost->enc_ctx->sample_rate,
.ch_layout = ost->enc_ctx->ch_layout,
.output_tb = enc_tb,
.ts_offset = mux->of.start_time == AV_NOPTS_VALUE ?
0 : mux->of.start_time,