[FFmpeg-soc] [soc]AMR-WB decoder branch, master, updated.

Marcelo Póvoa marspeoplester at gmail.com
Wed Jul 7 16:58:23 CEST 2010


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "AMR-WB decoder".

The branch, master has been updated
       via  4eb7fe39243afcfe69438ad5ec3dc64eda5aed82 (commit)
      from  222bb38d248bd57851851fa54e41b749eb1081e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4eb7fe39243afcfe69438ad5ec3dc64eda5aed82
Author: Marcelo Povoa <marspeoplester at gmail.com>
Date:   Wed Jul 7 11:57:14 2010 -0300

    Rename some subframe variables related to algebraic codebook

diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h
index 5e4f62e..6b74e85 100644
--- a/libavcodec/amrwbdata.h
+++ b/libavcodec/amrwbdata.h
@@ -52,11 +52,11 @@ typedef struct {
     uint16_t adap;                         ///< adaptive codebook index
     uint8_t ltp;                           ///< ltp-filtering flag
     uint8_t vq;                            ///< VQ gain
-    uint8_t pulse;                         ///< pulse selector for tracks (2 bits each)
+    uint8_t pul_sel;                       ///< pulse case selector for tracks (2 bits each)
     uint8_t gain;                          ///< codebooks gain
     uint8_t energy;                        ///< high-band energy
-    uint16_t cbook1[4];                    ///< first codebook index for tracks
-    uint16_t cbook2[4];                    ///< second codebook index for tracks
+    uint16_t pul_ih[4];                    ///< MSBs part of codebook index (high modes only)
+    uint16_t pul_il[4];                    ///< LSBs part of codebook index
 } AMRWBSubFrame;
 
 typedef struct {
@@ -88,19 +88,19 @@ static const uint16_t order_MODE_6k60[] = {
      7,   AMR_BIT(isp_id[3]),  59,  60,  61,  62,  63,  76,  77,
      6,   AMR_BIT(isp_id[4]),  78,  79,  81,  80,  82,  83,
      8,      AMR_OF(0, adap),  12,  13,  14,  15,  27,  28,  54,  66,
-    12, AMR_OF(0, cbook1[0]),  84,  92, 100, 108, 116, 124,  85,  96,
+    12, AMR_OF(0, pul_il[0]),  84,  92, 100, 108, 116, 124,  85,  96,
                               104, 112, 120, 128,
      6,        AMR_OF(0, vq),  33,  16,  37,  20,   4,   8,
      5,      AMR_OF(1, adap),  39,  46,  56,  68,  74,
-    12, AMR_OF(1, cbook1[0]),  86,  93, 101, 109, 117, 125,  87,  97,
+    12, AMR_OF(1, pul_il[0]),  86,  93, 101, 109, 117, 125,  87,  97,
                               105, 113, 121, 129,
      6,        AMR_OF(1, vq),  29,  17,  35,  21,   5,   9,
      5,      AMR_OF(2, adap),  42,  47,  53,  55,  67,
-    12, AMR_OF(2, cbook1[0]),  88,  94, 102, 110, 118, 126,  89,  98,
+    12, AMR_OF(2, pul_il[0]),  88,  94, 102, 110, 118, 126,  89,  98,
                               106, 114, 122, 130,
      6,        AMR_OF(2, vq),  34,  18,  36,  22,   6,  24,
      5,      AMR_OF(3, adap),  40,  41,  57,  69,  75,
-    12, AMR_OF(3, cbook1[0]),  90,  95, 103, 111, 119, 127,  91,  99,
+    12, AMR_OF(3, pul_il[0]),  90,  95, 103, 111, 119, 127,  91,  99,
                               107, 115, 123, 131,
      6,        AMR_OF(3, vq),  30,  19,  26,  23,   7,  25,
      0
@@ -116,28 +116,28 @@ static const uint16_t order_MODE_8k85[] = {
      5,   AMR_BIT(isp_id[5]),  85,  88,  87,  89,  92,
      5,   AMR_BIT(isp_id[6]),  93,  94,  95,  96,  80,
      8,      AMR_OF(0, adap),   6,   7,   8,  36,  38,  61,  71,  83,
-     5, AMR_OF(0, cbook1[0]),  97, 113, 129, 145, 161,
-     5, AMR_OF(0, cbook1[1]),  98, 117, 133, 149, 165,
-     5, AMR_OF(0, cbook1[2]),  99, 121, 137, 153, 169,
-     5, AMR_OF(0, cbook1[3]), 100, 125, 141, 157, 173,
+     5, AMR_OF(0, pul_il[0]),  97, 113, 129, 145, 161,
+     5, AMR_OF(0, pul_il[1]),  98, 117, 133, 149, 165,
+     5, AMR_OF(0, pul_il[2]),  99, 121, 137, 153, 169,
+     5, AMR_OF(0, pul_il[3]), 100, 125, 141, 157, 173,
      6,        AMR_OF(0, vq),  12,  32,  20,  24,  28,  16,
      5,      AMR_OF(1, adap),  41,  64,  69,  75,  90,
-     5, AMR_OF(1, cbook1[0]), 101, 114, 130, 146, 162,
-     5, AMR_OF(1, cbook1[1]), 102, 118, 134, 150, 166,
-     5, AMR_OF(1, cbook1[2]), 103, 122, 138, 154, 170,
-     5, AMR_OF(1, cbook1[3]), 104, 126, 142, 158, 174,
+     5, AMR_OF(1, pul_il[0]), 101, 114, 130, 146, 162,
+     5, AMR_OF(1, pul_il[1]), 102, 118, 134, 150, 166,
+     5, AMR_OF(1, pul_il[2]), 103, 122, 138, 154, 170,
+     5, AMR_OF(1, pul_il[3]), 104, 126, 142, 158, 174,
      6,        AMR_OF(1, vq),  13,  33,  21,  25,  29,  17,
      8,      AMR_OF(2, adap),   9,  10,  11,  37,  42,  62,  72,  84,
-     5, AMR_OF(2, cbook1[0]), 105, 115, 131, 147, 163,
-     5, AMR_OF(2, cbook1[1]), 106, 119, 135, 151, 167,
-     5, AMR_OF(2, cbook1[2]), 107, 123, 139, 155, 171,
-     5, AMR_OF(2, cbook1[3]), 108, 127, 143, 159, 175,
+     5, AMR_OF(2, pul_il[0]), 105, 115, 131, 147, 163,
+     5, AMR_OF(2, pul_il[1]), 106, 119, 135, 151, 167,
+     5, AMR_OF(2, pul_il[2]), 107, 123, 139, 155, 171,
+     5, AMR_OF(2, pul_il[3]), 108, 127, 143, 159, 175,
      6,        AMR_OF(2, vq),  14,  34,  22,  26,  30,  18,
      5,      AMR_OF(3, adap),  43,  65,  70,  76,  91,
-     5, AMR_OF(3, cbook1[0]), 109, 116, 132, 148, 164,
-     5, AMR_OF(3, cbook1[1]), 110, 120, 136, 152, 168,
-     5, AMR_OF(3, cbook1[2]), 111, 124, 140, 156, 172,
-     5, AMR_OF(3, cbook1[3]), 112, 128, 144, 160, 176,
+     5, AMR_OF(3, pul_il[0]), 109, 116, 132, 148, 164,
+     5, AMR_OF(3, pul_il[1]), 110, 120, 136, 152, 168,
+     5, AMR_OF(3, pul_il[2]), 111, 124, 140, 156, 172,
+     5, AMR_OF(3, pul_il[3]), 112, 128, 144, 160, 176,
      6,        AMR_OF(3, vq),  15,  35,  23,  27,  31,  19,
      0
 };
@@ -154,47 +154,47 @@ static const uint16_t order_MODE_12k65[] = {
      9,      AMR_OF(0, adap),  10,  11,  12,  13,  14,  46,  69,  79,
                                91,
      1,       AMR_OF(0, ltp), 105,
-     9, AMR_OF(0, cbook1[0]), 109, 125, 157, 189, 221, 129, 161, 193,
+     9, AMR_OF(0, pul_il[0]), 109, 125, 157, 189, 221, 129, 161, 193,
                               225,
-     9, AMR_OF(0, cbook1[1]), 110, 133, 165, 197, 229, 137, 169, 201,
+     9, AMR_OF(0, pul_il[1]), 110, 133, 165, 197, 229, 137, 169, 201,
                               233,
-     9, AMR_OF(0, cbook1[2]), 111, 141, 173, 205, 237, 145, 177, 209,
+     9, AMR_OF(0, pul_il[2]), 111, 141, 173, 205, 237, 145, 177, 209,
                               241,
-     9, AMR_OF(0, cbook1[3]), 112, 149, 181, 213, 245, 153, 185, 217,
+     9, AMR_OF(0, pul_il[3]), 112, 149, 181, 213, 245, 153, 185, 217,
                               249,
      7,        AMR_OF(0, vq),   3,  20,  42,  28,  32,  38,  24,
      6,      AMR_OF(2, adap),  36,  49,  72,  77,  83,  98,
      1,       AMR_OF(2, ltp), 106,
-     9, AMR_OF(2, cbook1[0]), 113, 126, 158, 190, 222, 130, 162, 194,
+     9, AMR_OF(2, pul_il[0]), 113, 126, 158, 190, 222, 130, 162, 194,
                               226,
-     9, AMR_OF(2, cbook1[1]), 114, 134, 166, 198, 230, 138, 170, 202,
+     9, AMR_OF(2, pul_il[1]), 114, 134, 166, 198, 230, 138, 170, 202,
                               234,
-     9, AMR_OF(2, cbook1[2]), 115, 142, 174, 206, 238, 146, 178, 210,
+     9, AMR_OF(2, pul_il[2]), 115, 142, 174, 206, 238, 146, 178, 210,
                               242,
-     9, AMR_OF(2, cbook1[3]), 116, 150, 182, 214, 246, 154, 186, 218,
+     9, AMR_OF(2, pul_il[3]), 116, 150, 182, 214, 246, 154, 186, 218,
                               250,
      7,        AMR_OF(2, vq),   4,  21,  43,  29,  33,  39,  25,
      9,      AMR_OF(3, adap),  15,  16,  17,  18,  19,  51,  70,  80,
                                92,
      1,       AMR_OF(3, ltp), 107,
-     9, AMR_OF(3, cbook1[0]), 117, 127, 159, 191, 223, 131, 163, 195,
+     9, AMR_OF(3, pul_il[0]), 117, 127, 159, 191, 223, 131, 163, 195,
                               227,
-     9, AMR_OF(3, cbook1[1]), 118, 135, 167, 199, 231, 139, 171, 203,
+     9, AMR_OF(3, pul_il[1]), 118, 135, 167, 199, 231, 139, 171, 203,
                               235,
-     9, AMR_OF(3, cbook1[2]), 119, 143, 175, 207, 239, 147, 179, 211,
+     9, AMR_OF(3, pul_il[2]), 119, 143, 175, 207, 239, 147, 179, 211,
                               243,
-     9, AMR_OF(3, cbook1[3]), 120, 151, 183, 215, 247, 155, 187, 219,
+     9, AMR_OF(3, pul_il[3]), 120, 151, 183, 215, 247, 155, 187, 219,
                               251,
      7,        AMR_OF(3, vq),   5,  22,  44,  30,  34,  40,  26,
      6,      AMR_OF(4, adap),  37,  50,  73,  78,  84,  99,
      1,       AMR_OF(4, ltp), 108,
-     9, AMR_OF(4, cbook1[0]), 121, 128, 160, 192, 224, 132, 164, 196,
+     9, AMR_OF(4, pul_il[0]), 121, 128, 160, 192, 224, 132, 164, 196,
                               228,
-     9, AMR_OF(4, cbook1[1]), 122, 136, 168, 200, 232, 140, 172, 204,
+     9, AMR_OF(4, pul_il[1]), 122, 136, 168, 200, 232, 140, 172, 204,
                               236,
-     9, AMR_OF(4, cbook1[2]), 123, 144, 176, 208, 240, 148, 180, 212,
+     9, AMR_OF(4, pul_il[2]), 123, 144, 176, 208, 240, 148, 180, 212,
                               244,
-     9, AMR_OF(4, cbook1[3]), 124, 152, 184, 216, 248, 156, 188, 220,
+     9, AMR_OF(4, pul_il[3]), 124, 152, 184, 216, 248, 156, 188, 220,
                               252,
      7,        AMR_OF(4, vq),   6,  23,  45,  31,  35,  41,  27,
      0
@@ -212,47 +212,47 @@ static const uint16_t order_MODE_14k25[] = {
      9,      AMR_OF(0, adap),  10,  11,  12,  13,  14,  46,  69,  79,
                                91,
      1,       AMR_OF(0, ltp), 105,
-    13, AMR_OF(0, cbook1[0]), 117, 189, 213, 237, 261, 109, 121, 165,
+    13, AMR_OF(0, pul_il[0]), 117, 189, 213, 237, 261, 109, 121, 165,
                               173, 193, 217, 241, 265,
-    13, AMR_OF(0, cbook1[1]), 125, 197, 221, 245, 269, 113, 129, 169,
+    13, AMR_OF(0, pul_il[1]), 125, 197, 221, 245, 269, 113, 129, 169,
                               177, 201, 225, 249, 273,
-     9, AMR_OF(0, cbook1[2]), 133, 141, 149, 157, 181, 205, 229, 253,
+     9, AMR_OF(0, pul_il[2]), 133, 141, 149, 157, 181, 205, 229, 253,
                               277,
-     9, AMR_OF(0, cbook1[3]), 137, 145, 153, 161, 185, 209, 233, 257,
+     9, AMR_OF(0, pul_il[3]), 137, 145, 153, 161, 185, 209, 233, 257,
                               281,
      7,        AMR_OF(0, vq),   3,  20,  42,  28,  32,  38,  24,
      6,      AMR_OF(1, adap),  36,  49,  72,  77,  83,  98,
      1,       AMR_OF(1, ltp), 106,
-    13, AMR_OF(1, cbook1[0]), 118, 190, 214, 238, 262, 110, 122, 166,
+    13, AMR_OF(1, pul_il[0]), 118, 190, 214, 238, 262, 110, 122, 166,
                               174, 194, 218, 242, 266,
-    13, AMR_OF(1, cbook1[1]), 126, 198, 222, 246, 270, 114, 130, 170,
+    13, AMR_OF(1, pul_il[1]), 126, 198, 222, 246, 270, 114, 130, 170,
                               178, 202, 226, 250, 274,
-     9, AMR_OF(1, cbook1[2]), 134, 142, 150, 158, 182, 206, 230, 254,
+     9, AMR_OF(1, pul_il[2]), 134, 142, 150, 158, 182, 206, 230, 254,
                               278,
-     9, AMR_OF(1, cbook1[3]), 138, 146, 154, 162, 186, 210, 234, 258,
+     9, AMR_OF(1, pul_il[3]), 138, 146, 154, 162, 186, 210, 234, 258,
                               282,
      7,        AMR_OF(1, vq),   4,  21,  43,  29,  33,  39,  25,
      9,      AMR_OF(2, adap),  15,  16,  17,  18,  19,  51,  70,  80,
                                92,
      1,       AMR_OF(2, ltp), 107,
-    13, AMR_OF(2, cbook1[0]), 119, 191, 215, 239, 263, 111, 123, 167,
+    13, AMR_OF(2, pul_il[0]), 119, 191, 215, 239, 263, 111, 123, 167,
                               175, 195, 219, 243, 267,
-    13, AMR_OF(2, cbook1[1]), 127, 199, 223, 247, 271, 115, 131, 171,
+    13, AMR_OF(2, pul_il[1]), 127, 199, 223, 247, 271, 115, 131, 171,
                               179, 203, 227, 251, 275,
-     9, AMR_OF(2, cbook1[2]), 135, 143, 151, 159, 183, 207, 231, 255,
+     9, AMR_OF(2, pul_il[2]), 135, 143, 151, 159, 183, 207, 231, 255,
                               279,
-     9, AMR_OF(2, cbook1[3]), 139, 147, 155, 163, 187, 211, 235, 259,
+     9, AMR_OF(2, pul_il[3]), 139, 147, 155, 163, 187, 211, 235, 259,
                               283,
      7,        AMR_OF(2, vq),   5,  22,  44,  30,  34,  40,  26,
      6,      AMR_OF(3, adap),  37,  50,  73,  78,  84,  99,
      1,       AMR_OF(3, ltp), 108,
-    13, AMR_OF(3, cbook1[0]), 120, 192, 216, 240, 264, 112, 124, 168,
+    13, AMR_OF(3, pul_il[0]), 120, 192, 216, 240, 264, 112, 124, 168,
                               176, 196, 220, 244, 268,
-    13, AMR_OF(3, cbook1[1]), 128, 200, 224, 248, 272, 116, 132, 172,
+    13, AMR_OF(3, pul_il[1]), 128, 200, 224, 248, 272, 116, 132, 172,
                               180, 204, 228, 252, 276,
-     9, AMR_OF(3, cbook1[2]), 136, 144, 152, 160, 184, 208, 232, 256,
+     9, AMR_OF(3, pul_il[2]), 136, 144, 152, 160, 184, 208, 232, 256,
                               280,
-     9, AMR_OF(3, cbook1[3]), 140, 148, 156, 164, 188, 212, 236, 260,
+     9, AMR_OF(3, pul_il[3]), 140, 148, 156, 164, 188, 212, 236, 260,
                               284,
      7,        AMR_OF(3, vq),   6,  23,  45,  31,  35,  41,  27,
      0
@@ -270,47 +270,47 @@ static const uint16_t order_MODE_15k85[] = {
      9,      AMR_OF(0, adap),  10,  11,  12,  13,  14,  46,  69,  79,
                                91,
      1,       AMR_OF(0, ltp), 105,
-    13, AMR_OF(0, cbook1[0]), 125, 157, 173, 221, 269, 141, 109, 177,
+    13, AMR_OF(0, pul_il[0]), 125, 157, 173, 221, 269, 141, 109, 177,
                               225, 273, 181, 229, 277,
-    13, AMR_OF(0, cbook1[1]), 129, 161, 185, 233, 281, 145, 113, 189,
+    13, AMR_OF(0, pul_il[1]), 129, 161, 185, 233, 281, 145, 113, 189,
                               237, 285, 193, 241, 289,
-    13, AMR_OF(0, cbook1[2]), 133, 165, 197, 245, 293, 149, 117, 201,
+    13, AMR_OF(0, pul_il[2]), 133, 165, 197, 245, 293, 149, 117, 201,
                               249, 297, 205, 253, 301,
-    13, AMR_OF(0, cbook1[3]), 137, 169, 209, 257, 305, 153, 121, 213,
+    13, AMR_OF(0, pul_il[3]), 137, 169, 209, 257, 305, 153, 121, 213,
                               261, 309, 217, 265, 313,
      7,        AMR_OF(0, vq),   3,  20,  42,  28,  32,  38,  24,
      6,      AMR_OF(1, adap),  36,  49,  72,  77,  83,  98,
      1,       AMR_OF(1, ltp), 106,
-    13, AMR_OF(1, cbook1[0]), 126, 158, 174, 222, 270, 142, 110, 178,
+    13, AMR_OF(1, pul_il[0]), 126, 158, 174, 222, 270, 142, 110, 178,
                               226, 274, 182, 230, 278,
-    13, AMR_OF(1, cbook1[1]), 130, 162, 186, 234, 282, 146, 114, 190,
+    13, AMR_OF(1, pul_il[1]), 130, 162, 186, 234, 282, 146, 114, 190,
                               238, 286, 194, 242, 290,
-    13, AMR_OF(1, cbook1[2]), 134, 166, 198, 246, 294, 150, 118, 202,
+    13, AMR_OF(1, pul_il[2]), 134, 166, 198, 246, 294, 150, 118, 202,
                               250, 298, 206, 254, 302,
-    13, AMR_OF(1, cbook1[3]), 138, 170, 210, 258, 306, 154, 122, 214,
+    13, AMR_OF(1, pul_il[3]), 138, 170, 210, 258, 306, 154, 122, 214,
                               262, 310, 218, 266, 314,
      7,        AMR_OF(1, vq),   4,  21,  43,  29,  33,  39,  25,
      9,      AMR_OF(2, adap),  15,  16,  17,  18,  19,  51,  70,  80,
                                92,
      1,       AMR_OF(2, ltp), 107,
-    13, AMR_OF(2, cbook1[0]), 127, 159, 175, 223, 271, 143, 111, 179,
+    13, AMR_OF(2, pul_il[0]), 127, 159, 175, 223, 271, 143, 111, 179,
                               227, 275, 183, 231, 279,
-    13, AMR_OF(2, cbook1[1]), 131, 163, 187, 235, 283, 147, 115, 191,
+    13, AMR_OF(2, pul_il[1]), 131, 163, 187, 235, 283, 147, 115, 191,
                               239, 287, 195, 243, 291,
-    13, AMR_OF(2, cbook1[2]), 135, 167, 199, 247, 295, 151, 119, 203,
+    13, AMR_OF(2, pul_il[2]), 135, 167, 199, 247, 295, 151, 119, 203,
                               251, 299, 207, 255, 303,
-    13, AMR_OF(2, cbook1[3]), 139, 171, 211, 259, 307, 155, 123, 215,
+    13, AMR_OF(2, pul_il[3]), 139, 171, 211, 259, 307, 155, 123, 215,
                               263, 311, 219, 267, 315,
      7,        AMR_OF(2, vq),   5,  22,  44,  30,  34,  40,  26,
      6,      AMR_OF(3, adap),  37,  50,  73,  78,  84,  99,
      1,       AMR_OF(3, ltp), 108,
-    13, AMR_OF(3, cbook1[0]), 128, 160, 176, 224, 272, 144, 112, 180,
+    13, AMR_OF(3, pul_il[0]), 128, 160, 176, 224, 272, 144, 112, 180,
                               228, 276, 184, 232, 280,
-    13, AMR_OF(3, cbook1[1]), 132, 164, 188, 236, 284, 148, 116, 192,
+    13, AMR_OF(3, pul_il[1]), 132, 164, 188, 236, 284, 148, 116, 192,
                               240, 288, 196, 244, 292,
-    13, AMR_OF(3, cbook1[2]), 136, 168, 200, 248, 296, 152, 120, 204,
+    13, AMR_OF(3, pul_il[2]), 136, 168, 200, 248, 296, 152, 120, 204,
                               252, 300, 208, 256, 304,
-    13, AMR_OF(3, cbook1[3]), 140, 172, 212, 260, 308, 156, 124, 216,
+    13, AMR_OF(3, pul_il[3]), 140, 172, 212, 260, 308, 156, 124, 216,
                               264, 312, 220, 268, 316,
      7,        AMR_OF(3, vq),   6,  23,  45,  31,  35,  41,  27,
      0
@@ -328,51 +328,51 @@ static const uint16_t order_MODE_18k25[] = {
      9,      AMR_OF(0, adap),  10,  11,  12,  13,  14,  46,  69,  79,
                                91,
      1,       AMR_OF(0, ltp), 105,
-     8,     AMR_OF(0, pulse), 123, 116, 145, 114, 134, 117, 126, 132,
-    14, AMR_OF(0, cbook1[0]), 166, 262, 336, 192, 182, 296, 203, 170,
+     8,   AMR_OF(0, pul_sel), 123, 116, 145, 114, 134, 117, 126, 132,
+    14, AMR_OF(0, pul_il[0]), 166, 262, 336, 192, 182, 296, 203, 170,
                               175, 259, 274, 308, 341, 135,
-    14, AMR_OF(0, cbook1[1]), 197, 281, 348, 217, 209, 315, 235, 159,
+    14, AMR_OF(0, pul_il[1]), 197, 281, 348, 217, 209, 315, 235, 159,
                               161, 245, 283, 307, 351, 137,
-    14, AMR_OF(0, cbook1[2]), 174, 278, 358, 205, 186, 304, 247, 207,
+    14, AMR_OF(0, pul_il[2]), 174, 278, 358, 205, 186, 304, 247, 207,
                               172, 258, 306, 303, 350, 133,
-    14, AMR_OF(0, cbook1[3]), 193, 276, 346, 188, 164, 285, 198, 196,
+    14, AMR_OF(0, pul_il[3]), 193, 276, 346, 188, 164, 285, 198, 196,
                               168, 237, 270, 294, 335, 112,
      7,        AMR_OF(0, vq),   3,  20,  42,  28,  32,  38,  24,
      6,      AMR_OF(1, adap),  36,  49,  72,  77,  83,  98,
      1,       AMR_OF(1, ltp), 106,
-     8,     AMR_OF(1, pulse), 140, 111, 128, 113, 119, 120, 139, 138,
-    14, AMR_OF(1, cbook1[0]), 180, 275, 339, 230, 216, 326, 236, 185,
+     8,   AMR_OF(1, pul_sel), 140, 111, 128, 113, 119, 120, 139, 138,
+    14, AMR_OF(1, pul_il[0]), 180, 275, 339, 230, 216, 326, 236, 185,
                               177, 264, 305, 316, 359, 122,
-    14, AMR_OF(1, cbook1[1]), 158, 271, 334, 239, 214, 324, 224, 162,
+    14, AMR_OF(1, pul_il[1]), 158, 271, 334, 239, 214, 324, 224, 162,
                               184, 272, 293, 319, 360, 129,
-    14, AMR_OF(1, cbook1[2]), 160, 266, 338, 202, 194, 301, 231, 167,
+    14, AMR_OF(1, pul_il[2]), 160, 266, 338, 202, 194, 301, 231, 167,
                               173, 260, 287, 314, 354, 147,
-    14, AMR_OF(1, cbook1[3]), 204, 279, 337, 228, 199, 300, 238, 171,
+    14, AMR_OF(1, pul_il[3]), 204, 279, 337, 228, 199, 300, 238, 171,
                               176, 263, 284, 321, 356, 109,
      7,        AMR_OF(1, vq),   4,  21,  43,  29,  33,  39,  25,
      9,      AMR_OF(2, adap),  15,  16,  17,  18,  19,  51,  70,  80,
                                92,
      1,       AMR_OF(2, ltp), 107,
-     8,     AMR_OF(2, pulse), 151, 127, 154, 124, 150, 141, 131, 157,
-    14, AMR_OF(2, cbook1[0]), 246, 312, 362, 251, 250, 332, 249, 225,
+     8,   AMR_OF(2, pul_sel), 151, 127, 154, 124, 150, 141, 131, 157,
+    14, AMR_OF(2, pul_il[0]), 246, 312, 362, 251, 250, 332, 249, 225,
                               219, 256, 282, 317, 363, 155,
-    14, AMR_OF(2, cbook1[1]), 240, 292, 340, 254, 253, 331, 268, 195,
+    14, AMR_OF(2, pul_il[1]), 240, 292, 340, 254, 253, 331, 268, 195,
                               200, 267, 311, 323, 355, 153,
-    14, AMR_OF(2, cbook1[2]), 213, 299, 347, 244, 234, 330, 241, 201,
+    14, AMR_OF(2, pul_il[2]), 213, 299, 347, 244, 234, 330, 241, 201,
                               220, 269, 313, 328, 364, 152,
-    14, AMR_OF(2, cbook1[3]), 232, 309, 361, 218, 229, 302, 252, 191,
+    14, AMR_OF(2, pul_il[3]), 232, 309, 361, 218, 229, 302, 252, 191,
                               181, 261, 291, 310, 349, 115,
      7,        AMR_OF(2, vq),   5,  22,  44,  30,  34,  40,  26,
      6,      AMR_OF(3, adap),  37,  50,  73,  78,  84,  99,
      1,       AMR_OF(3, ltp), 108,
-     8,     AMR_OF(3, pulse), 136, 121, 142, 125, 146, 110, 130, 143,
-    14, AMR_OF(3, cbook1[0]), 165, 280, 342, 243, 226, 325, 221, 179,
+     8,   AMR_OF(3, pul_sel), 136, 121, 142, 125, 146, 110, 130, 143,
+    14, AMR_OF(3, pul_il[0]), 165, 280, 342, 243, 226, 325, 221, 179,
                               189, 257, 277, 295, 344, 149,
-    14, AMR_OF(3, cbook1[1]), 211, 289, 353, 255, 227, 329, 208, 169,
+    14, AMR_OF(3, pul_il[1]), 211, 289, 353, 255, 227, 329, 208, 169,
                               183, 265, 290, 298, 357, 148,
-    14, AMR_OF(3, cbook1[2]), 190, 320, 343, 212, 210, 318, 242, 178,
+    14, AMR_OF(3, pul_il[2]), 190, 320, 343, 212, 210, 318, 242, 178,
                               187, 248, 286, 322, 345, 144,
-    14, AMR_OF(3, cbook1[3]), 206, 288, 352, 223, 215, 327, 233, 163,
+    14, AMR_OF(3, pul_il[3]), 206, 288, 352, 223, 215, 327, 233, 163,
                               156, 222, 273, 297, 333, 118,
      7,        AMR_OF(3, vq),   6,  23,  45,  31,  35,  41,  27,
      0
@@ -390,67 +390,67 @@ static const uint16_t order_MODE_19k85[] = {
      9,      AMR_OF(0, adap),  10,  11,  12,  13,  14,  46,  69,  79,
                                91,
      1,       AMR_OF(0, ltp), 105,
-    10, AMR_OF(0, cbook1[0]), 129, 158, 256, 337, 392, 157, 109, 182,
+    10, AMR_OF(0, pul_ih[0]), 129, 158, 256, 337, 392, 157, 109, 182,
                               314, 270,
-    10, AMR_OF(0, cbook1[1]), 135, 160, 265, 344, 390, 167, 110, 210,
+    10, AMR_OF(0, pul_ih[1]), 135, 160, 265, 344, 390, 167, 110, 210,
                               334, 260,
-     4,     AMR_OF(0, pulse), 124, 148, 132, 136,
-    10, AMR_OF(0, cbook1[0]), 349, 113, 173, 206, 303, 375, 253, 283,
+     4,   AMR_OF(0, pul_sel), 124, 148, 132, 136,
+    10, AMR_OF(0, pul_ih[0]), 349, 113, 173, 206, 303, 375, 253, 283,
                               338, 384,
-    10, AMR_OF(0, cbook2[1]), 350, 111, 161, 195, 286, 369, 245, 266,
+    10, AMR_OF(0, pul_il[1]), 350, 111, 161, 195, 286, 369, 245, 266,
                               320, 385,
-    14, AMR_OF(0, cbook1[2]), 138, 172, 292, 363, 226, 213, 307, 227,
+    14, AMR_OF(0, pul_ih[2]), 138, 172, 292, 363, 226, 213, 307, 227,
                               201, 207, 261, 288, 318, 366,
-    14, AMR_OF(0, cbook1[3]), 151, 187, 285, 361, 222, 223, 306, 221,
+    14, AMR_OF(0, pul_ih[3]), 151, 187, 285, 361, 222, 223, 306, 221,
                               198, 177, 242, 280, 299, 360,
      7,        AMR_OF(0, vq),   3,  20,  42,  28,  32,  38,  24,
      6,      AMR_OF(1, adap),  36,  49,  72,  77,  83,  98,
      1,       AMR_OF(1, ltp), 106,
-    10, AMR_OF(1, cbook1[0]), 140, 174, 268, 347, 386, 164, 115, 186,
+    10, AMR_OF(1, pul_ih[0]), 140, 174, 268, 347, 386, 164, 115, 186,
                               336, 267,
-    10, AMR_OF(1, cbook1[1]), 127, 166, 254, 340, 394, 159, 117, 225,
+    10, AMR_OF(1, pul_ih[1]), 127, 166, 254, 340, 394, 159, 117, 225,
                               329, 296,
-     4,     AMR_OF(1, pulse), 122, 141, 119, 134,
-    10, AMR_OF(1, cbook1[0]), 346, 125, 165, 204, 295, 371, 273, 277,
+     4,   AMR_OF(1, pul_sel), 122, 141, 119, 134,
+    10, AMR_OF(1, pul_ih[0]), 346, 125, 165, 204, 295, 371, 273, 277,
                               319, 382,
-    10, AMR_OF(1, cbook2[1]), 354, 121, 162, 209, 301, 365, 251, 259,
+    10, AMR_OF(1, pul_il[1]), 354, 121, 162, 209, 301, 365, 251, 259,
                               326, 381,
-    14, AMR_OF(1, cbook1[2]), 145, 192, 269, 356, 212, 179, 282, 246,
+    14, AMR_OF(1, pul_ih[2]), 145, 192, 269, 356, 212, 179, 282, 246,
                               196, 193, 244, 276, 324, 368,
-    14, AMR_OF(1, cbook1[3]), 137, 184, 263, 358, 215, 219, 317, 234,
+    14, AMR_OF(1, pul_ih[3]), 137, 184, 263, 358, 215, 219, 317, 234,
                               185, 211, 248, 311, 313, 372,
      7,        AMR_OF(1, vq),   4,  21,  43,  29,  33,  39,  25,
      9,      AMR_OF(2, adap),  15,  16,  17,  18,  19,  51,  70,  80,
                                92,
      1,       AMR_OF(2, ltp), 107,
-    10, AMR_OF(2, cbook1[0]), 152, 175, 297, 355, 396, 181, 131, 190,
+    10, AMR_OF(2, pul_ih[0]), 152, 175, 297, 355, 396, 181, 131, 190,
                               333, 281,
-    10, AMR_OF(2, cbook1[1]), 153, 178, 291, 353, 395, 183, 130, 236,
+    10, AMR_OF(2, pul_ih[1]), 153, 178, 291, 353, 395, 183, 130, 236,
                               332, 275,
-     4,     AMR_OF(2, pulse), 133, 154, 123, 143,
-    10, AMR_OF(2, cbook1[0]), 357, 126, 197, 241, 325, 380, 279, 278,
+     4,   AMR_OF(2, pul_sel), 133, 154, 123, 143,
+    10, AMR_OF(2, pul_ih[0]), 357, 126, 197, 241, 325, 380, 279, 278,
                               331, 393,
-    10, AMR_OF(2, cbook2[1]), 352, 139, 189, 235, 330, 383, 293, 298,
+    10, AMR_OF(2, pul_il[1]), 352, 139, 189, 235, 330, 383, 293, 298,
                               341, 388,
-    14, AMR_OF(2, cbook1[2]), 156, 228, 312, 374, 250, 249, 345, 255,
+    14, AMR_OF(2, pul_ih[2]), 156, 228, 312, 374, 250, 249, 345, 255,
                               231, 232, 247, 290, 316, 376,
-    14, AMR_OF(2, cbook1[3]), 155, 214, 302, 370, 230, 208, 321, 240,
+    14, AMR_OF(2, pul_ih[3]), 155, 214, 302, 370, 230, 208, 321, 240,
                               194, 191, 239, 294, 305, 362,
      7,        AMR_OF(2, vq),   5,  22,  44,  30,  34,  40,  26,
      6,      AMR_OF(3, adap),  37,  50,  73,  78,  84,  99,
      1,       AMR_OF(3, ltp), 108,
-    10, AMR_OF(3, cbook1[0]), 147, 163, 271, 339, 387, 176, 114, 202,
+    10, AMR_OF(3, pul_ih[0]), 147, 163, 271, 339, 387, 176, 114, 202,
                               343, 258,
-    10, AMR_OF(3, cbook1[1]), 149, 169, 262, 328, 391, 170, 118, 188,
+    10, AMR_OF(3, pul_ih[1]), 149, 169, 262, 328, 391, 170, 118, 188,
                               327, 272,
-     4,     AMR_OF(3, pulse), 120, 144, 112, 142,
-    10, AMR_OF(3, cbook1[0]), 359, 128, 171, 233, 309, 378, 257, 264,
+     4,   AMR_OF(3, pul_sel), 120, 144, 112, 142,
+    10, AMR_OF(3, pul_ih[0]), 359, 128, 171, 233, 309, 378, 257, 264,
                               335, 377,
-    10, AMR_OF(3, cbook2[1]), 348, 116, 180, 220, 310, 379, 274, 289,
+    10, AMR_OF(3, pul_il[1]), 348, 116, 180, 220, 310, 379, 274, 289,
                               342, 389,
-    14, AMR_OF(3, cbook1[2]), 150, 199, 308, 373, 237, 216, 323, 243,
+    14, AMR_OF(3, pul_ih[2]), 150, 199, 308, 373, 237, 216, 323, 243,
                               205, 203, 252, 300, 322, 367,
-    14, AMR_OF(3, cbook1[3]), 146, 218, 304, 364, 229, 217, 315, 224,
+    14, AMR_OF(3, pul_ih[3]), 146, 218, 304, 364, 229, 217, 315, 224,
                               200, 168, 238, 287, 284, 351,
      7,        AMR_OF(3, vq),   6,  23,  45,  31,  35,  41,  27,
      0
@@ -468,79 +468,79 @@ static const uint16_t order_MODE_23k05[] = {
      9,      AMR_OF(0, adap),  10,  11,  12,  13,  14,  46,  69,  79,
                                91,
      1,       AMR_OF(0, ltp), 105,
-    11, AMR_OF(0, cbook1[0]), 113, 134, 132, 158, 173, 285, 301, 213,
+    11, AMR_OF(0, pul_ih[0]), 113, 134, 132, 158, 173, 285, 301, 213,
                               184, 354, 314,
-    11, AMR_OF(0, cbook1[1]), 121, 149, 128, 162, 188, 278, 350, 288,
+    11, AMR_OF(0, pul_ih[1]), 121, 149, 128, 162, 188, 278, 350, 288,
                               171, 341, 339,
-    11, AMR_OF(0, cbook1[2]), 112, 142, 138, 160, 215, 311, 361, 263,
+    11, AMR_OF(0, pul_ih[2]), 112, 142, 138, 160, 215, 311, 361, 263,
                               182, 340, 335,
-    11, AMR_OF(0, cbook1[3]), 115, 133, 127, 161, 185, 251, 304, 232,
+    11, AMR_OF(0, pul_ih[3]), 115, 133, 127, 161, 185, 251, 304, 232,
                               170, 336, 313,
-    11, AMR_OF(0, cbook2[0]), 242, 179, 337, 431, 260, 274, 269, 379,
+    11, AMR_OF(0, pul_il[0]), 242, 179, 337, 431, 260, 274, 269, 379,
                               393, 416, 447,
-    11, AMR_OF(0, cbook2[1]), 221, 200, 360, 437, 206, 247, 276, 364,
+    11, AMR_OF(0, pul_il[1]), 221, 200, 360, 437, 206, 247, 276, 364,
                               392, 420, 451,
-    11, AMR_OF(0, cbook2[2]), 277, 187, 347, 430, 245, 203, 257, 362,
+    11, AMR_OF(0, pul_il[2]), 277, 187, 347, 430, 245, 203, 257, 362,
                               405, 424, 456,
-    11, AMR_OF(0, cbook2[3]), 218, 176, 342, 432, 244, 223, 252, 357,
+    11, AMR_OF(0, pul_il[3]), 218, 176, 342, 432, 244, 223, 252, 357,
                               385, 412, 457,
      7,      AMR_OF(0, gain),   3,  20,  42,  28,  32,  38,  24,
      6,      AMR_OF(1, adap),  36,  49,  72,  77,  83,  98,
      1,       AMR_OF(1, ltp), 106,
-    11, AMR_OF(1, cbook1[0]), 116, 139, 137, 166, 225, 292, 344, 236,
+    11, AMR_OF(1, pul_ih[0]), 116, 139, 137, 166, 225, 292, 344, 236,
                               178, 290, 305,
-    11, AMR_OF(1, cbook1[1]), 111, 141, 131, 165, 212, 316, 348, 238,
+    11, AMR_OF(1, pul_ih[1]), 111, 141, 131, 165, 212, 316, 348, 238,
                               183, 327, 334,
-    11, AMR_OF(1, cbook1[2]), 109, 129, 122, 157, 202, 268, 309, 219,
+    11, AMR_OF(1, pul_ih[2]), 109, 129, 122, 157, 202, 268, 309, 219,
                               190, 333, 302,
-    11, AMR_OF(1, cbook1[3]), 110, 147, 125, 159, 208, 297, 345, 249,
+    11, AMR_OF(1, pul_ih[3]), 110, 147, 125, 159, 208, 297, 345, 249,
                               181, 312, 318,
-    11, AMR_OF(1, cbook2[0]), 266, 186, 377, 439, 279, 227, 256, 376,
+    11, AMR_OF(1, pul_il[0]), 266, 186, 377, 439, 279, 227, 256, 376,
                               401, 417, 450,
-    11, AMR_OF(1, cbook2[1]), 281, 201, 382, 441, 229, 217, 270, 375,
+    11, AMR_OF(1, pul_il[1]), 281, 201, 382, 441, 229, 217, 270, 375,
                               403, 423, 449,
-    11, AMR_OF(1, cbook2[2]), 240, 196, 353, 442, 231, 235, 306, 338,
+    11, AMR_OF(1, pul_il[2]), 240, 196, 353, 442, 231, 235, 306, 338,
                               368, 415, 454,
-    11, AMR_OF(1, cbook2[3]), 230, 199, 352, 435, 253, 261, 293, 386,
+    11, AMR_OF(1, pul_il[3]), 230, 199, 352, 435, 253, 261, 293, 386,
                               407, 419, 455,
      7,      AMR_OF(1, gain),   4,  21,  43,  29,  33,  39,  25,
      9,      AMR_OF(2, adap),  15,  16,  17,  18,  19,  51,  70,  80,
                                92,
      1,       AMR_OF(2, ltp), 107,
-    11, AMR_OF(2, cbook1[0]), 140, 151, 150, 174, 237, 320, 396, 300,
+    11, AMR_OF(2, pul_ih[0]), 140, 151, 150, 174, 237, 320, 396, 300,
                               243, 355, 380,
-    11, AMR_OF(2, cbook1[1]), 120, 155, 153, 172, 224, 307, 394, 356,
+    11, AMR_OF(2, pul_ih[1]), 120, 155, 153, 172, 224, 307, 394, 356,
                               258, 372, 328,
-    11, AMR_OF(2, cbook1[2]), 124, 156, 154, 198, 246, 365, 391, 324,
+    11, AMR_OF(2, pul_ih[2]), 124, 156, 154, 198, 246, 365, 391, 324,
                               233, 399, 366,
-    11, AMR_OF(2, cbook1[3]), 117, 148, 126, 168, 195, 330, 370, 296,
+    11, AMR_OF(2, pul_ih[3]), 117, 148, 126, 168, 195, 330, 370, 296,
                               191, 358, 325,
-    11, AMR_OF(2, cbook2[0]), 264, 204, 390, 445, 308, 275, 329, 402,
+    11, AMR_OF(2, pul_il[0]), 264, 204, 390, 445, 308, 275, 329, 402,
                               411, 428, 460,
-    11, AMR_OF(2, cbook2[1]), 273, 207, 387, 440, 291, 295, 303, 404,
+    11, AMR_OF(2, pul_il[1]), 273, 207, 387, 440, 291, 295, 303, 404,
                               408, 426, 459,
-    11, AMR_OF(2, cbook2[2]), 319, 209, 398, 438, 272, 298, 317, 384,
+    11, AMR_OF(2, pul_il[2]), 319, 209, 398, 438, 272, 298, 317, 384,
                               413, 429, 453,
-    11, AMR_OF(2, cbook2[3]), 287, 189, 383, 434, 267, 259, 248, 363,
+    11, AMR_OF(2, pul_il[3]), 287, 189, 383, 434, 267, 259, 248, 363,
                               409, 422, 446,
      7,      AMR_OF(2, gain),   5,  22,  44,  30,  34,  40,  26,
      6,      AMR_OF(3, adap),  37,  50,  73,  78,  84,  99,
      1,       AMR_OF(3, ltp), 108,
-    11, AMR_OF(3, cbook1[0]), 119, 152, 136, 163, 210, 286, 331, 283,
+    11, AMR_OF(3, pul_ih[0]), 119, 152, 136, 163, 210, 286, 331, 283,
                               175, 351, 322,
-    11, AMR_OF(3, cbook1[1]), 118, 145, 146, 180, 192, 315, 323, 282,
+    11, AMR_OF(3, pul_ih[1]), 118, 145, 146, 180, 192, 315, 323, 282,
                               234, 367, 343,
-    11, AMR_OF(3, cbook1[2]), 123, 143, 144, 169, 214, 321, 346, 255,
+    11, AMR_OF(3, pul_ih[2]), 123, 143, 144, 169, 214, 321, 346, 255,
                               193, 369, 332,
-    11, AMR_OF(3, cbook1[3]), 114, 135, 130, 164, 205, 299, 371, 310,
+    11, AMR_OF(3, pul_ih[3]), 114, 135, 130, 164, 205, 299, 371, 310,
                               197, 388, 326,
-    11, AMR_OF(3, cbook2[0]), 254, 177, 359, 427, 250, 271, 294, 410,
+    11, AMR_OF(3, pul_il[0]), 254, 177, 359, 427, 250, 271, 294, 410,
                               400, 421, 458,
-    11, AMR_OF(3, cbook2[1]), 280, 211, 374, 443, 216, 241, 222, 349,
+    11, AMR_OF(3, pul_il[1]), 280, 211, 374, 443, 216, 241, 222, 349,
                               397, 406, 452,
-    11, AMR_OF(3, cbook2[2]), 220, 194, 381, 436, 226, 262, 284, 395,
+    11, AMR_OF(3, pul_il[2]), 220, 194, 381, 436, 226, 262, 284, 395,
                               414, 425, 448,
-    11, AMR_OF(3, cbook2[3]), 239, 167, 373, 433, 228, 265, 289, 378,
+    11, AMR_OF(3, pul_il[3]), 239, 167, 373, 433, 228, 265, 289, 378,
                               389, 418, 444,
      7,      AMR_OF(3, gain),   6,  23,  45,  31,  35,  41,  27,
      0
@@ -558,82 +558,82 @@ static const uint16_t order_MODE_23k85[] = {
      9,      AMR_OF(0, adap),  10,  11,  12,  13,  14,  46,  69,  95,
                               107,
      1,       AMR_OF(0, ltp), 121,
-    11, AMR_OF(0, cbook1[0]), 129, 150, 148, 174, 189, 301, 317, 229,
+    11, AMR_OF(0, pul_ih[0]), 129, 150, 148, 174, 189, 301, 317, 229,
                               200, 370, 330,
-    11, AMR_OF(0, cbook1[1]), 137, 165, 144, 178, 204, 294, 366, 304,
+    11, AMR_OF(0, pul_ih[1]), 137, 165, 144, 178, 204, 294, 366, 304,
                               187, 357, 355,
-    11, AMR_OF(0, cbook1[2]), 128, 158, 154, 176, 231, 327, 377, 279,
+    11, AMR_OF(0, pul_ih[2]), 128, 158, 154, 176, 231, 327, 377, 279,
                               198, 356, 351,
-    11, AMR_OF(0, cbook1[3]), 131, 149, 143, 177, 201, 267, 320, 248,
+    11, AMR_OF(0, pul_ih[3]), 131, 149, 143, 177, 201, 267, 320, 248,
                               186, 352, 329,
-    11, AMR_OF(0, cbook2[0]), 258, 195, 353, 447, 276, 290, 285, 395,
+    11, AMR_OF(0, pul_il[0]), 258, 195, 353, 447, 276, 290, 285, 395,
                               409, 432, 463,
-    11, AMR_OF(0, cbook2[1]), 237, 216, 376, 453, 222, 263, 292, 380,
+    11, AMR_OF(0, pul_il[1]), 237, 216, 376, 453, 222, 263, 292, 380,
                               408, 436, 467,
-    11, AMR_OF(0, cbook2[2]), 293, 203, 363, 446, 261, 219, 273, 378,
+    11, AMR_OF(0, pul_il[2]), 293, 203, 363, 446, 261, 219, 273, 378,
                               421, 440, 472,
-    11, AMR_OF(0, cbook2[3]), 234, 192, 358, 448, 260, 239, 268, 373,
+    11, AMR_OF(0, pul_il[3]), 234, 192, 358, 448, 260, 239, 268, 373,
                               401, 428, 473,
      7,      AMR_OF(0, gain),   3,  20,  42,  28,  32,  38,  24,
      4,    AMR_OF(0, energy),  72,  73,  74,  75,
      6,      AMR_OF(1, adap),  36,  49,  88,  93,  99, 114,
      1,       AMR_OF(1, ltp), 122,
-    11, AMR_OF(1, cbook1[0]), 132, 155, 153, 182, 241, 308, 360, 252,
+    11, AMR_OF(1, pul_ih[0]), 132, 155, 153, 182, 241, 308, 360, 252,
                               194, 306, 321,
-    11, AMR_OF(1, cbook1[1]), 127, 157, 147, 181, 228, 332, 364, 254,
+    11, AMR_OF(1, pul_ih[1]), 127, 157, 147, 181, 228, 332, 364, 254,
                               199, 343, 350,
-    11, AMR_OF(1, cbook1[2]), 125, 145, 138, 173, 218, 284, 325, 235,
+    11, AMR_OF(1, pul_ih[2]), 125, 145, 138, 173, 218, 284, 325, 235,
                               206, 349, 318,
-    11, AMR_OF(1, cbook1[3]), 126, 163, 141, 175, 224, 313, 361, 265,
+    11, AMR_OF(1, pul_ih[3]), 126, 163, 141, 175, 224, 313, 361, 265,
                               197, 328, 334,
-    11, AMR_OF(1, cbook2[0]), 282, 202, 393, 455, 295, 243, 272, 392,
+    11, AMR_OF(1, pul_il[0]), 282, 202, 393, 455, 295, 243, 272, 392,
                               417, 433, 466,
-    11, AMR_OF(1, cbook2[1]), 297, 217, 398, 457, 245, 233, 286, 391,
+    11, AMR_OF(1, pul_il[1]), 297, 217, 398, 457, 245, 233, 286, 391,
                               419, 439, 465,
-    11, AMR_OF(1, cbook2[2]), 256, 212, 369, 458, 247, 251, 322, 354,
+    11, AMR_OF(1, pul_il[2]), 256, 212, 369, 458, 247, 251, 322, 354,
                               384, 431, 470,
-    11, AMR_OF(1, cbook2[3]), 246, 215, 368, 451, 269, 277, 309, 402,
+    11, AMR_OF(1, pul_il[3]), 246, 215, 368, 451, 269, 277, 309, 402,
                               423, 435, 471,
      7,      AMR_OF(1, gain),   4,  21,  43,  29,  33,  39,  25,
      4,    AMR_OF(1, energy),  76,  77,  78,  79,
      9,      AMR_OF(2, adap),  15,  16,  17,  18,  19,  51,  70,  96,
                               108,
      1,       AMR_OF(2, ltp), 123,
-    11, AMR_OF(2, cbook1[0]), 156, 167, 166, 190, 253, 336, 412, 316,
+    11, AMR_OF(2, pul_ih[0]), 156, 167, 166, 190, 253, 336, 412, 316,
                               259, 371, 396,
-    11, AMR_OF(2, cbook1[1]), 136, 171, 169, 188, 240, 323, 410, 372,
+    11, AMR_OF(2, pul_ih[1]), 136, 171, 169, 188, 240, 323, 410, 372,
                               274, 388, 344,
-    11, AMR_OF(2, cbook1[2]), 140, 172, 170, 214, 262, 381, 407, 340,
+    11, AMR_OF(2, pul_ih[2]), 140, 172, 170, 214, 262, 381, 407, 340,
                               249, 415, 382,
-    11, AMR_OF(2, cbook1[3]), 133, 164, 142, 184, 211, 346, 386, 312,
+    11, AMR_OF(2, pul_ih[3]), 133, 164, 142, 184, 211, 346, 386, 312,
                               207, 374, 341,
-    11, AMR_OF(2, cbook2[0]), 280, 220, 406, 461, 324, 291, 345, 418,
+    11, AMR_OF(2, pul_il[0]), 280, 220, 406, 461, 324, 291, 345, 418,
                               427, 444, 476,
-    11, AMR_OF(2, cbook2[1]), 289, 223, 403, 456, 307, 311, 319, 420,
+    11, AMR_OF(2, pul_il[1]), 289, 223, 403, 456, 307, 311, 319, 420,
                               424, 442, 475,
-    11, AMR_OF(2, cbook2[2]), 335, 225, 414, 454, 288, 314, 333, 400,
+    11, AMR_OF(2, pul_il[2]), 335, 225, 414, 454, 288, 314, 333, 400,
                               429, 445, 469,
-    11, AMR_OF(2, cbook2[3]), 303, 205, 399, 450, 283, 275, 264, 379,
+    11, AMR_OF(2, pul_il[3]), 303, 205, 399, 450, 283, 275, 264, 379,
                               425, 438, 462,
      7,      AMR_OF(2, gain),   5,  22,  44,  30,  34,  40,  26,
      4,    AMR_OF(2, energy),  80,  81,  82,  83,
      6,      AMR_OF(3, adap),  37,  50,  89,  94, 100, 115,
      1,       AMR_OF(3, ltp), 124,
-    11, AMR_OF(3, cbook1[0]), 135, 168, 152, 179, 226, 302, 347, 299,
+    11, AMR_OF(3, pul_ih[0]), 135, 168, 152, 179, 226, 302, 347, 299,
                               191, 367, 338,
-    11, AMR_OF(3, cbook1[1]), 134, 161, 162, 196, 208, 331, 339, 298,
+    11, AMR_OF(3, pul_ih[1]), 134, 161, 162, 196, 208, 331, 339, 298,
                               250, 383, 359,
-    11, AMR_OF(3, cbook1[2]), 139, 159, 160, 185, 230, 337, 362, 271,
+    11, AMR_OF(3, pul_ih[2]), 139, 159, 160, 185, 230, 337, 362, 271,
                               209, 385, 348,
-    11, AMR_OF(3, cbook1[3]), 130, 151, 146, 180, 221, 315, 387, 326,
+    11, AMR_OF(3, pul_ih[3]), 130, 151, 146, 180, 221, 315, 387, 326,
                               213, 404, 342,
-    11, AMR_OF(3, cbook2[0]), 270, 193, 375, 443, 266, 287, 310, 426,
+    11, AMR_OF(3, pul_il[0]), 270, 193, 375, 443, 266, 287, 310, 426,
                               416, 437, 474,
-    11, AMR_OF(3, cbook2[1]), 296, 227, 390, 459, 232, 257, 238, 365,
+    11, AMR_OF(3, pul_il[1]), 296, 227, 390, 459, 232, 257, 238, 365,
                               413, 422, 468,
-    11, AMR_OF(3, cbook2[2]), 236, 210, 397, 452, 242, 278, 300, 411,
+    11, AMR_OF(3, pul_il[2]), 236, 210, 397, 452, 242, 278, 300, 411,
                               430, 441, 464,
-    11, AMR_OF(3, cbook2[3]), 255, 183, 389, 449, 244, 281, 305, 394,
+    11, AMR_OF(3, pul_il[3]), 255, 183, 389, 449, 244, 281, 305, 394,
                               405, 434, 460,
      7,      AMR_OF(3, gain),   6,  23,  45,  31,  35,  41,  27,
      4,    AMR_OF(3, energy),  84,  85,  86,  87,

-----------------------------------------------------------------------

Summary of changes:
 libavcodec/amrwbdata.h |  366 ++++++++++++++++++++++++------------------------
 1 files changed, 183 insertions(+), 183 deletions(-)


hooks/post-receive
-- 
AMR-WB decoder


More information about the FFmpeg-soc mailing list