Commit cb723a90 authored by vaclav's avatar vaclav
Browse files

- FIX_24k4_ISM1_MODE - activate DISC mode at 24.4 kbps 1 object

parent b8248b67

lib_com/ivas_ism_config.c

+15 −1
Original line number Diff line number Diff line
@@ -600,14 +600,20 @@ ISM_MODE ivas_omasa_ism_mode_select( 
    switch ( no_obj )

    {

        case 1:

#ifdef FIX_24k4_ISM1_MODE

            if ( ivas_total_brate >= IVAS_24k4 )

#else

            if ( ivas_total_brate >= IVAS_32k )

#endif

            {

                ism_mode = ISM_MASA_MODE_DISC;

            }

#ifndef FIX_24k4_ISM1_MODE

            else if ( ivas_total_brate >= IVAS_24k4 )

            {

                ism_mode = ISM_MASA_MODE_PARAM;

            }

#endif

            else

            {

                ism_mode = ISM_MODE_NONE;
@@ -681,6 +687,7 @@ ISM_MODE ivas_omasa_ism_mode_select( 
 * ---------------------------------------------------------------*/



#define GAMMA_ISM_LOW_IMP    0.8f

#define GAMMA_ISM_LOW_IMP2   0.9f

#define GAMMA_ISM_MEDIUM_IMP 1.2f

#define GAMMA_ISM_HIGH_IMP   1.4f

#define GAMMA_ISM_HIGH_IMP2  1.35f
@@ -702,9 +709,16 @@ int32_t ivas_interformat_brate( 
        nBits = BITS_ISM_INACTIVE;

    }

    else if ( ism_imp == ISM_LOW_IMP )

    {

        if ( ism_mode == ISM_MASA_MODE_DISC && element_brate == 9600 ) /* this condition corresponds to the ivas_total_brate = 9600 and 1 object */

        {

            nBits = (int16_t) ( nBits * GAMMA_ISM_LOW_IMP2 );

        }

        else

        {

            nBits = (int16_t) ( nBits * GAMMA_ISM_LOW_IMP );

        }

    }

    else if ( ism_imp == ISM_MEDIUM_IMP )

    {

        nBits = (int16_t) ( nBits * GAMMA_ISM_MEDIUM_IMP );

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 


#ifdef DEBUGGING



/*#define DEBUG_MODE_INFO*/                     /* output most important parameters to the subdirectory "res/" */

#define DEBUG_MODE_INFO                     /* output most important parameters to the subdirectory "res/" */

#ifdef DEBUG_MODE_INFO

/*#define DEBUG_MODE_ACELP*/                    /* output most important ACELP core parameters to the subdirectory "res/" */

/*#define DEBUG_MODE_TCX*/                      /* output most important TCX core parameters to the subdirectory "res/" */
@@ -161,6 +161,7 @@ 
#ifdef MASA_AND_OBJECTS

#define MASAISM_EDIT_OBJECTS                    /* Nokia: Temporary command line editing of object directions in the decoder */



#define FIX_24k4_ISM1_MODE // activate DISC mode at 24.4 kbps 1 object

#define MASA_AND_OBJECTS_VE // VA: improve codec print-outs

#define OMASA_BRATE /* VA: combined format bit-budget distribution */

#define OMASA_BRATE_TD // support of bitrate adaptation in TD stereo