X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=opusdec_filter.c;h=85287be0c813d4899b2f802735f2684338ea420c;hb=efee4efb5ba8833d14f75d7f389297164ef41aff;hp=7878b422ad4bb65a584039be38d10bcfd67a36b0;hpb=610cb53b94af8e95326cd44b7845f35cffdb6bf3;p=paraslash.git diff --git a/opusdec_filter.c b/opusdec_filter.c index 7878b422..85287be0 100644 --- a/opusdec_filter.c +++ b/opusdec_filter.c @@ -86,7 +86,7 @@ static int opusdec_execute(struct btr_node *btrn, const char *cmd, static void opusdec_open(struct filter_node *fn) { - struct opusdec_context *ctx = para_calloc(sizeof(*ctx)); + struct opusdec_context *ctx = zalloc(sizeof(*ctx)); ogg_sync_init(&ctx->oy); fn->private_data = ctx; @@ -193,7 +193,7 @@ static int decode_packet(struct opusdec_context *ctx, ogg_packet *op, /* don't care for anything except opus eos */ if (op->e_o_s && ctx->os.serialno == ctx->opus_serialno) ctx->eos = true; - output = alloc(sizeof(short) * MAX_FRAME_SIZE * ctx->channels); + output = arr_alloc(sizeof(short) * ctx->channels, MAX_FRAME_SIZE); ret = opus_multistream_decode(ctx->st, (unsigned char *)op->packet, op->bytes, output, MAX_FRAME_SIZE, 0); if (ret < 0) { @@ -207,7 +207,7 @@ static int decode_packet(struct opusdec_context *ctx, ogg_packet *op, #define OPUSDEC_MAX_OUTPUT_SIZE (1024 * 1024) -static int opusdec_post_select(__a_unused struct sched *s, void *context) +static int opusdec_post_monitor(__a_unused struct sched *s, void *context) { struct filter_node *fn = context; struct opusdec_context *ctx = fn->private_data; @@ -269,7 +269,7 @@ out: return ret; } -static void opusdec_pre_select(struct sched *s, void *context) +static void opusdec_pre_monitor(struct sched *s, void *context) { struct filter_node *fn = context; struct opusdec_context *ctx = fn->private_data; @@ -286,7 +286,7 @@ static void opusdec_pre_select(struct sched *s, void *context) const struct filter lsg_filter_cmd_com_opusdec_user_data = { .open = opusdec_open, .close = opusdec_close, - .pre_select = opusdec_pre_select, - .post_select = opusdec_post_select, + .pre_monitor = opusdec_pre_monitor, + .post_monitor = opusdec_post_monitor, .execute = opusdec_execute, };