openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-23 19:30:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avfilter/af_volumedetect: Remove dependency on channel layout

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-09-05 21:42:31 +02:00
parent 6d50dff816
commit 0e66dcd733
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/af_volumedetect.c
View File

@ -41,9 +41,19 @@ static int query_formats(AVFilterContext *ctx)
AV_SAMPLE_FMT_NONE AV_SAMPLE_FMT_NONE
}; };
AVFilterFormats *formats; AVFilterFormats *formats;
AVFilterChannelLayouts *layouts;
int ret;
if (!(formats = ff_make_format_list(sample_fmts))) if (!(formats = ff_make_format_list(sample_fmts)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
layouts = ff_all_channel_counts();
if (!layouts)
return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;
return ff_set_common_formats(ctx, formats); return ff_set_common_formats(ctx, formats);
} }
@ -51,9 +61,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *samples)
{ {
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
VolDetectContext *vd = ctx->priv; VolDetectContext *vd = ctx->priv;
int64_t layout = samples->channel_layout;
int nb_samples = samples->nb_samples; int nb_samples = samples->nb_samples;
int nb_channels = av_get_channel_layout_nb_channels(layout); int nb_channels = av_frame_get_channels(samples);
int nb_planes = nb_channels; int nb_planes = nb_channels;
int plane, i; int plane, i;
int16_t *pcm; int16_t *pcm;