Commit 73d4bc3d authored by vaclav's avatar vaclav
Browse files

- add TUNING_48kbps_2obj

parent c621abbb

lib_com/ivas_omasa_com.c

+4 −0
Original line number Diff line number Diff line
@@ -87,7 +87,11 @@ 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

+21 −17
Original line number Diff line number Diff line
@@ -2794,7 +2794,11 @@ 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

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



#define TUNING_96kbps_3obj

#define TUNING_48kbps_2obj



#endif