X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=opusdec_filter.c;h=f36990faf43a4110c8e7f7dc2f822f5a8e09046c;hb=refs%2Fheads%2Fnext;hp=31f9640bbb915fc11ff1665c84fae0a61b902645;hpb=e3a7e12639c34fd86d48a072beb48add8c498d09;p=paraslash.git

diff --git a/opusdec_filter.c b/opusdec_filter.c
index 31f9640b..504ba0e8 100644
--- a/opusdec_filter.c
+++ b/opusdec_filter.c
@@ -75,7 +75,7 @@ struct opusdec_context {
 	ogg_int32_t opus_serialno;
 };
 
-static int opusdec_execute(struct btr_node *btrn, const char *cmd,
+static int opusdec_execute(const struct btr_node *btrn, const char *cmd,
 		char **result)
 {
 	struct filter_node *fn = btr_context(btrn);
@@ -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;
@@ -153,7 +153,7 @@ static void opusdec_add_output(short *pcm, int frames_available,
 
 	if (tmp_skip > 0) {
 		short *in = pcm + ctx->channels * tmp_skip;
-		short *out = para_malloc(bytes);
+		short *out = alloc(bytes);
 		memcpy(out, in, bytes);
 		free(pcm);
 		pcm = out;
@@ -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 = para_malloc(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) {
@@ -217,7 +217,7 @@ static int opusdec_post_monitor(__a_unused struct sched *s, void *context)
 
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0) {
-		if (ret != -E_BTR_EOF) /* fatal error */
+		if (ret != -E_EOF) /* fatal error */
 			goto out;
 		if (!ctx->have_more) /* EOF */
 			goto out;