Commit 11953429 authored by multrus's avatar multrus
Browse files

[cleanup] accept IGF_TUNING_96

parent c82050a9

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ 


#define FIX_560_VAD_FLAG                                /* Eri: Issue 560 - VAD flag issue for unified stereo */



#define IGF_TUNING_96                                   /* FhG: Issue 546: slight tuning of IGF config used in 96 kbps stereo, 128 kbps SBA and others */

#define FIX_549_DMX_GAIN                                /* FhG: issue 549: ParamISM output too quiet */

#define FIX_522_ISM_FIRST_SID                           /* VA: fix ISM decoder crash if first received frame is an SID */

#define FIX_470_MASA_JBM_EXT                            /* Nokia: Issue 470, fix MASA EXT output with JBM */

lib_com/rom_com.c

+0 −8
Original line number Diff line number Diff line
@@ -21632,22 +21632,14 @@ const int16_t igf_tile_offset_table[IGF_BITRATE_UNKNOWN][2*IGF_MAX_TILES+1] = { 
        { 3,  1, 0, 2, 40, 3, 80 },                                                         /* 48000 SWB (stereo TCX10) */

        { 4,  2, 80, 4, 128, 6, 144, 7, 212 },                                              /* 64000 SWB (stereo) */

        { 2,  2, 212, 4, 280 },                                                             /* 80000 SWB (stereo) */

#ifdef IGF_TUNING_96

        { 1,  3, 200},                                                                      /* 96000 SWB (stereo) */

#else

        { 1,  3, 320},                                                                      /* 96000 SWB (stereo) */

#endif

        { 9,  1, 0,  2, 32,  3, 72, 4, 120, 5, 48, 6, 112, 7,  64, 8,  0, 9, 80 },          /* 24400  FB (stereo) */

        {10,  1, 0,  2, 28,  3, 64, 4, 104, 5, 32, 6,  80, 7, 136, 8, 64, 9,  0, 10, 80 },  /* 32000  FB (stereo) */

        { 7,  1, 120, 2, 152, 3, 184, 4, 224, 5, 140, 6, 192, 8, 140},                      /* 48000  FB (stereo) */

        { 4,  1, 0, 2, 40, 3, 80, 4, 140 },                                                 /* 48000  FB (stereo TCX10) */

        { 5,  2, 80, 4, 128, 6, 144, 7, 212, 9, 160 },                                      /* 64000  FB (stereo) */

        { 3,  2, 212, 4, 280, 6, 200 },                                                     /* 80000  FB (stereo) */

#ifdef IGF_TUNING_96

        { 2,  3, 200, 5, 240},                                                              /* 96000  FB (stereo) */

#else

        { 2,  3, 320, 5, 240},                                                              /* 96000  FB (stereo) */

#endif

        { 1,  2, 416}                                                                       /*128000  FB (stereo) */

};