Commit 5aadd510 authored by vaclav's avatar vaclav
Browse files

remove obsolete ISM_MASA_MODE_PARAM mode

parent b029297c

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -373,11 +373,11 @@ typedef enum 
    ISM_MODE_PARAM                              /* parametric ISM */

#ifdef MASA_AND_OBJECTS

    ,

    ISM_MASA_MODE_PARAM,                       /* parametric ISM mode for combined MASA ISM format          */

    ISM_MASA_MODE_MASA_ONE_OBJ,                /* MASA ISM mode when one object is encoded separately and remainder using MASA parameters */

    ISM_MASA_MODE_PARAM_ONE_OBJ,               /* MASA ISM mode when one object is encoded separately and remainder using parametric object model */

    ISM_MASA_MODE_DISC                         /* MASA ISM mode when all objects are encoded separarately   */

#endif



} ISM_MODE;

lib_com/ivas_omasa_com.c

+0 −5
Original line number Diff line number Diff line
@@ -161,10 +161,6 @@ void ivas_set_omasa_TC( 
{

    switch ( ism_mode )

    {

        case ISM_MASA_MODE_PARAM:

            *nCPE = 1;

            *nSCE = 0;

            break;

        case ISM_MASA_MODE_MASA_ONE_OBJ:

        case ISM_MASA_MODE_PARAM_ONE_OBJ:

            *nCPE = 1;
@@ -214,7 +210,6 @@ int32_t ivas_interformat_brate( 
    {

        if ( ism_mode == ISM_MASA_MODE_DISC && ( ( nchan_ism == 4 && element_brate == 24000 ) || ( nchan_ism == 3 && element_brate <= 24000 ) || ( nchan_ism == 2 && element_brate <= 11000 ) ) ) /* for border case in DISC mode */

        {



            if ( limit_flag == 1 && ( ( nchan_ism == 4 && element_brate == 24000 ) || ( nchan_ism == 3 && element_brate == 20000 ) || ( nchan_ism == 2 && element_brate <= 11000 ) ) )

            {

                return element_brate;

lib_dec/ivas_cpe_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1100,11 +1100,7 @@ static void read_stereo_mode_and_bwidth( 
        else

        {

            /* read stereo technology info */

#ifdef MASA_AND_OBJECTS

            if ( ( hCPE->element_brate < MIN_BRATE_MDCT_STEREO && st_ivas->hMCT == NULL ) || ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM && hCPE->element_brate == IVAS_48k ) )

#else

            if ( hCPE->element_brate < MIN_BRATE_MDCT_STEREO && st_ivas->hMCT == NULL )

#endif

            {

                hCPE->element_mode = get_next_indice( sts[0], NBITS_ELEMENT_MODE ) + IVAS_CPE_DFT;

            }

lib_dec/ivas_masa_dec.c

+1 −8
Original line number Diff line number Diff line
@@ -720,16 +720,9 @@ static ivas_error ivas_masa_dec_config( 
    ivas_masa_set_elements( ivas_total_brate, st_ivas->mc_mode, st_ivas->nchan_transport, st_ivas->hQMetaData, &st_ivas->element_mode_init, &st_ivas->nSCE, &st_ivas->nCPE, st_ivas->ivas_format, st_ivas->ism_mode, ism_total_brate );



    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

    {

        if ( st_ivas->hCPE[0]->element_brate == IVAS_48k && st_ivas->ism_mode == ISM_MASA_MODE_PARAM )

        {

            ivas_masa_set_coding_config( &( hMasa->config ), hMasa->data.band_mapping, IVAS_32k, st_ivas->nchan_transport, MC_MODE_NONE );

        }

        else

    {

        ivas_masa_set_coding_config( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hCPE[0]->element_brate, st_ivas->nchan_transport, MC_MODE_NONE );

    }

    }

    else

    {

        ivas_masa_set_coding_config( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) );

lib_dec/ivas_mono_dmx_renderer.c

+1 −5
Original line number Diff line number Diff line
@@ -97,11 +97,7 @@ void ivas_mono_downmix_render_passive( 
#ifdef MASA_AND_OBJECTS

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

    {

        if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM )

        {

            numInputChannels = st_ivas->nchan_transport;

        }

        else if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )

        if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )

        {

            numInputChannels = st_ivas->nchan_transport + 1;

        }