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

Marcelo Póvoa marspeoplester at gmail.com
Wed Jul 7 17:10:49 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  d29085706f26b6691f8d3a74c07b23cd02cf9785 (commit)
      from  4eb7fe39243afcfe69438ad5ec3dc64eda5aed82 (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 d29085706f26b6691f8d3a74c07b23cd02cf9785
Author: Marcelo Povoa <marspeoplester at gmail.com>
Date:   Wed Jul 7 12:09:31 2010 -0300

    Unify pulse index storage in 18k25 and 19k85 modes

diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h
index 6b74e85..727022e 100644
--- a/libavcodec/amrwbdata.h
+++ b/libavcodec/amrwbdata.h
@@ -52,7 +52,6 @@ typedef struct {
     uint16_t adap;                         ///< adaptive codebook index
     uint8_t ltp;                           ///< ltp-filtering flag
     uint8_t vq;                            ///< VQ gain
-    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 pul_ih[4];                    ///< MSBs part of codebook index (high modes only)
@@ -328,7 +327,10 @@ 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, pul_sel), 123, 116, 145, 114, 134, 117, 126, 132,
+     2, AMR_OF(0, pul_ih[0]), 123, 116,
+     2, AMR_OF(0, pul_ih[1]), 145, 114,
+     2, AMR_OF(0, pul_ih[2]), 134, 117,
+     2, AMR_OF(0, pul_ih[3]), 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, pul_il[1]), 197, 281, 348, 217, 209, 315, 235, 159,
@@ -340,7 +342,10 @@ static const uint16_t order_MODE_18k25[] = {
      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, pul_sel), 140, 111, 128, 113, 119, 120, 139, 138,
+     2, AMR_OF(1, pul_ih[0]), 140, 111,
+     2, AMR_OF(1, pul_ih[1]), 128, 113,
+     2, AMR_OF(1, pul_ih[2]), 119, 120,
+     2, AMR_OF(1, pul_ih[3]), 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, pul_il[1]), 158, 271, 334, 239, 214, 324, 224, 162,
@@ -353,7 +358,10 @@ static const uint16_t order_MODE_18k25[] = {
      9,      AMR_OF(2, adap),  15,  16,  17,  18,  19,  51,  70,  80,
                                92,
      1,       AMR_OF(2, ltp), 107,
-     8,   AMR_OF(2, pul_sel), 151, 127, 154, 124, 150, 141, 131, 157,
+     2, AMR_OF(2, pul_ih[0]), 151, 127,
+     2, AMR_OF(2, pul_ih[1]), 154, 124,
+     2, AMR_OF(2, pul_ih[2]), 150, 141,
+     2, AMR_OF(2, pul_ih[3]), 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, pul_il[1]), 240, 292, 340, 254, 253, 331, 268, 195,
@@ -365,7 +373,10 @@ static const uint16_t order_MODE_18k25[] = {
      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, pul_sel), 136, 121, 142, 125, 146, 110, 130, 143,
+     2, AMR_OF(3, pul_ih[0]), 136, 121,
+     2, AMR_OF(3, pul_ih[1]), 142, 125,
+     2, AMR_OF(3, pul_ih[2]), 146, 110,
+     2, AMR_OF(3, pul_ih[3]), 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, pul_il[1]), 211, 289, 353, 255, 227, 329, 208, 169,
@@ -394,7 +405,8 @@ static const uint16_t order_MODE_19k85[] = {
                               314, 270,
     10, AMR_OF(0, pul_ih[1]), 135, 160, 265, 344, 390, 167, 110, 210,
                               334, 260,
-     4,   AMR_OF(0, pul_sel), 124, 148, 132, 136,
+     2, AMR_OF(0, pul_ih[2]), 124, 148,
+     2, AMR_OF(0, pul_ih[3]), 132, 136,
     10, AMR_OF(0, pul_ih[0]), 349, 113, 173, 206, 303, 375, 253, 283,
                               338, 384,
     10, AMR_OF(0, pul_il[1]), 350, 111, 161, 195, 286, 369, 245, 266,
@@ -410,7 +422,8 @@ static const uint16_t order_MODE_19k85[] = {
                               336, 267,
     10, AMR_OF(1, pul_ih[1]), 127, 166, 254, 340, 394, 159, 117, 225,
                               329, 296,
-     4,   AMR_OF(1, pul_sel), 122, 141, 119, 134,
+     2, AMR_OF(1, pul_ih[2]), 122, 141,
+     2, AMR_OF(1, pul_ih[3]), 119, 134,
     10, AMR_OF(1, pul_ih[0]), 346, 125, 165, 204, 295, 371, 273, 277,
                               319, 382,
     10, AMR_OF(1, pul_il[1]), 354, 121, 162, 209, 301, 365, 251, 259,
@@ -427,7 +440,8 @@ static const uint16_t order_MODE_19k85[] = {
                               333, 281,
     10, AMR_OF(2, pul_ih[1]), 153, 178, 291, 353, 395, 183, 130, 236,
                               332, 275,
-     4,   AMR_OF(2, pul_sel), 133, 154, 123, 143,
+     2, AMR_OF(2, pul_ih[2]), 133, 154,
+     2, AMR_OF(2, pul_ih[3]), 123, 143,
     10, AMR_OF(2, pul_ih[0]), 357, 126, 197, 241, 325, 380, 279, 278,
                               331, 393,
     10, AMR_OF(2, pul_il[1]), 352, 139, 189, 235, 330, 383, 293, 298,
@@ -443,7 +457,8 @@ static const uint16_t order_MODE_19k85[] = {
                               343, 258,
     10, AMR_OF(3, pul_ih[1]), 149, 169, 262, 328, 391, 170, 118, 188,
                               327, 272,
-     4,   AMR_OF(3, pul_sel), 120, 144, 112, 142,
+     2, AMR_OF(3, pul_ih[2]), 120, 144,
+     2, AMR_OF(3, pul_ih[3]), 112, 142,
     10, AMR_OF(3, pul_ih[0]), 359, 128, 171, 233, 309, 378, 257, 264,
                               335, 377,
     10, AMR_OF(3, pul_il[1]), 348, 116, 180, 220, 310, 379, 274, 289,

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

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


hooks/post-receive
-- 
AMR-WB decoder


More information about the FFmpeg-soc mailing list