From f4bf04572d3749217a0ea15283eb797d9293a5ae Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Thu, 17 Apr 2014 23:35:58 +0000 Subject: [PATCH] aacdec: Rename buffer variables. The naming of the three buffers was inconsistent. This patch unifies the names. --- aacdec_filter.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/aacdec_filter.c b/aacdec_filter.c index c8299846..25e3c7ec 100644 --- a/aacdec_filter.c +++ b/aacdec_filter.c @@ -97,8 +97,7 @@ static int aacdec_post_select(__a_unused struct sched *s, void *context) struct btr_node *btrn = fn->btrn; struct private_aacdec_data *padd = fn->private_data; int i, ret; - char *inbuf, *outbuffer; - char *btr_buf; + char *inbuf, *outbuf, *btrbuf; size_t len, consumed, loaded; next_buffer: @@ -132,7 +131,7 @@ next_buffer: goto success; //PARA_CRIT_LOG("consumed: %zu (%zu + %zu), have: %zu\n", padd->consumed_total + consumed, // padd->consumed_total, consumed, len - consumed); - outbuffer = NeAACDecDecode(padd->handle, &padd->frame_info, + outbuf = NeAACDecDecode(padd->handle, &padd->frame_info, (unsigned char *)inbuf + consumed, len - consumed); if (padd->frame_info.error) { int err = padd->frame_info.error; @@ -154,14 +153,14 @@ next_buffer: consumed += padd->frame_info.bytesconsumed; if (!padd->frame_info.samples) goto success; - btr_buf = para_malloc(2 * padd->frame_info.samples); + btrbuf = para_malloc(2 * padd->frame_info.samples); loaded = 0; for (i = 0; i < padd->frame_info.samples; i++) { - short sh = ((short *)outbuffer)[i]; - write_int16_host_endian(btr_buf + loaded, sh); + short sh = ((short *)outbuf)[i]; + write_int16_host_endian(btrbuf + loaded, sh); loaded += 2; } - btr_add_output(btr_buf, loaded, btrn); + btr_add_output(btrbuf, loaded, btrn); success: ret = consumed; padd->consumed_total += ret; -- 2.39.5