X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=opusdec_filter.c;h=85287be0c813d4899b2f802735f2684338ea420c;hb=6bbc7c29dd69ed34ef90dac72951abbfd7cc1877;hp=942cce37fc5de28676cb2b099b397c39b3f74da0;hpb=26a032fffa6c6e6f092ed3d14c2b5f08e5c736d6;p=paraslash.git

diff --git a/opusdec_filter.c b/opusdec_filter.c
index 942cce37..85287be0 100644
--- a/opusdec_filter.c
+++ b/opusdec_filter.c
@@ -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,
 };