Author: cmcq
Date: Sun Aug 9 14:14:59 2009
New Revision: 5003
Log:
Cosmetics: make bit order macros 9 chars long to help reformat the tables
Modified:
amr/amrnbdata.h
Modified: amr/amrnbdata.h
==============================================================================
--- amr/amrnbdata.h Sun Aug 9 13:36:30 2009 (r5002)
+++ amr/amrnbdata.h Sun Aug 9 14:14:59 2009 (r5003)
@@ -115,11 +115,11 @@ typedef struct {
/** Specify a pitch gain bit */
#define AMR_PGAIN(frame_num, bit) AMR_OF(frame_num, p_gain, bit)
/** Specify a fixed gain bit */
-#define AMR_FIXED_GAIN(frame_num, bit) AMR_OF(frame_num, fixed_gain, bit)
+#define AMR_FGAIN(frame_num, bit) AMR_OF(frame_num, fixed_gain, bit)
/** Specify a pitch lag bit */
#define AMR_PLAG(frame_num, bit) AMR_OF(frame_num, p_lag, bit)
/** Specify a pulse bit */
-#define AMR_PULSES(frame_num, pulse_id, bit) AMR_OF(frame_num,
pulses[pulse_id], bit)
+#define AMR_PULSE(frame_num, pulse_id, bit) AMR_OF(frame_num,
pulses[pulse_id], bit)
/** Specify an SID reference vector bit */
#define AMR_SVECTOR(bit) AMR_BIT(sid.ref_vector, bit)
/** Specify an SID energy index bit */
@@ -141,18 +141,18 @@ AMR_LSF(2, 5), AMR_LSF(2, 4), AMR_LSF(2,
AMR_PGAIN(2, 4), AMR_PGAIN(2, 5), AMR_PGAIN(2, 6), AMR_PGAIN(2, 7),
AMR_PLAG(0, 1), AMR_PLAG(0, 0),
AMR_PGAIN(0, 4), AMR_PGAIN(0, 5), AMR_PGAIN(0, 6), AMR_PGAIN(0, 7),
-AMR_PULSES(0, 1, 1), AMR_PULSES(0, 1, 0),
+AMR_PULSE(0, 1, 1), AMR_PULSE(0, 1, 0),
AMR_LSF(2, 6), AMR_LSF(2, 3), AMR_LSF(2, 1),
-AMR_PLAG(1, 1), AMR_PLAG(1, 0), AMR_PULSES(1, 1, 1), AMR_PULSES(1, 1, 0),
-AMR_PLAG(2, 1), AMR_PLAG(2, 0), AMR_PULSES(2, 1, 1), AMR_PULSES(2, 1, 0),
-AMR_PLAG(3, 1), AMR_PLAG(3, 0), AMR_PULSES(3, 1, 1), AMR_PULSES(3, 1, 0),
-AMR_PULSES(0, 0, 5), AMR_PULSES(0, 0, 4), AMR_PULSES(0, 0, 2), AMR_PULSES(0,
0, 1),
-AMR_PULSES(1, 0, 5), AMR_PULSES(1, 0, 4), AMR_PULSES(1, 0, 2), AMR_PULSES(1,
0, 1),
-AMR_PULSES(2, 0, 5), AMR_PULSES(2, 0, 4), AMR_PULSES(2, 0, 2), AMR_PULSES(2,
0, 1),
-AMR_PULSES(3, 0, 5), AMR_PULSES(3, 0, 4), AMR_PULSES(3, 0, 2), AMR_PULSES(3,
0, 1),
-AMR_PULSES(0, 0, 3), AMR_PULSES(1, 0, 3), AMR_PULSES(2, 0, 3), AMR_PULSES(3,
0, 3),
-AMR_PULSES(0, 0, 0), AMR_PULSES(1, 0, 0), AMR_PULSES(2, 0, 0), AMR_PULSES(3,
0, 0),
-AMR_PULSES(0, 0, 6), AMR_PULSES(1, 0, 6), AMR_PULSES(2, 0, 6), AMR_PULSES(3,
0, 6)
+AMR_PLAG(1, 1), AMR_PLAG(1, 0), AMR_PULSE(1, 1, 1), AMR_PULSE(1, 1, 0),
+AMR_PLAG(2, 1), AMR_PLAG(2, 0), AMR_PULSE(2, 1, 1), AMR_PULSE(2, 1, 0),
+AMR_PLAG(3, 1), AMR_PLAG(3, 0), AMR_PULSE(3, 1, 1), AMR_PULSE(3, 1, 0),
+AMR_PULSE(0, 0, 5), AMR_PULSE(0, 0, 4), AMR_PULSE(0, 0, 2), AMR_PULSE(0, 0, 1),
+AMR_PULSE(1, 0, 5), AMR_PULSE(1, 0, 4), AMR_PULSE(1, 0, 2), AMR_PULSE(1, 0, 1),
+AMR_PULSE(2, 0, 5), AMR_PULSE(2, 0, 4), AMR_PULSE(2, 0, 2), AMR_PULSE(2, 0, 1),
+AMR_PULSE(3, 0, 5), AMR_PULSE(3, 0, 4), AMR_PULSE(3, 0, 2), AMR_PULSE(3, 0, 1),
+AMR_PULSE(0, 0, 3), AMR_PULSE(1, 0, 3), AMR_PULSE(2, 0, 3), AMR_PULSE(3, 0, 3),
+AMR_PULSE(0, 0, 0), AMR_PULSE(1, 0, 0), AMR_PULSE(2, 0, 0), AMR_PULSE(3, 0, 0),
+AMR_PULSE(0, 0, 6), AMR_PULSE(1, 0, 6), AMR_PULSE(2, 0, 6), AMR_PULSE(3, 0, 6)
};
static const AMROrder order_MODE_515[103] = {
@@ -176,15 +176,15 @@ AMR_LSF(2, 1),
AMR_PLAG(0, 0), AMR_PLAG(1, 0), AMR_PLAG(2, 0), AMR_PLAG(3, 1),
AMR_LSF(2, 3), AMR_LSF(2, 6),
AMR_PLAG(3, 0),
-AMR_PULSES(0, 1, 0), AMR_PULSES(0, 1, 1), AMR_PULSES(1, 1, 0), AMR_PULSES(1,
1, 1),
-AMR_PULSES(2, 1, 0), AMR_PULSES(0, 0, 2), AMR_PULSES(1, 0, 2), AMR_PULSES(2,
0, 2),
-AMR_PULSES(3, 0, 2), AMR_PULSES(2, 1, 1), AMR_PULSES(3, 1, 0), AMR_PULSES(3,
1, 1),
-AMR_PULSES(0, 0, 1), AMR_PULSES(1, 0, 1), AMR_PULSES(2, 0, 1), AMR_PULSES(3,
0, 1),
-AMR_PULSES(0, 0, 5), AMR_PULSES(1, 0, 5), AMR_PULSES(0, 0, 4), AMR_PULSES(1,
0, 4),
-AMR_PULSES(2, 0, 5), AMR_PULSES(2, 0, 4), AMR_PULSES(3, 0, 5), AMR_PULSES(3,
0, 4),
-AMR_PULSES(0, 0, 6), AMR_PULSES(1, 0, 6), AMR_PULSES(2, 0, 6), AMR_PULSES(3,
0, 6),
-AMR_PULSES(0, 0, 0), AMR_PULSES(1, 0, 0), AMR_PULSES(2, 0, 0), AMR_PULSES(3,
0, 0),
-AMR_PULSES(0, 0, 3), AMR_PULSES(1, 0, 3), AMR_PULSES(2, 0, 3), AMR_PULSES(3,
0, 3)
+AMR_PULSE(0, 1, 0), AMR_PULSE(0, 1, 1), AMR_PULSE(1, 1, 0), AMR_PULSE(1, 1, 1),
+AMR_PULSE(2, 1, 0), AMR_PULSE(0, 0, 2), AMR_PULSE(1, 0, 2), AMR_PULSE(2, 0, 2),
+AMR_PULSE(3, 0, 2), AMR_PULSE(2, 1, 1), AMR_PULSE(3, 1, 0), AMR_PULSE(3, 1, 1),
+AMR_PULSE(0, 0, 1), AMR_PULSE(1, 0, 1), AMR_PULSE(2, 0, 1), AMR_PULSE(3, 0, 1),
+AMR_PULSE(0, 0, 5), AMR_PULSE(1, 0, 5), AMR_PULSE(0, 0, 4), AMR_PULSE(1, 0, 4),
+AMR_PULSE(2, 0, 5), AMR_PULSE(2, 0, 4), AMR_PULSE(3, 0, 5), AMR_PULSE(3, 0, 4),
+AMR_PULSE(0, 0, 6), AMR_PULSE(1, 0, 6), AMR_PULSE(2, 0, 6), AMR_PULSE(3, 0, 6),
+AMR_PULSE(0, 0, 0), AMR_PULSE(1, 0, 0), AMR_PULSE(2, 0, 0), AMR_PULSE(3, 0, 0),
+AMR_PULSE(0, 0, 3), AMR_PULSE(1, 0, 3), AMR_PULSE(2, 0, 3), AMR_PULSE(3, 0, 3)
};
static const AMROrder order_MODE_59[118] = {
@@ -206,20 +206,20 @@ AMR_PGAIN(0, 3), AMR_PGAIN(1, 3), AMR_PG
AMR_PGAIN(0, 4), AMR_PGAIN(1, 4), AMR_PGAIN(2, 4), AMR_PGAIN(3, 4),
AMR_LSF(2, 6), AMR_LSF(2, 4), AMR_LSF(2, 2), AMR_LSF(2, 3),
AMR_LSF(2, 7), AMR_LSF(2, 8), AMR_LSF(2, 5), AMR_LSF(2, 1),
-AMR_PULSES(3, 1, 0), AMR_PULSES(0, 1, 1), AMR_PULSES(2, 1, 1), AMR_PULSES(3,
1, 1),
-AMR_PULSES(1, 1, 1), AMR_PULSES(1, 1, 0), AMR_PULSES(0, 1, 0), AMR_PULSES(2,
1, 0),
+AMR_PULSE(3, 1, 0), AMR_PULSE(0, 1, 1), AMR_PULSE(2, 1, 1), AMR_PULSE(3, 1, 1),
+AMR_PULSE(1, 1, 1), AMR_PULSE(1, 1, 0), AMR_PULSE(0, 1, 0), AMR_PULSE(2, 1, 0),
AMR_LSF(2, 0),
AMR_PGAIN(0, 5), AMR_PGAIN(1, 5), AMR_PGAIN(2, 5), AMR_PGAIN(3, 5),
AMR_PLAG(1, 0), AMR_PLAG(3, 0),
-AMR_PULSES(0, 0, 2), AMR_PULSES(1, 0, 2), AMR_PULSES(2, 0, 2), AMR_PULSES(3,
0, 2),
-AMR_PULSES(0, 0, 3), AMR_PULSES(1, 0, 3), AMR_PULSES(2, 0, 3), AMR_PULSES(3,
0, 3),
-AMR_PULSES(0, 0, 6), AMR_PULSES(1, 0, 6), AMR_PULSES(2, 0, 6), AMR_PULSES(3,
0, 6),
-AMR_PULSES(0, 0, 7), AMR_PULSES(1, 0, 7), AMR_PULSES(2, 0, 7), AMR_PULSES(3,
0, 7),
-AMR_PULSES(0, 0, 8), AMR_PULSES(1, 0, 8), AMR_PULSES(2, 0, 8), AMR_PULSES(3,
0, 8),
-AMR_PULSES(0, 0, 0), AMR_PULSES(1, 0, 0), AMR_PULSES(2, 0, 0), AMR_PULSES(3,
0, 0),
-AMR_PULSES(0, 0, 1), AMR_PULSES(1, 0, 1), AMR_PULSES(2, 0, 1), AMR_PULSES(3,
0, 1),
-AMR_PULSES(0, 0, 4), AMR_PULSES(1, 0, 4), AMR_PULSES(2, 0, 4), AMR_PULSES(3,
0, 4),
-AMR_PULSES(0, 0, 5), AMR_PULSES(1, 0, 5), AMR_PULSES(2, 0, 5), AMR_PULSES(3,
0, 5)
+AMR_PULSE(0, 0, 2), AMR_PULSE(1, 0, 2), AMR_PULSE(2, 0, 2), AMR_PULSE(3, 0, 2),
+AMR_PULSE(0, 0, 3), AMR_PULSE(1, 0, 3), AMR_PULSE(2, 0, 3), AMR_PULSE(3, 0, 3),
+AMR_PULSE(0, 0, 6), AMR_PULSE(1, 0, 6), AMR_PULSE(2, 0, 6), AMR_PULSE(3, 0, 6),
+AMR_PULSE(0, 0, 7), AMR_PULSE(1, 0, 7), AMR_PULSE(2, 0, 7), AMR_PULSE(3, 0, 7),
+AMR_PULSE(0, 0, 8), AMR_PULSE(1, 0, 8), AMR_PULSE(2, 0, 8), AMR_PULSE(3, 0, 8),
+AMR_PULSE(0, 0, 0), AMR_PULSE(1, 0, 0), AMR_PULSE(2, 0, 0), AMR_PULSE(3, 0, 0),
+AMR_PULSE(0, 0, 1), AMR_PULSE(1, 0, 1), AMR_PULSE(2, 0, 1), AMR_PULSE(3, 0, 1),
+AMR_PULSE(0, 0, 4), AMR_PULSE(1, 0, 4), AMR_PULSE(2, 0, 4), AMR_PULSE(3, 0, 4),
+AMR_PULSE(0, 0, 5), AMR_PULSE(1, 0, 5), AMR_PULSE(2, 0, 5), AMR_PULSE(3, 0, 5)
};
static const AMROrder order_MODE_67[134] = {
@@ -239,15 +239,15 @@ AMR_PGAIN(0, 6), AMR_PGAIN(1, 6), AMR_PG
AMR_PLAG(2, 1), AMR_PGAIN(0, 3), AMR_PGAIN(1, 3), AMR_PGAIN(2, 3),
AMR_PGAIN(3, 3), AMR_PGAIN(0, 2), AMR_PGAIN(1, 2), AMR_PGAIN(2, 2),
AMR_PGAIN(3, 2), AMR_PLAG(1, 0), AMR_PLAG(3, 0), AMR_PLAG(0, 0), AMR_PLAG(2,
0), AMR_LSF(2, 6), AMR_LSF(2, 2), AMR_PGAIN(0, 1),
AMR_PGAIN(1, 1), AMR_PGAIN(2, 1), AMR_PGAIN(3, 1), AMR_LSF(2, 4), AMR_LSF(2,
3), AMR_LSF(2, 7), AMR_LSF(2, 8), AMR_LSF(2, 5),
-AMR_LSF(2, 1), AMR_LSF(2, 0), AMR_PGAIN(0, 4), AMR_PGAIN(1, 4), AMR_PGAIN(2,
4), AMR_PGAIN(3, 4), AMR_PULSES(0, 1, 0), AMR_PULSES(1, 1, 0),
-AMR_PULSES(2, 1, 0), AMR_PULSES(3, 1, 0), AMR_PGAIN(0, 0), AMR_PGAIN(1, 0),
AMR_PGAIN(2, 0), AMR_PGAIN(3, 0), AMR_PULSES(0, 1, 1), AMR_PULSES(1, 1, 1),
-AMR_PULSES(2, 1, 1), AMR_PULSES(3, 1, 1), AMR_PGAIN(3, 5), AMR_PGAIN(2, 5),
AMR_PGAIN(1, 5), AMR_PGAIN(0, 5), AMR_PULSES(0, 1, 2), AMR_PULSES(1, 1, 2),
-AMR_PULSES(2, 1, 2), AMR_PULSES(3, 1, 2), AMR_PULSES(0, 0, 2), AMR_PULSES(1,
0, 2), AMR_PULSES(2, 0, 2), AMR_PULSES(3, 0, 2), AMR_PULSES(0, 0, 5),
AMR_PULSES(1, 0, 5),
-AMR_PULSES(2, 0, 5), AMR_PULSES(3, 0, 5), AMR_PULSES(0, 0, 6), AMR_PULSES(1,
0, 6), AMR_PULSES(2, 0, 6), AMR_PULSES(3, 0, 6), AMR_PULSES(0, 0, 9),
AMR_PULSES(1, 0, 9),
-AMR_PULSES(2, 0, 9), AMR_PULSES(3, 0, 9), AMR_PULSES(0, 0, 10), AMR_PULSES(1,
0, 10), AMR_PULSES(2, 0, 10), AMR_PULSES(3, 0, 10), AMR_PULSES(0, 0, 0),
AMR_PULSES(1, 0, 0),
-AMR_PULSES(2, 0, 0), AMR_PULSES(3, 0, 0), AMR_PULSES(0, 0, 1), AMR_PULSES(1,
0, 1), AMR_PULSES(2, 0, 1), AMR_PULSES(3, 0, 1), AMR_PULSES(0, 0, 3),
AMR_PULSES(1, 0, 3),
-AMR_PULSES(2, 0, 3), AMR_PULSES(3, 0, 3), AMR_PULSES(0, 0, 4), AMR_PULSES(1,
0, 4), AMR_PULSES(2, 0, 4), AMR_PULSES(3, 0, 4), AMR_PULSES(0, 0, 7),
AMR_PULSES(1, 0, 7),
-AMR_PULSES(2, 0, 7), AMR_PULSES(3, 0, 7), AMR_PULSES(0, 0, 8), AMR_PULSES(1,
0, 8), AMR_PULSES(2, 0, 8), AMR_PULSES(3, 0, 8)
+AMR_LSF(2, 1), AMR_LSF(2, 0), AMR_PGAIN(0, 4), AMR_PGAIN(1, 4), AMR_PGAIN(2,
4), AMR_PGAIN(3, 4), AMR_PULSE(0, 1, 0), AMR_PULSE(1, 1, 0),
+AMR_PULSE(2, 1, 0), AMR_PULSE(3, 1, 0), AMR_PGAIN(0, 0), AMR_PGAIN(1, 0),
AMR_PGAIN(2, 0), AMR_PGAIN(3, 0), AMR_PULSE(0, 1, 1), AMR_PULSE(1, 1, 1),
+AMR_PULSE(2, 1, 1), AMR_PULSE(3, 1, 1), AMR_PGAIN(3, 5), AMR_PGAIN(2, 5),
AMR_PGAIN(1, 5), AMR_PGAIN(0, 5), AMR_PULSE(0, 1, 2), AMR_PULSE(1, 1, 2),
+AMR_PULSE(2, 1, 2), AMR_PULSE(3, 1, 2), AMR_PULSE(0, 0, 2), AMR_PULSE(1, 0,
2), AMR_PULSE(2, 0, 2), AMR_PULSE(3, 0, 2), AMR_PULSE(0, 0, 5), AMR_PULSE(1, 0,
5),
+AMR_PULSE(2, 0, 5), AMR_PULSE(3, 0, 5), AMR_PULSE(0, 0, 6), AMR_PULSE(1, 0,
6), AMR_PULSE(2, 0, 6), AMR_PULSE(3, 0, 6), AMR_PULSE(0, 0, 9), AMR_PULSE(1, 0,
9),
+AMR_PULSE(2, 0, 9), AMR_PULSE(3, 0, 9), AMR_PULSE(0, 0, 10), AMR_PULSE(1, 0,
10), AMR_PULSE(2, 0, 10), AMR_PULSE(3, 0, 10), AMR_PULSE(0, 0, 0), AMR_PULSE(1,
0, 0),
+AMR_PULSE(2, 0, 0), AMR_PULSE(3, 0, 0), AMR_PULSE(0, 0, 1), AMR_PULSE(1, 0,
1), AMR_PULSE(2, 0, 1), AMR_PULSE(3, 0, 1), AMR_PULSE(0, 0, 3), AMR_PULSE(1, 0,
3),
+AMR_PULSE(2, 0, 3), AMR_PULSE(3, 0, 3), AMR_PULSE(0, 0, 4), AMR_PULSE(1, 0,
4), AMR_PULSE(2, 0, 4), AMR_PULSE(3, 0, 4), AMR_PULSE(0, 0, 7), AMR_PULSE(1, 0,
7),
+AMR_PULSE(2, 0, 7), AMR_PULSE(3, 0, 7), AMR_PULSE(0, 0, 8), AMR_PULSE(1, 0,
8), AMR_PULSE(2, 0, 8), AMR_PULSE(3, 0, 8)
};
static const AMROrder order_MODE_74[148] = {
@@ -272,28 +272,28 @@ AMR_LSF(2, 8), AMR_LSF(2, 7), AMR_LSF(2,
AMR_PLAG(0, 2), AMR_PLAG(1, 2), AMR_PLAG(2, 2), AMR_PLAG(3, 2),
AMR_PGAIN(0, 1), AMR_PGAIN(1, 1), AMR_PGAIN(2, 1), AMR_PGAIN(3, 1),
AMR_LSF(2, 5), AMR_LSF(2, 1), AMR_LSF(2, 0),
-AMR_PULSES(0, 1, 0), AMR_PULSES(1, 1, 0), AMR_PULSES(2, 1, 0), AMR_PULSES(3,
1, 0),
+AMR_PULSE(0, 1, 0), AMR_PULSE(1, 1, 0), AMR_PULSE(2, 1, 0), AMR_PULSE(3, 1, 0),
AMR_PGAIN(0, 0), AMR_PGAIN(1, 0), AMR_PGAIN(2, 0), AMR_PGAIN(3, 0),
-AMR_PULSES(0, 1, 1), AMR_PULSES(1, 1, 1), AMR_PULSES(2, 1, 1), AMR_PULSES(3,
1, 1),
-AMR_PULSES(0, 1, 2), AMR_PULSES(1, 1, 2),
+AMR_PULSE(0, 1, 1), AMR_PULSE(1, 1, 1), AMR_PULSE(2, 1, 1), AMR_PULSE(3, 1, 1),
+AMR_PULSE(0, 1, 2), AMR_PULSE(1, 1, 2),
AMR_PGAIN(0, 4), AMR_PGAIN(1, 4), AMR_PGAIN(2, 4), AMR_PGAIN(3, 4),
-AMR_PULSES(2, 1, 2), AMR_PULSES(3, 1, 2), AMR_PULSES(0, 1, 3), AMR_PULSES(1,
1, 3),
-AMR_PULSES(2, 1, 3), AMR_PULSES(3, 1, 3),
+AMR_PULSE(2, 1, 2), AMR_PULSE(3, 1, 2), AMR_PULSE(0, 1, 3), AMR_PULSE(1, 1, 3),
+AMR_PULSE(2, 1, 3), AMR_PULSE(3, 1, 3),
AMR_PLAG(0, 1), AMR_PLAG(0, 0),
AMR_PLAG(1, 1), AMR_PLAG(1, 0),
AMR_PLAG(2, 1), AMR_PLAG(2, 0),
AMR_PLAG(3, 1), AMR_PLAG(3, 0),
-AMR_PULSES(0, 0, 5), AMR_PULSES(0, 0, 4), AMR_PULSES(0, 0, 3), AMR_PULSES(0,
0, 2), AMR_PULSES(0, 0, 1), AMR_PULSES(0, 0, 0),
-AMR_PULSES(1, 0, 5), AMR_PULSES(1, 0, 4), AMR_PULSES(1, 0, 3), AMR_PULSES(1,
0, 2), AMR_PULSES(1, 0, 1), AMR_PULSES(1, 0, 0),
-AMR_PULSES(2, 0, 5), AMR_PULSES(2, 0, 4), AMR_PULSES(2, 0, 3), AMR_PULSES(2,
0, 2), AMR_PULSES(2, 0, 1), AMR_PULSES(2, 0, 0),
-AMR_PULSES(3, 0, 5), AMR_PULSES(3, 0, 4), AMR_PULSES(3, 0, 3), AMR_PULSES(3,
0, 2), AMR_PULSES(3, 0, 1), AMR_PULSES(3, 0, 0),
-AMR_PULSES(0, 0, 12), AMR_PULSES(1, 0, 12), AMR_PULSES(2, 0, 12),
AMR_PULSES(3, 0, 12),
-AMR_PULSES(0, 0, 11), AMR_PULSES(1, 0, 11), AMR_PULSES(2, 0, 11),
AMR_PULSES(3, 0, 11),
-AMR_PULSES(0, 0, 10), AMR_PULSES(1, 0, 10), AMR_PULSES(2, 0, 10),
AMR_PULSES(3, 0, 10),
-AMR_PULSES(0, 0, 9), AMR_PULSES(1, 0, 9), AMR_PULSES(2, 0, 9), AMR_PULSES(3,
0, 9),
-AMR_PULSES(0, 0, 8), AMR_PULSES(1, 0, 8), AMR_PULSES(2, 0, 8), AMR_PULSES(3,
0, 8),
-AMR_PULSES(0, 0, 7), AMR_PULSES(1, 0, 7), AMR_PULSES(2, 0, 7), AMR_PULSES(3,
0, 7),
-AMR_PULSES(0, 0, 6), AMR_PULSES(1, 0, 6), AMR_PULSES(2, 0, 6), AMR_PULSES(3,
0, 6)
+AMR_PULSE(0, 0, 5), AMR_PULSE(0, 0, 4), AMR_PULSE(0, 0, 3), AMR_PULSE(0, 0,
2), AMR_PULSE(0, 0, 1), AMR_PULSE(0, 0, 0),
+AMR_PULSE(1, 0, 5), AMR_PULSE(1, 0, 4), AMR_PULSE(1, 0, 3), AMR_PULSE(1, 0,
2), AMR_PULSE(1, 0, 1), AMR_PULSE(1, 0, 0),
+AMR_PULSE(2, 0, 5), AMR_PULSE(2, 0, 4), AMR_PULSE(2, 0, 3), AMR_PULSE(2, 0,
2), AMR_PULSE(2, 0, 1), AMR_PULSE(2, 0, 0),
+AMR_PULSE(3, 0, 5), AMR_PULSE(3, 0, 4), AMR_PULSE(3, 0, 3), AMR_PULSE(3, 0,
2), AMR_PULSE(3, 0, 1), AMR_PULSE(3, 0, 0),
+AMR_PULSE(0, 0, 12), AMR_PULSE(1, 0, 12), AMR_PULSE(2, 0, 12), AMR_PULSE(3, 0,
12),
+AMR_PULSE(0, 0, 11), AMR_PULSE(1, 0, 11), AMR_PULSE(2, 0, 11), AMR_PULSE(3, 0,
11),
+AMR_PULSE(0, 0, 10), AMR_PULSE(1, 0, 10), AMR_PULSE(2, 0, 10), AMR_PULSE(3, 0,
10),
+AMR_PULSE(0, 0, 9), AMR_PULSE(1, 0, 9), AMR_PULSE(2, 0, 9), AMR_PULSE(3, 0, 9),
+AMR_PULSE(0, 0, 8), AMR_PULSE(1, 0, 8), AMR_PULSE(2, 0, 8), AMR_PULSE(3, 0, 8),
+AMR_PULSE(0, 0, 7), AMR_PULSE(1, 0, 7), AMR_PULSE(2, 0, 7), AMR_PULSE(3, 0, 7),
+AMR_PULSE(0, 0, 6), AMR_PULSE(1, 0, 6), AMR_PULSE(2, 0, 6), AMR_PULSE(3, 0, 6)
};
static const AMROrder order_MODE_795[159] = {
@@ -303,9 +303,9 @@ AMR_LSF(1, 1), AMR_LSF(1, 8), AMR_LSF(1,
AMR_LSF(1, 4), AMR_LSF(1, 2), AMR_LSF(1, 6), AMR_LSF(1, 0),
AMR_LSF(2, 6), AMR_LSF(2, 4), AMR_LSF(2, 2), AMR_LSF(2, 3),
AMR_LSF(2, 7), AMR_LSF(2, 8), AMR_LSF(2, 5),
-AMR_FIXED_GAIN(0, 4), AMR_FIXED_GAIN(1, 4), AMR_FIXED_GAIN(2, 4),
AMR_FIXED_GAIN(3, 4),
-AMR_FIXED_GAIN(0, 3), AMR_FIXED_GAIN(1, 3), AMR_FIXED_GAIN(2, 3),
AMR_FIXED_GAIN(3, 3),
-AMR_FIXED_GAIN(0, 2), AMR_FIXED_GAIN(1, 2), AMR_FIXED_GAIN(2, 2),
AMR_FIXED_GAIN(3, 2),
+AMR_FGAIN(0, 4), AMR_FGAIN(1, 4), AMR_FGAIN(2, 4), AMR_FGAIN(3, 4),
+AMR_FGAIN(0, 3), AMR_FGAIN(1, 3), AMR_FGAIN(2, 3), AMR_FGAIN(3, 3),
+AMR_FGAIN(0, 2), AMR_FGAIN(1, 2), AMR_FGAIN(2, 2), AMR_FGAIN(3, 2),
AMR_PGAIN(0, 3), AMR_PGAIN(1, 3), AMR_PGAIN(2, 3), AMR_PGAIN(3, 3),
AMR_PGAIN(0, 2), AMR_PGAIN(1, 2), AMR_PGAIN(2, 2), AMR_PGAIN(3, 2),
AMR_PLAG(0, 7), AMR_PLAG(2, 7),
@@ -316,7 +316,7 @@ AMR_PLAG(0, 3), AMR_PLAG(2, 3),
AMR_PLAG(1, 5), AMR_PLAG(3, 5),
AMR_PLAG(1, 4), AMR_PLAG(3, 4),
AMR_PLAG(1, 3), AMR_PLAG(3, 3),
-AMR_FIXED_GAIN(0, 1), AMR_FIXED_GAIN(1, 1), AMR_FIXED_GAIN(2, 1),
AMR_FIXED_GAIN(3, 1),
+AMR_FGAIN(0, 1), AMR_FGAIN(1, 1), AMR_FGAIN(2, 1), AMR_FGAIN(3, 1),
AMR_PLAG(0, 2), AMR_PLAG(2, 2), AMR_PLAG(1, 2), AMR_PLAG(3, 2),
AMR_LSF(0, 7), AMR_LSF(0, 8), AMR_LSF(2, 1), AMR_LSF(2, 0),
AMR_PLAG(0, 1), AMR_PLAG(2, 1),
@@ -324,25 +324,25 @@ AMR_PLAG(0, 0), AMR_PLAG(2, 0),
AMR_PLAG(1, 1), AMR_PLAG(3, 1),
AMR_PLAG(1, 0), AMR_PLAG(3, 0),
AMR_PGAIN(0, 1), AMR_PGAIN(1, 1), AMR_PGAIN(2, 1), AMR_PGAIN(3, 1),
-AMR_FIXED_GAIN(0, 0), AMR_FIXED_GAIN(1, 0), AMR_FIXED_GAIN(2, 0),
AMR_FIXED_GAIN(3, 0),
+AMR_FGAIN(0, 0), AMR_FGAIN(1, 0), AMR_FGAIN(2, 0), AMR_FGAIN(3, 0),
AMR_PGAIN(0, 0), AMR_PGAIN(1, 0), AMR_PGAIN(2, 0), AMR_PGAIN(3, 0),
-AMR_PULSES(2, 1, 0), AMR_PULSES(2, 1, 1), AMR_PULSES(2, 1, 2),
-AMR_PULSES(0, 0, 1), AMR_PULSES(1, 0, 1), AMR_PULSES(2, 0, 1), AMR_PULSES(3,
0, 1),
-AMR_PULSES(0, 0, 4), AMR_PULSES(1, 0, 4), AMR_PULSES(2, 0, 4), AMR_PULSES(3,
0, 4),
-AMR_PULSES(0, 0, 7), AMR_PULSES(1, 0, 7), AMR_PULSES(2, 0, 7), AMR_PULSES(3,
0, 7),
-AMR_PULSES(0, 0, 11), AMR_PULSES(1, 0, 11), AMR_PULSES(2, 0, 11),
AMR_PULSES(3, 0, 11),
-AMR_PULSES(2, 1, 3),
-AMR_PULSES(3, 1, 0), AMR_PULSES(3, 1, 1), AMR_PULSES(3, 1, 2), AMR_PULSES(3,
1, 3),
-AMR_PULSES(1, 1, 0), AMR_PULSES(1, 1, 1), AMR_PULSES(1, 1, 2), AMR_PULSES(1,
1, 3),
-AMR_PULSES(0, 1, 0), AMR_PULSES(0, 1, 1), AMR_PULSES(0, 1, 2), AMR_PULSES(0,
1, 3),
-AMR_PULSES(0, 0, 0), AMR_PULSES(0, 0, 2), AMR_PULSES(0, 0, 3), AMR_PULSES(0,
0, 5),
-AMR_PULSES(0, 0, 8), AMR_PULSES(0, 0, 12),
-AMR_PULSES(1, 0, 0), AMR_PULSES(1, 0, 2), AMR_PULSES(1, 0, 3), AMR_PULSES(1,
0, 5), AMR_PULSES(1, 0, 8), AMR_PULSES(1, 0, 12),
-AMR_PULSES(2, 0, 0), AMR_PULSES(2, 0, 2), AMR_PULSES(2, 0, 3), AMR_PULSES(2,
0, 5), AMR_PULSES(2, 0, 8), AMR_PULSES(2, 0, 12),
-AMR_PULSES(3, 0, 0), AMR_PULSES(3, 0, 2), AMR_PULSES(3, 0, 3), AMR_PULSES(3,
0, 5), AMR_PULSES(3, 0, 8), AMR_PULSES(3, 0, 12),
-AMR_PULSES(0, 0, 6), AMR_PULSES(1, 0, 6), AMR_PULSES(2, 0, 6), AMR_PULSES(3,
0, 6),
-AMR_PULSES(0, 0, 10), AMR_PULSES(1, 0, 10), AMR_PULSES(2, 0, 10),
AMR_PULSES(3, 0, 10),
-AMR_PULSES(0, 0, 9), AMR_PULSES(1, 0, 9), AMR_PULSES(2, 0, 9), AMR_PULSES(3,
0, 9)
+AMR_PULSE(2, 1, 0), AMR_PULSE(2, 1, 1), AMR_PULSE(2, 1, 2),
+AMR_PULSE(0, 0, 1), AMR_PULSE(1, 0, 1), AMR_PULSE(2, 0, 1), AMR_PULSE(3, 0, 1),
+AMR_PULSE(0, 0, 4), AMR_PULSE(1, 0, 4), AMR_PULSE(2, 0, 4), AMR_PULSE(3, 0, 4),
+AMR_PULSE(0, 0, 7), AMR_PULSE(1, 0, 7), AMR_PULSE(2, 0, 7), AMR_PULSE(3, 0, 7),
+AMR_PULSE(0, 0, 11), AMR_PULSE(1, 0, 11), AMR_PULSE(2, 0, 11), AMR_PULSE(3, 0,
11),
+AMR_PULSE(2, 1, 3),
+AMR_PULSE(3, 1, 0), AMR_PULSE(3, 1, 1), AMR_PULSE(3, 1, 2), AMR_PULSE(3, 1, 3),
+AMR_PULSE(1, 1, 0), AMR_PULSE(1, 1, 1), AMR_PULSE(1, 1, 2), AMR_PULSE(1, 1, 3),
+AMR_PULSE(0, 1, 0), AMR_PULSE(0, 1, 1), AMR_PULSE(0, 1, 2), AMR_PULSE(0, 1, 3),
+AMR_PULSE(0, 0, 0), AMR_PULSE(0, 0, 2), AMR_PULSE(0, 0, 3), AMR_PULSE(0, 0, 5),
+AMR_PULSE(0, 0, 8), AMR_PULSE(0, 0, 12),
+AMR_PULSE(1, 0, 0), AMR_PULSE(1, 0, 2), AMR_PULSE(1, 0, 3), AMR_PULSE(1, 0,
5), AMR_PULSE(1, 0, 8), AMR_PULSE(1, 0, 12),
+AMR_PULSE(2, 0, 0), AMR_PULSE(2, 0, 2), AMR_PULSE(2, 0, 3), AMR_PULSE(2, 0,
5), AMR_PULSE(2, 0, 8), AMR_PULSE(2, 0, 12),
+AMR_PULSE(3, 0, 0), AMR_PULSE(3, 0, 2), AMR_PULSE(3, 0, 3), AMR_PULSE(3, 0,
5), AMR_PULSE(3, 0, 8), AMR_PULSE(3, 0, 12),
+AMR_PULSE(0, 0, 6), AMR_PULSE(1, 0, 6), AMR_PULSE(2, 0, 6), AMR_PULSE(3, 0, 6),
+AMR_PULSE(0, 0, 10), AMR_PULSE(1, 0, 10), AMR_PULSE(2, 0, 10), AMR_PULSE(3, 0,
10),
+AMR_PULSE(0, 0, 9), AMR_PULSE(1, 0, 9), AMR_PULSE(2, 0, 9), AMR_PULSE(3, 0, 9)
};
static const AMROrder order_MODE_102[204] = {
@@ -369,47 +369,47 @@ AMR_PGAIN(0, 5), AMR_PGAIN(1, 5), AMR_PG
AMR_LSF(2, 6), AMR_LSF(2, 2), AMR_LSF(2, 4), AMR_LSF(2, 3),
AMR_LSF(2, 7), AMR_LSF(2, 8), AMR_LSF(2, 5), AMR_LSF(2, 1),
AMR_LSF(2, 0),
-AMR_PULSES(0, 3, 0), AMR_PULSES(0, 2, 0), AMR_PULSES(0, 1, 0), AMR_PULSES(0,
0, 0),
-AMR_PULSES(1, 3, 0), AMR_PULSES(1, 2, 0), AMR_PULSES(1, 1, 0), AMR_PULSES(1,
0, 0),
-AMR_PULSES(2, 3, 0), AMR_PULSES(2, 2, 0), AMR_PULSES(2, 1, 0), AMR_PULSES(2,
0, 0),
-AMR_PULSES(3, 3, 0), AMR_PULSES(3, 2, 0), AMR_PULSES(3, 1, 0), AMR_PULSES(3,
0, 0),
+AMR_PULSE(0, 3, 0), AMR_PULSE(0, 2, 0), AMR_PULSE(0, 1, 0), AMR_PULSE(0, 0, 0),
+AMR_PULSE(1, 3, 0), AMR_PULSE(1, 2, 0), AMR_PULSE(1, 1, 0), AMR_PULSE(1, 0, 0),
+AMR_PULSE(2, 3, 0), AMR_PULSE(2, 2, 0), AMR_PULSE(2, 1, 0), AMR_PULSE(2, 0, 0),
+AMR_PULSE(3, 3, 0), AMR_PULSE(3, 2, 0), AMR_PULSE(3, 1, 0), AMR_PULSE(3, 0, 0),
AMR_PGAIN(0, 1), AMR_PGAIN(0, 4), AMR_PGAIN(0, 0),
AMR_PGAIN(1, 1), AMR_PGAIN(1, 4), AMR_PGAIN(1, 0),
AMR_PGAIN(2, 1), AMR_PGAIN(2, 4), AMR_PGAIN(2, 0),
AMR_PGAIN(3, 1), AMR_PGAIN(3, 4), AMR_PGAIN(3, 0),
AMR_PLAG(1, 0), AMR_PLAG(3, 0),
-AMR_PULSES(1, 4, 9), AMR_PULSES(1, 4, 8), AMR_PULSES(1, 5, 8), AMR_PULSES(1,
5, 9),
-AMR_PULSES(1, 5, 7), AMR_PULSES(1, 4, 7), AMR_PULSES(1, 5, 5), AMR_PULSES(1,
4, 5),
-AMR_PULSES(1, 4, 6), AMR_PULSES(1, 5, 6), AMR_PULSES(1, 6, 6), AMR_PULSES(1,
6, 5),
-AMR_PULSES(1, 5, 4), AMR_PULSES(1, 6, 3), AMR_PULSES(1, 4, 4), AMR_PULSES(1,
6, 4),
-AMR_PULSES(1, 4, 3), AMR_PULSES(1, 5, 3),
-AMR_PULSES(2, 4, 9), AMR_PULSES(2, 4, 8), AMR_PULSES(2, 5, 8), AMR_PULSES(2,
5, 9),
-AMR_PULSES(2, 5, 7), AMR_PULSES(2, 4, 7), AMR_PULSES(2, 5, 5), AMR_PULSES(2,
4, 5),
-AMR_PULSES(2, 4, 6), AMR_PULSES(2, 5, 6), AMR_PULSES(2, 6, 6), AMR_PULSES(2,
6, 5),
-AMR_PULSES(2, 5, 4), AMR_PULSES(2, 6, 3), AMR_PULSES(2, 4, 4), AMR_PULSES(2,
6, 4),
-AMR_PULSES(2, 4, 3), AMR_PULSES(2, 5, 3),
-AMR_PULSES(3, 4, 9), AMR_PULSES(3, 4, 8), AMR_PULSES(3, 5, 8), AMR_PULSES(3,
5, 9),
-AMR_PULSES(3, 5, 7), AMR_PULSES(3, 4, 7), AMR_PULSES(3, 5, 5), AMR_PULSES(3,
4, 5),
-AMR_PULSES(3, 4, 6), AMR_PULSES(3, 5, 6), AMR_PULSES(3, 6, 6), AMR_PULSES(3,
6, 5),
-AMR_PULSES(3, 5, 4), AMR_PULSES(3, 6, 3), AMR_PULSES(3, 4, 4), AMR_PULSES(3,
6, 4),
-AMR_PULSES(3, 4, 3), AMR_PULSES(3, 5, 3),
-AMR_PULSES(0, 4, 9), AMR_PULSES(0, 4, 8), AMR_PULSES(0, 5, 8), AMR_PULSES(0,
5, 9),
-AMR_PULSES(0, 5, 7), AMR_PULSES(0, 4, 7), AMR_PULSES(0, 5, 5), AMR_PULSES(0,
4, 5),
-AMR_PULSES(0, 4, 6), AMR_PULSES(0, 5, 6), AMR_PULSES(0, 6, 6), AMR_PULSES(0,
6, 5),
-AMR_PULSES(0, 5, 4), AMR_PULSES(0, 6, 3), AMR_PULSES(0, 4, 4), AMR_PULSES(0,
6, 4),
-AMR_PULSES(0, 4, 3), AMR_PULSES(0, 5, 3),
-AMR_PULSES(3, 6, 2), AMR_PULSES(3, 4, 0), AMR_PULSES(3, 5, 0), AMR_PULSES(3,
6, 0),
-AMR_PULSES(3, 4, 2), AMR_PULSES(3, 6, 1), AMR_PULSES(3, 4, 1), AMR_PULSES(3,
5, 2),
-AMR_PULSES(3, 5, 1),
-AMR_PULSES(2, 6, 2), AMR_PULSES(2, 4, 0), AMR_PULSES(2, 5, 0), AMR_PULSES(2,
6, 0),
-AMR_PULSES(2, 4, 2), AMR_PULSES(2, 6, 1), AMR_PULSES(2, 4, 1), AMR_PULSES(2,
5, 2),
-AMR_PULSES(2, 5, 1),
-AMR_PULSES(1, 6, 2), AMR_PULSES(1, 4, 0), AMR_PULSES(1, 5, 0), AMR_PULSES(1,
6, 0),
-AMR_PULSES(1, 4, 2), AMR_PULSES(1, 6, 1), AMR_PULSES(1, 4, 1), AMR_PULSES(1,
5, 2),
-AMR_PULSES(1, 5, 1),
-AMR_PULSES(0, 6, 2), AMR_PULSES(0, 4, 0), AMR_PULSES(0, 5, 0), AMR_PULSES(0,
6, 0),
-AMR_PULSES(0, 4, 2), AMR_PULSES(0, 6, 1), AMR_PULSES(0, 4, 1), AMR_PULSES(0,
5, 2),
-AMR_PULSES(0, 5, 1)
+AMR_PULSE(1, 4, 9), AMR_PULSE(1, 4, 8), AMR_PULSE(1, 5, 8), AMR_PULSE(1, 5, 9),
+AMR_PULSE(1, 5, 7), AMR_PULSE(1, 4, 7), AMR_PULSE(1, 5, 5), AMR_PULSE(1, 4, 5),
+AMR_PULSE(1, 4, 6), AMR_PULSE(1, 5, 6), AMR_PULSE(1, 6, 6), AMR_PULSE(1, 6, 5),
+AMR_PULSE(1, 5, 4), AMR_PULSE(1, 6, 3), AMR_PULSE(1, 4, 4), AMR_PULSE(1, 6, 4),
+AMR_PULSE(1, 4, 3), AMR_PULSE(1, 5, 3),
+AMR_PULSE(2, 4, 9), AMR_PULSE(2, 4, 8), AMR_PULSE(2, 5, 8), AMR_PULSE(2, 5, 9),
+AMR_PULSE(2, 5, 7), AMR_PULSE(2, 4, 7), AMR_PULSE(2, 5, 5), AMR_PULSE(2, 4, 5),
+AMR_PULSE(2, 4, 6), AMR_PULSE(2, 5, 6), AMR_PULSE(2, 6, 6), AMR_PULSE(2, 6, 5),
+AMR_PULSE(2, 5, 4), AMR_PULSE(2, 6, 3), AMR_PULSE(2, 4, 4), AMR_PULSE(2, 6, 4),
+AMR_PULSE(2, 4, 3), AMR_PULSE(2, 5, 3),
+AMR_PULSE(3, 4, 9), AMR_PULSE(3, 4, 8), AMR_PULSE(3, 5, 8), AMR_PULSE(3, 5, 9),
+AMR_PULSE(3, 5, 7), AMR_PULSE(3, 4, 7), AMR_PULSE(3, 5, 5), AMR_PULSE(3, 4, 5),
+AMR_PULSE(3, 4, 6), AMR_PULSE(3, 5, 6), AMR_PULSE(3, 6, 6), AMR_PULSE(3, 6, 5),
+AMR_PULSE(3, 5, 4), AMR_PULSE(3, 6, 3), AMR_PULSE(3, 4, 4), AMR_PULSE(3, 6, 4),
+AMR_PULSE(3, 4, 3), AMR_PULSE(3, 5, 3),
+AMR_PULSE(0, 4, 9), AMR_PULSE(0, 4, 8), AMR_PULSE(0, 5, 8), AMR_PULSE(0, 5, 9),
+AMR_PULSE(0, 5, 7), AMR_PULSE(0, 4, 7), AMR_PULSE(0, 5, 5), AMR_PULSE(0, 4, 5),
+AMR_PULSE(0, 4, 6), AMR_PULSE(0, 5, 6), AMR_PULSE(0, 6, 6), AMR_PULSE(0, 6, 5),
+AMR_PULSE(0, 5, 4), AMR_PULSE(0, 6, 3), AMR_PULSE(0, 4, 4), AMR_PULSE(0, 6, 4),
+AMR_PULSE(0, 4, 3), AMR_PULSE(0, 5, 3),
+AMR_PULSE(3, 6, 2), AMR_PULSE(3, 4, 0), AMR_PULSE(3, 5, 0), AMR_PULSE(3, 6, 0),
+AMR_PULSE(3, 4, 2), AMR_PULSE(3, 6, 1), AMR_PULSE(3, 4, 1), AMR_PULSE(3, 5, 2),
+AMR_PULSE(3, 5, 1),
+AMR_PULSE(2, 6, 2), AMR_PULSE(2, 4, 0), AMR_PULSE(2, 5, 0), AMR_PULSE(2, 6, 0),
+AMR_PULSE(2, 4, 2), AMR_PULSE(2, 6, 1), AMR_PULSE(2, 4, 1), AMR_PULSE(2, 5, 2),
+AMR_PULSE(2, 5, 1),
+AMR_PULSE(1, 6, 2), AMR_PULSE(1, 4, 0), AMR_PULSE(1, 5, 0), AMR_PULSE(1, 6, 0),
+AMR_PULSE(1, 4, 2), AMR_PULSE(1, 6, 1), AMR_PULSE(1, 4, 1), AMR_PULSE(1, 5, 2),
+AMR_PULSE(1, 5, 1),
+AMR_PULSE(0, 6, 2), AMR_PULSE(0, 4, 0), AMR_PULSE(0, 5, 0), AMR_PULSE(0, 6, 0),
+AMR_PULSE(0, 4, 2), AMR_PULSE(0, 6, 1), AMR_PULSE(0, 4, 1), AMR_PULSE(0, 5, 2),
+AMR_PULSE(0, 5, 1)
};
static const AMROrder order_MODE_122[244] = {
@@ -433,9 +433,9 @@ AMR_PLAG(0, 0), AMR_PLAG(2, 0),
AMR_PGAIN(0, 3), AMR_PGAIN(1, 3), AMR_PGAIN(2, 3), AMR_PGAIN(3, 3),
AMR_PGAIN(0, 2), AMR_PGAIN(1, 2), AMR_PGAIN(2, 2), AMR_PGAIN(3, 2),
AMR_PGAIN(0, 1), AMR_PGAIN(1, 1), AMR_PGAIN(2, 1), AMR_PGAIN(3, 1),
-AMR_FIXED_GAIN(0, 4), AMR_FIXED_GAIN(1, 4), AMR_FIXED_GAIN(2, 4),
AMR_FIXED_GAIN(3, 4),
-AMR_FIXED_GAIN(0, 3), AMR_FIXED_GAIN(1, 3), AMR_FIXED_GAIN(2, 3),
AMR_FIXED_GAIN(3, 3),
-AMR_FIXED_GAIN(0, 2), AMR_FIXED_GAIN(1, 2), AMR_FIXED_GAIN(2, 2),
AMR_FIXED_GAIN(3, 2),
+AMR_FGAIN(0, 4), AMR_FGAIN(1, 4), AMR_FGAIN(2, 4), AMR_FGAIN(3, 4),
+AMR_FGAIN(0, 3), AMR_FGAIN(1, 3), AMR_FGAIN(2, 3), AMR_FGAIN(3, 3),
+AMR_FGAIN(0, 2), AMR_FGAIN(1, 2), AMR_FGAIN(2, 2), AMR_FGAIN(3, 2),
AMR_PLAG(1, 5), AMR_PLAG(3, 5),
AMR_PLAG(1, 4), AMR_PLAG(3, 4),
AMR_PLAG(1, 3), AMR_PLAG(3, 3),
@@ -444,54 +444,54 @@ AMR_PLAG(1, 1), AMR_PLAG(3, 1),
AMR_LSF(3, 2), AMR_LSF(3, 1), AMR_LSF(3, 0), AMR_LSF(4, 5),
AMR_LSF(4, 4), AMR_LSF(4, 3), AMR_LSF(4, 2),
AMR_PGAIN(0, 0), AMR_PGAIN(1, 0), AMR_PGAIN(2, 0), AMR_PGAIN(3, 0),
-AMR_FIXED_GAIN(0, 1), AMR_FIXED_GAIN(1, 1), AMR_FIXED_GAIN(2, 1),
AMR_FIXED_GAIN(3, 1),
-AMR_PULSES(0, 0, 3), AMR_PULSES(1, 0, 3), AMR_PULSES(2, 0, 3), AMR_PULSES(3,
0, 3),
-AMR_PULSES(0, 1, 3), AMR_PULSES(1, 1, 3), AMR_PULSES(2, 1, 3), AMR_PULSES(3,
1, 3),
-AMR_FIXED_GAIN(0, 0), AMR_FIXED_GAIN(1, 0), AMR_FIXED_GAIN(2, 0),
AMR_FIXED_GAIN(3, 0),
-AMR_PULSES(0, 2, 3), AMR_PULSES(1, 2, 3), AMR_PULSES(2, 2, 3), AMR_PULSES(3,
2, 3),
-AMR_PULSES(0, 3, 3), AMR_PULSES(1, 3, 3), AMR_PULSES(2, 3, 3), AMR_PULSES(3,
3, 3),
-AMR_PULSES(0, 4, 3), AMR_PULSES(1, 4, 3), AMR_PULSES(2, 4, 3), AMR_PULSES(3,
4, 3),
+AMR_FGAIN(0, 1), AMR_FGAIN(1, 1), AMR_FGAIN(2, 1), AMR_FGAIN(3, 1),
+AMR_PULSE(0, 0, 3), AMR_PULSE(1, 0, 3), AMR_PULSE(2, 0, 3), AMR_PULSE(3, 0, 3),
+AMR_PULSE(0, 1, 3), AMR_PULSE(1, 1, 3), AMR_PULSE(2, 1, 3), AMR_PULSE(3, 1, 3),
+AMR_FGAIN(0, 0), AMR_FGAIN(1, 0), AMR_FGAIN(2, 0), AMR_FGAIN(3, 0),
+AMR_PULSE(0, 2, 3), AMR_PULSE(1, 2, 3), AMR_PULSE(2, 2, 3), AMR_PULSE(3, 2, 3),
+AMR_PULSE(0, 3, 3), AMR_PULSE(1, 3, 3), AMR_PULSE(2, 3, 3), AMR_PULSE(3, 3, 3),
+AMR_PULSE(0, 4, 3), AMR_PULSE(1, 4, 3), AMR_PULSE(2, 4, 3), AMR_PULSE(3, 4, 3),
AMR_LSF(4, 1), AMR_LSF(4, 0),
-AMR_PULSES(0, 0, 0), AMR_PULSES(0, 0, 1), AMR_PULSES(0, 0, 2),
-AMR_PULSES(0, 1, 0), AMR_PULSES(0, 1, 1), AMR_PULSES(0, 1, 2),
-AMR_PULSES(0, 2, 0), AMR_PULSES(0, 2, 1), AMR_PULSES(0, 2, 2),
-AMR_PULSES(0, 3, 0), AMR_PULSES(0, 3, 1), AMR_PULSES(0, 3, 2),
-AMR_PULSES(0, 4, 0), AMR_PULSES(0, 4, 1), AMR_PULSES(0, 4, 2),
-AMR_PULSES(1, 0, 0), AMR_PULSES(1, 0, 1), AMR_PULSES(1, 0, 2),
-AMR_PULSES(1, 1, 0), AMR_PULSES(1, 1, 1), AMR_PULSES(1, 1, 2),
-AMR_PULSES(1, 2, 0), AMR_PULSES(1, 2, 1), AMR_PULSES(1, 2, 2),
-AMR_PULSES(1, 3, 0), AMR_PULSES(1, 3, 1), AMR_PULSES(1, 3, 2),
-AMR_PULSES(1, 4, 0), AMR_PULSES(1, 4, 1), AMR_PULSES(1, 4, 2),
-AMR_PULSES(2, 0, 0), AMR_PULSES(2, 0, 1), AMR_PULSES(2, 0, 2),
-AMR_PULSES(2, 1, 0), AMR_PULSES(2, 1, 1), AMR_PULSES(2, 1, 2),
-AMR_PULSES(2, 2, 0), AMR_PULSES(2, 2, 1), AMR_PULSES(2, 2, 2),
-AMR_PULSES(2, 3, 0), AMR_PULSES(2, 3, 1), AMR_PULSES(2, 3, 2),
-AMR_PULSES(2, 4, 0), AMR_PULSES(2, 4, 1), AMR_PULSES(2, 4, 2),
-AMR_PULSES(3, 0, 0), AMR_PULSES(3, 0, 1), AMR_PULSES(3, 0, 2),
-AMR_PULSES(3, 1, 0), AMR_PULSES(3, 1, 1), AMR_PULSES(3, 1, 2),
-AMR_PULSES(3, 2, 0), AMR_PULSES(3, 2, 1), AMR_PULSES(3, 2, 2),
-AMR_PULSES(3, 3, 0), AMR_PULSES(3, 3, 1), AMR_PULSES(3, 3, 2),
-AMR_PULSES(3, 4, 0), AMR_PULSES(3, 4, 1), AMR_PULSES(3, 4, 2),
-AMR_PULSES(0, 5, 0), AMR_PULSES(0, 5, 1), AMR_PULSES(0, 5, 2),
-AMR_PULSES(0, 6, 0), AMR_PULSES(0, 6, 1), AMR_PULSES(0, 6, 2),
-AMR_PULSES(0, 7, 0), AMR_PULSES(0, 7, 1), AMR_PULSES(0, 7, 2),
-AMR_PULSES(0, 8, 0), AMR_PULSES(0, 8, 1), AMR_PULSES(0, 8, 2),
-AMR_PULSES(0, 9, 0), AMR_PULSES(0, 9, 1), AMR_PULSES(0, 9, 2),
-AMR_PULSES(1, 5, 0), AMR_PULSES(1, 5, 1), AMR_PULSES(1, 5, 2),
-AMR_PULSES(1, 6, 0), AMR_PULSES(1, 6, 1), AMR_PULSES(1, 6, 2),
-AMR_PULSES(1, 7, 0), AMR_PULSES(1, 7, 1), AMR_PULSES(1, 7, 2),
-AMR_PULSES(1, 8, 0), AMR_PULSES(1, 8, 1), AMR_PULSES(1, 8, 2),
-AMR_PULSES(1, 9, 0), AMR_PULSES(1, 9, 1), AMR_PULSES(1, 9, 2),
-AMR_PULSES(2, 5, 0), AMR_PULSES(2, 5, 1), AMR_PULSES(2, 5, 2),
-AMR_PULSES(2, 6, 0), AMR_PULSES(2, 6, 1), AMR_PULSES(2, 6, 2),
-AMR_PULSES(2, 7, 0), AMR_PULSES(2, 7, 1), AMR_PULSES(2, 7, 2),
-AMR_PULSES(2, 8, 0), AMR_PULSES(2, 8, 1), AMR_PULSES(2, 8, 2),
-AMR_PULSES(2, 9, 0), AMR_PULSES(2, 9, 1), AMR_PULSES(2, 9, 2),
-AMR_PULSES(3, 5, 0), AMR_PULSES(3, 5, 1), AMR_PULSES(3, 5, 2),
-AMR_PULSES(3, 6, 0), AMR_PULSES(3, 6, 1), AMR_PULSES(3, 6, 2),
-AMR_PULSES(3, 7, 0), AMR_PULSES(3, 7, 1), AMR_PULSES(3, 7, 2),
-AMR_PULSES(3, 8, 0), AMR_PULSES(3, 8, 1), AMR_PULSES(3, 8, 2),
-AMR_PULSES(3, 9, 0), AMR_PULSES(3, 9, 1), AMR_PULSES(3, 9, 2),
+AMR_PULSE(0, 0, 0), AMR_PULSE(0, 0, 1), AMR_PULSE(0, 0, 2),
+AMR_PULSE(0, 1, 0), AMR_PULSE(0, 1, 1), AMR_PULSE(0, 1, 2),
+AMR_PULSE(0, 2, 0), AMR_PULSE(0, 2, 1), AMR_PULSE(0, 2, 2),
+AMR_PULSE(0, 3, 0), AMR_PULSE(0, 3, 1), AMR_PULSE(0, 3, 2),
+AMR_PULSE(0, 4, 0), AMR_PULSE(0, 4, 1), AMR_PULSE(0, 4, 2),
+AMR_PULSE(1, 0, 0), AMR_PULSE(1, 0, 1), AMR_PULSE(1, 0, 2),
+AMR_PULSE(1, 1, 0), AMR_PULSE(1, 1, 1), AMR_PULSE(1, 1, 2),
+AMR_PULSE(1, 2, 0), AMR_PULSE(1, 2, 1), AMR_PULSE(1, 2, 2),
+AMR_PULSE(1, 3, 0), AMR_PULSE(1, 3, 1), AMR_PULSE(1, 3, 2),
+AMR_PULSE(1, 4, 0), AMR_PULSE(1, 4, 1), AMR_PULSE(1, 4, 2),
+AMR_PULSE(2, 0, 0), AMR_PULSE(2, 0, 1), AMR_PULSE(2, 0, 2),
+AMR_PULSE(2, 1, 0), AMR_PULSE(2, 1, 1), AMR_PULSE(2, 1, 2),
+AMR_PULSE(2, 2, 0), AMR_PULSE(2, 2, 1), AMR_PULSE(2, 2, 2),
+AMR_PULSE(2, 3, 0), AMR_PULSE(2, 3, 1), AMR_PULSE(2, 3, 2),
+AMR_PULSE(2, 4, 0), AMR_PULSE(2, 4, 1), AMR_PULSE(2, 4, 2),
+AMR_PULSE(3, 0, 0), AMR_PULSE(3, 0, 1), AMR_PULSE(3, 0, 2),
+AMR_PULSE(3, 1, 0), AMR_PULSE(3, 1, 1), AMR_PULSE(3, 1, 2),
+AMR_PULSE(3, 2, 0), AMR_PULSE(3, 2, 1), AMR_PULSE(3, 2, 2),
+AMR_PULSE(3, 3, 0), AMR_PULSE(3, 3, 1), AMR_PULSE(3, 3, 2),
+AMR_PULSE(3, 4, 0), AMR_PULSE(3, 4, 1), AMR_PULSE(3, 4, 2),
+AMR_PULSE(0, 5, 0), AMR_PULSE(0, 5, 1), AMR_PULSE(0, 5, 2),
+AMR_PULSE(0, 6, 0), AMR_PULSE(0, 6, 1), AMR_PULSE(0, 6, 2),
+AMR_PULSE(0, 7, 0), AMR_PULSE(0, 7, 1), AMR_PULSE(0, 7, 2),
+AMR_PULSE(0, 8, 0), AMR_PULSE(0, 8, 1), AMR_PULSE(0, 8, 2),
+AMR_PULSE(0, 9, 0), AMR_PULSE(0, 9, 1), AMR_PULSE(0, 9, 2),
+AMR_PULSE(1, 5, 0), AMR_PULSE(1, 5, 1), AMR_PULSE(1, 5, 2),
+AMR_PULSE(1, 6, 0), AMR_PULSE(1, 6, 1), AMR_PULSE(1, 6, 2),
+AMR_PULSE(1, 7, 0), AMR_PULSE(1, 7, 1), AMR_PULSE(1, 7, 2),
+AMR_PULSE(1, 8, 0), AMR_PULSE(1, 8, 1), AMR_PULSE(1, 8, 2),
+AMR_PULSE(1, 9, 0), AMR_PULSE(1, 9, 1), AMR_PULSE(1, 9, 2),
+AMR_PULSE(2, 5, 0), AMR_PULSE(2, 5, 1), AMR_PULSE(2, 5, 2),
+AMR_PULSE(2, 6, 0), AMR_PULSE(2, 6, 1), AMR_PULSE(2, 6, 2),
+AMR_PULSE(2, 7, 0), AMR_PULSE(2, 7, 1), AMR_PULSE(2, 7, 2),
+AMR_PULSE(2, 8, 0), AMR_PULSE(2, 8, 1), AMR_PULSE(2, 8, 2),
+AMR_PULSE(2, 9, 0), AMR_PULSE(2, 9, 1), AMR_PULSE(2, 9, 2),
+AMR_PULSE(3, 5, 0), AMR_PULSE(3, 5, 1), AMR_PULSE(3, 5, 2),
+AMR_PULSE(3, 6, 0), AMR_PULSE(3, 6, 1), AMR_PULSE(3, 6, 2),
+AMR_PULSE(3, 7, 0), AMR_PULSE(3, 7, 1), AMR_PULSE(3, 7, 2),
+AMR_PULSE(3, 8, 0), AMR_PULSE(3, 8, 1), AMR_PULSE(3, 8, 2),
+AMR_PULSE(3, 9, 0), AMR_PULSE(3, 9, 1), AMR_PULSE(3, 9, 2),
AMR_PLAG(1, 0), AMR_PLAG(3, 0)
};
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
