Commit b5e0e327 authored by Michael Niedermayer's avatar Michael Niedermayer

ffmpeg: fix swr filter_type for auto inserted aresample filters

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 4bd6d73f
...@@ -326,6 +326,7 @@ typedef struct OutputStream { ...@@ -326,6 +326,7 @@ typedef struct OutputStream {
char *avfilter; char *avfilter;
int64_t sws_flags; int64_t sws_flags;
int64_t swr_filter_type;
int64_t swr_dither_method; int64_t swr_dither_method;
double swr_dither_scale; double swr_dither_scale;
AVDictionary *opts; AVDictionary *opts;
......
...@@ -727,6 +727,8 @@ int configure_filtergraph(FilterGraph *fg) ...@@ -727,6 +727,8 @@ int configure_filtergraph(FilterGraph *fg)
fg->graph->scale_sws_opts = av_strdup(args); fg->graph->scale_sws_opts = av_strdup(args);
args[0] = 0; args[0] = 0;
if (ost->swr_filter_type != SWR_FILTER_TYPE_KAISER)
av_strlcatf(args, sizeof(args), "filter_type=%d:", (int)ost->swr_filter_type);
if (ost->swr_dither_method) if (ost->swr_dither_method)
av_strlcatf(args, sizeof(args), "dither_method=%d:", (int)ost->swr_dither_method); av_strlcatf(args, sizeof(args), "dither_method=%d:", (int)ost->swr_dither_method);
if (ost->swr_dither_scale != 1.0) if (ost->swr_dither_scale != 1.0)
......
...@@ -1015,6 +1015,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e ...@@ -1015,6 +1015,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER; st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
av_opt_get_int(sws_opts, "sws_flags", 0, &ost->sws_flags); av_opt_get_int(sws_opts, "sws_flags", 0, &ost->sws_flags);
av_opt_get_int (swr_opts, "filter_type" , 0, &ost->swr_filter_type);
av_opt_get_int (swr_opts, "dither_method", 0, &ost->swr_dither_method); av_opt_get_int (swr_opts, "dither_method", 0, &ost->swr_dither_method);
av_opt_get_double(swr_opts, "dither_scale" , 0, &ost->swr_dither_scale); av_opt_get_double(swr_opts, "dither_scale" , 0, &ost->swr_dither_scale);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment