RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-01 22:49:21 +00:00
Code Issues Projects Releases Wiki Activity

af_ashowinfo: integrate config_input() in filter_samples.

Browse Source 
This is simpler and also should allow the code to function when the
channel number changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-30 18:59:19 +01:00
parent 674c4a11cb
commit 5cac0656a3
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavfilter/af_ashowinfo.c
View File

@ -48,17 +48,6 @@ typedef struct AShowInfoContext {
uint64_t frame; uint64_t frame;
} AShowInfoContext; } AShowInfoContext;
static int config_input(AVFilterLink *inlink)
{
AShowInfoContext *s = inlink->dst->priv;
int channels = av_get_channel_layout_nb_channels(inlink->channel_layout);
s->plane_checksums = av_malloc(channels * sizeof(*s->plane_checksums));
if (!s->plane_checksums)
return AVERROR(ENOMEM);
return 0;
}
static void uninit(AVFilterContext *ctx) static void uninit(AVFilterContext *ctx)
{ {
AShowInfoContext *s = ctx->priv; AShowInfoContext *s = ctx->priv;
@ -77,6 +66,11 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf)
int data_size = buf->audio->nb_samples * block_align; int data_size = buf->audio->nb_samples * block_align;
int planes = planar ? channels : 1; int planes = planar ? channels : 1;
int i; int i;
void *tmp_ptr = av_realloc(s->plane_checksums, channels * sizeof(*s->plane_checksums));
if (!tmp_ptr)
return AVERROR(ENOMEM);
s->plane_checksums = tmp_ptr;
for (i = 0; i < planes; i++) { for (i = 0; i < planes; i++) {
uint8_t *data = buf->extended_data[i]; uint8_t *data = buf->extended_data[i];
@ -114,7 +108,6 @@ static const AVFilterPad inputs[] = {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.get_audio_buffer = ff_null_get_audio_buffer, .get_audio_buffer = ff_null_get_audio_buffer,
.config_props = config_input,
.filter_samples = filter_samples, .filter_samples = filter_samples,
.min_perms = AV_PERM_READ, .min_perms = AV_PERM_READ,
}, },