[FFmpeg-soc] [soc]: r4916 - in amr: amrnbdata.h amrnbdec.c

[cmcq]

Author: cmcq
Date: Mon Aug  3 18:48:05 2009
New Revision: 4916

Log:
Use shorter, more correct names in AMROrder

Modified:
   amr/amrnbdata.h
   amr/amrnbdec.c

Modified: amr/amrnbdata.h
==============================================================================
--- amr/amrnbdata.h	Mon Aug  3 18:13:24 2009	(r4915)
+++ amr/amrnbdata.h	Mon Aug  3 18:48:05 2009	(r4916)
@@ -85,8 +85,8 @@ enum RXFrameType {
 
 // typedef for bit order tables
 typedef struct AMROrder {
-    uint8_t array_element;
-    uint8_t bit_mask;
+    uint8_t index;
+    uint8_t bit;
 } AMROrder;
 
 

Modified: amr/amrnbdec.c
==============================================================================
--- amr/amrnbdec.c	Mon Aug  3 18:13:24 2009	(r4915)
+++ amr/amrnbdec.c	Mon Aug  3 18:48:05 2009	(r4916)
@@ -148,7 +148,7 @@ static enum Mode decode_bitstream(AMRCon
 
         memset(&p->frame, 0, sizeof(AMRNBFrame));
         for (i = 0; i < mode_bits[mode]; i++)
-            data[order[i].array_element] += get_bits1(&p->gb) * (1 << order[i].bit_mask);
+            data[order[i].index] += get_bits1(&p->gb) * (1 << order[i].bit);
 
         if (mode == MODE_DTX) {
             p->cur_frame_type = RX_SID_FIRST;