Commit 31c1c12a authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch 'va/contribution-omasa-combined-format-fixes' into... 

Merge branch 'va/contribution-omasa-combined-format-fixes' into 'nokia/contribution-omasa-combined-format'

fixes_OMASA_cleaning

See merge request !582
parents 8e0a95cc 5aadd510

lib_com/bitstream.c

+0 −24
Original line number Diff line number Diff line
@@ -1972,37 +1972,13 @@ ivas_error preview_indices( 
        else if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

        {

            /* read number of objects from the bitstream */

#ifdef OMASA_UPDATES

            st_ivas->nchan_transport = 2; /* always 2 MASA transport channels */

            st_ivas->nchan_ism = 0;

#else

            st_ivas->nchan_transport = 0;

#endif



            if ( total_brate != SID_2k40 && total_brate != FRAME_NO_DATA )

            {

#ifdef OMASA_UPDATES

                st_ivas->nchan_ism = 2 * bit_stream[total_brate / FRAMES_PER_SEC - 1] + bit_stream[total_brate / FRAMES_PER_SEC - 2] + 1;

#endif

                st_ivas->ism_mode = ivas_omasa_ism_mode_select( total_brate, st_ivas->nchan_ism );



#ifndef OMASA_UPDATES

                if ( st_ivas->ism_mode == ISM_MASA_MODE_ONE_OBJ )

                {

                    st_ivas->nchan_transport = 0;

                }

                else if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

                {

                    st_ivas->nchan_transport = 2 * st_ivas->bit_stream[total_brate / FRAMES_PER_SEC - 2] + st_ivas->bit_stream[total_brate / FRAMES_PER_SEC - 3] + 1;

                }



                k = (int16_t) ( ( total_brate / FRAMES_PER_SEC ) - 1 );



                {

                    st_ivas->nchan_transport++;

                    k--;

                }

#endif

            }

        }

#endif

lib_com/delay_comp.c

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ int32_t get_delay( 
        {

            delay = IVAS_ENC_DELAY_NS;



#ifdef FIX_OMASA_DELAY_COMP

#ifdef MASA_AND_OBJECTS

            if ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT )

#else

            if ( ivas_format == MASA_FORMAT )
@@ -109,7 +109,7 @@ int32_t get_delay( 
            }





#ifdef FIX_OMASA_DELAY_COMP

#ifdef MASA_AND_OBJECTS

            if ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT )

#else

            if ( ivas_format == MASA_FORMAT )

lib_com/ivas_cnst.h

+2 −10
Original line number Diff line number Diff line
@@ -373,15 +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          */

#ifdef OMASA_UPDATES

    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 */

#else

    ISM_MASA_MODE_ONE_OBJ,                     /* MASA ISM mode when one object is encoded separarately     */

#endif

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

#endif



} ISM_MODE;
@@ -639,11 +635,7 @@ enum 
    IND_STEREO_DFT_SIDEGAIN_FLAG,



    IND_STEREO_DFT_SIDEGAINS,

    #ifdef OMASA_UPDATES

    IND_STEREO_DFT_ITD_MODE = IND_STEREO_DFT_SIDEGAINS + 4 * STEREO_DFT_BAND_MAX + 120,

    #else

    IND_STEREO_DFT_ITD_MODE = IND_STEREO_DFT_SIDEGAINS + 4 * STEREO_DFT_BAND_MAX + 72,

    #endif

    

    IND_STEREO_DFT_ITD_HUFF,

    IND_STEREO_DFT_ITD_NEG,

lib_com/ivas_ism_com.c

+2 −2
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ ISM_MODE ivas_ism_mode_select( 


void ivas_ism_metadata_close(

    ISM_METADATA_HANDLE hIsmMetaData[] /* i/o  : object metadata handles            */

#ifdef OMASA_BRATE_SW

#ifdef MASA_AND_OBJECTS

    ,

    const int16_t first_idx /* i  : index of first handle to deallocate  */

#endif
@@ -619,7 +619,7 @@ void ivas_ism_metadata_close( 
        return;

    }



#ifdef OMASA_BRATE_SW

#ifdef MASA_AND_OBJECTS

    for ( n = first_idx; n < MAX_NUM_OBJECTS; n++ )

#else

    for ( n = 0; n < MAX_NUM_OBJECTS; n++ )

lib_com/ivas_masa_com.c

+0 −12
Original line number Diff line number Diff line
@@ -96,11 +96,7 @@ void ivas_masa_set_elements( 
            if ( ivas_total_brate > MIN_BRATE_MDCT_STEREO )

            {

                *element_mode = IVAS_CPE_MDCT;

#ifdef OMASA_UPDATES

                if ( ( ism_mode == ISM_MASA_MODE_DISC || ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ ) && ( ivas_total_brate - ism_total_brate < MIN_BRATE_MDCT_STEREO ) )

#else

                if ( ( ism_mode == ISM_MASA_MODE_DISC || ism_mode == ISM_MASA_MODE_ONE_OBJ ) && ( ivas_total_brate - ism_total_brate < MIN_BRATE_MDCT_STEREO ) )

#endif

                {

                    *element_mode = IVAS_CPE_DFT;

                }
@@ -119,11 +115,7 @@ void ivas_masa_set_elements( 
        }

        hQMetaData->bits_frame_nominal = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC );

#ifdef MASA_AND_OBJECTS

#ifdef OMASA_UPDATES

        if ( ivas_format == MASA_ISM_FORMAT && ( ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || ism_mode == ISM_MASA_MODE_DISC ) )

#else

        if ( ivas_format == MASA_ISM_FORMAT && ( ism_mode == ISM_MASA_MODE_ONE_OBJ || ism_mode == ISM_MASA_MODE_DISC ) )

#endif

        {

            hQMetaData->bits_frame_nominal -= (int16_t) ( ism_total_brate / FRAMES_PER_SEC );

        }
@@ -634,11 +626,7 @@ int32_t calculate_cpe_brate_MASA_ISM( 
        k++;

    }



#ifdef OMASA_UPDATES

    if ( ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )

#else

    if ( ism_mode == ISM_MASA_MODE_ONE_OBJ )

#endif

    {

        cpe_brate = ivas_total_brate - sep_object_brate[k - 2][0]; /* take data from the first column */

    }