Commit aabaaa86 authored by advasila's avatar advasila
Browse files

remove TUNING_2obj switch

parent dd911ae5

lib_com/ivas_omasa_com.c

+0 −4
Original line number Diff line number Diff line
@@ -102,11 +102,7 @@ ISM_MODE ivas_omasa_ism_mode_select( 
            }

            break;

        case 2:

#ifdef TUNING_48kbps_2obj

            if ( ivas_total_brate >= IVAS_48k )

#else

            if ( ivas_total_brate >= IVAS_64k )

#endif

            {

                ism_mode = ISM_MASA_MODE_DISC;

            }

lib_com/ivas_rom_com.c

+0 −4
Original line number Diff line number Diff line
@@ -2794,11 +2794,7 @@ const int32_t sep_object_brate[][MAX_NUM_OBJECTS] = 
#else

    {9600, 0, 0, 0},                                /* 32k  */

#endif

#ifdef TUNING_48kbps_2obj

    {IVAS_13k2, 9600, 0, 0},                        /* 48k  */

#else

    {IVAS_13k2, 0, 0, 0},                           /* 48k  */

#endif

#ifdef OMASA_BRATE

    {16000,     11700, 0, 0},                       /* 64k  */

#else

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ 
#define MASAISM_EDIT_OBJECTS                            /* Nokia: Temporary command line editing of object directions in the decoder */





#define TUNING_48kbps_2obj



#define TUNING_DISC_3_4obj                              /* Nokia: increase bitrate for objects in DISC mode at 128k 4obj and 96k 3 obj */

#define REDUCE_OMASA_META_BITS                          /* Nokia: reduce metadata number of bits and fix directional metadata bit allocation */