RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_filter: pass autoscale through OutputFilterOptions 

Do not read it from OutputStream directly.

Will allow decoupling filtering from encoding in future commits.
This commit is contained in:
Anton Khirnov 2024-04-02 13:58:59 +02:00
parent b8e6802023
commit 83304f7c1f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.h
View File

@ -267,6 +267,7 @@ enum OFilterFlags {
OFILTER_FLAG_DISABLE_CONVERT = (1 << 0), OFILTER_FLAG_DISABLE_CONVERT = (1 << 0),
// produce 24-bit audio // produce 24-bit audio
OFILTER_FLAG_AUDIO_24BIT = (1 << 1), OFILTER_FLAG_AUDIO_24BIT = (1 << 1),
OFILTER_FLAG_AUTOSCALE = (1 << 2),
}; };
typedef struct OutputFilterOptions { typedef struct OutputFilterOptions {
@ -565,7 +566,6 @@ typedef struct OutputStream {
#if FFMPEG_OPT_TOP #if FFMPEG_OPT_TOP
int top_field_first; int top_field_first;
#endif #endif
int autoscale;
int bitexact; int bitexact;
int bits_per_raw_sample; int bits_per_raw_sample;

2
fftools/ffmpeg_filter.c
View File

@ -1366,7 +1366,7 @@ static int configure_output_video_filter(FilterGraph *fg, AVFilterGraph *graph,
if (ret < 0) if (ret < 0)
return ret; return ret;
if ((ofp->width || ofp->height) && ofilter->ost->autoscale) { if ((ofp->width || ofp->height) && (ofp->flags & OFILTER_FLAG_AUTOSCALE)) {
char args[255]; char args[255];
AVFilterContext *filter; AVFilterContext *filter;
const AVDictionaryEntry *e = NULL; const AVDictionaryEntry *e = NULL;

7
fftools/ffmpeg_mux_init.c
View File

@ -1045,7 +1045,7 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type,
OutputStream *ost; OutputStream *ost;
const AVCodec *enc; const AVCodec *enc;
AVStream *st; AVStream *st;
int ret = 0, keep_pix_fmt = 0; int ret = 0, keep_pix_fmt = 0, autoscale = 1;
AVRational enc_tb = { 0, 0 }; AVRational enc_tb = { 0, 0 };
enum VideoSyncMethod vsync_method = VSYNC_AUTO; enum VideoSyncMethod vsync_method = VSYNC_AUTO;
const char *bsfs = NULL, *time_base = NULL; const char *bsfs = NULL, *time_base = NULL;
@ -1170,8 +1170,8 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type,
return ret; return ret;
MATCH_PER_STREAM_OPT(presets, str, preset, oc, st); MATCH_PER_STREAM_OPT(presets, str, preset, oc, st);
ost->autoscale = 1;
MATCH_PER_STREAM_OPT(autoscale, i, ost->autoscale, oc, st); MATCH_PER_STREAM_OPT(autoscale, i, autoscale, oc, st);
if (preset && (!(ret = get_preset_file_2(preset, enc->codec->name, &s)))) { if (preset && (!(ret = get_preset_file_2(preset, enc->codec->name, &s)))) {
AVBPrint bprint; AVBPrint bprint;
av_bprint_init(&bprint, 0, AV_BPRINT_SIZE_UNLIMITED); av_bprint_init(&bprint, 0, AV_BPRINT_SIZE_UNLIMITED);
@ -1392,6 +1392,7 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type,
.ts_offset = mux->of.start_time == AV_NOPTS_VALUE ? .ts_offset = mux->of.start_time == AV_NOPTS_VALUE ?
0 : mux->of.start_time, 0 : mux->of.start_time,
.flags = OFILTER_FLAG_DISABLE_CONVERT * !!keep_pix_fmt | .flags = OFILTER_FLAG_DISABLE_CONVERT * !!keep_pix_fmt |
OFILTER_FLAG_AUTOSCALE * !!autoscale |
OFILTER_FLAG_AUDIO_24BIT * !!(av_get_exact_bits_per_sample(ost->enc_ctx->codec_id) == 24), OFILTER_FLAG_AUDIO_24BIT * !!(av_get_exact_bits_per_sample(ost->enc_ctx->codec_id) == 24),
}; };