har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg_filter: make OutputFile.width,height private

Browse Source 
They are not used outside of the filtering code.
This commit is contained in:
Anton Khirnov 2023-07-06 17:09:59 +02:00
parent c19aa9c28f
commit a3ab5bf80d
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fftools/ffmpeg.h
View File

@ -294,9 +294,6 @@ typedef struct OutputFilter {
enum AVMediaType type; enum AVMediaType type;
/* desired output stream properties */
int width, height;
// those are only set if no format is specified and the encoder gives us multiple options // those are only set if no format is specified and the encoder gives us multiple options
// They point directly to the relevant lists of the encoder. // They point directly to the relevant lists of the encoder.
const int *formats; const int *formats;

14
fftools/ffmpeg_filter.c
View File

@ -138,6 +138,7 @@ typedef struct OutputFilterPriv {
/* desired output stream properties */ /* desired output stream properties */
int format; int format;
int width, height;
int sample_rate; int sample_rate;
AVChannelLayout ch_layout; AVChannelLayout ch_layout;
} OutputFilterPriv; } OutputFilterPriv;
@ -683,8 +684,8 @@ void ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost)
switch (ost->enc_ctx->codec_type) { switch (ost->enc_ctx->codec_type) {
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
ofilter->width = ost->enc_ctx->width; ofp->width = ost->enc_ctx->width;
ofilter->height = ost->enc_ctx->height; ofp->height = ost->enc_ctx->height;
if (ost->enc_ctx->pix_fmt != AV_PIX_FMT_NONE) { if (ost->enc_ctx->pix_fmt != AV_PIX_FMT_NONE) {
ofp->format = ost->enc_ctx->pix_fmt; ofp->format = ost->enc_ctx->pix_fmt;
} else { } else {
@ -1068,6 +1069,7 @@ static int insert_filter(AVFilterContext **last_filter, int *pad_idx,
static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out)
{ {
OutputFilterPriv *ofp = ofp_from_ofilter(ofilter);
OutputStream *ost = ofilter->ost; OutputStream *ost = ofilter->ost;
OutputFile *of = output_files[ost->file_index]; OutputFile *of = output_files[ost->file_index];
AVFilterContext *last_filter = out->filter_ctx; AVFilterContext *last_filter = out->filter_ctx;
@ -1085,13 +1087,13 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
if (ret < 0) if (ret < 0)
return ret; return ret;
if ((ofilter->width || ofilter->height) && ofilter->ost->autoscale) { if ((ofp->width || ofp->height) && ofilter->ost->autoscale) {
char args[255]; char args[255];
AVFilterContext *filter; AVFilterContext *filter;
const AVDictionaryEntry *e = NULL; const AVDictionaryEntry *e = NULL;
snprintf(args, sizeof(args), "%d:%d", snprintf(args, sizeof(args), "%d:%d",
ofilter->width, ofilter->height); ofp->width, ofp->height);
while ((e = av_dict_iterate(ost->sws_dict, e))) { while ((e = av_dict_iterate(ost->sws_dict, e))) {
av_strlcatf(args, sizeof(args), ":%s=%s", e->key, e->value); av_strlcatf(args, sizeof(args), ":%s=%s", e->key, e->value);
@ -1596,8 +1598,8 @@ static int configure_filtergraph(FilterGraph *fg)
ofp->format = av_buffersink_get_format(sink); ofp->format = av_buffersink_get_format(sink);
ofilter->width = av_buffersink_get_w(sink); ofp->width = av_buffersink_get_w(sink);
ofilter->height = av_buffersink_get_h(sink); ofp->height = av_buffersink_get_h(sink);
ofp->sample_rate = av_buffersink_get_sample_rate(sink); ofp->sample_rate = av_buffersink_get_sample_rate(sink);
av_channel_layout_uninit(&ofp->ch_layout); av_channel_layout_uninit(&ofp->ch_layout);