Commit 195afa1f authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

parent 1ad97ddb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ 
/* #################### Start BASOP porting switches ############################ */



#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR            /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */

#define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS              /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */

#define FIX_1111_TDM_LSP_BUFFER                         /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */

#define FIX_1157_OBSOLETE_DMX_TABLE                     /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */

lib_dec/ivas_init_dec.c

+0 −10
Original line number Diff line number Diff line
@@ -600,7 +600,6 @@ ivas_error ivas_dec_setup( 


            if ( st_ivas->nchan_ism > 0 )

            {

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

                /* the input_ivas_format should be MASA_ISM_FORMAT, but we cannot initialize it now */

                /* info about the number of objects:

                          '00' - MASA format at the encoder
@@ -615,15 +614,6 @@ ivas_error ivas_dec_setup( 
                    st_ivas->nchan_ism = 1;

                }

                /* for MASA_ISM_FORMAT at input the number of MASA transport channels is always 2 and the corresponding bit is not used here*/

#else

                /* the input_ivas_format should be MASA_ISM_FORMAT, but we cannot initialize it now */

                if ( st_ivas->nchan_transport == 2 && st_ivas->nchan_ism == 3 )

                {

                    st_ivas->nchan_ism = 4;

                }



                /* for MASA_ISM_FORMAT at input the number of MASA transport channels is always 2 */

#endif

                st_ivas->nchan_transport = 2;

                element_mode_flag = 1;

            }

lib_dec/ivas_masa_dec.c

+0 −13
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ ivas_error ivas_masa_decode( 
    {

        if ( !( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) )

        {

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

            if ( ivas_format == MASA_FORMAT )

            {

                /* re-read the number of objects, needed in case of bad frame  */
@@ -196,7 +195,6 @@ ivas_error ivas_masa_decode( 
            }

            else

            {

#endif

                if ( ivas_format != MASA_ISM_FORMAT )

                {

                    /* number of transport channels is always 2 for MASA_ISM format */
@@ -296,15 +294,6 @@ ivas_error ivas_masa_decode( 
                }





#ifndef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

                /* read 2 bits:

                              '00' - MASA format at the encoder

                              '01' - MASA_ISM_FORMAT at the encoder, with 1 object

                              '10' - MASA_ISM_FORMAT at the encoder, with 2 objects

                              '11' - MASA_ISM_FORMAT at the encoder, with 3 or 4 objects

                              reading if 3 or 4 object is performed later

                 */

#endif

                byteBuffer = st->bit_stream[( st->next_bit_pos )--];

                byteBuffer = byteBuffer + 2 * st->bit_stream[( st->next_bit_pos )--];
@@ -322,9 +311,7 @@ ivas_error ivas_masa_decode( 
                byteBuffer = st->bit_stream[( st->next_bit_pos )--];

                ( *nb_bits_read )++;

                hMasa->config.numberOfDirections = (uint8_t) ( byteBuffer + 1 );

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

            }

#endif

        }

        else

        {

lib_enc/ivas_masa_enc.c

+0 −27
Original line number Diff line number Diff line
@@ -438,7 +438,6 @@ ivas_error ivas_masa_encode( 
        {

            if ( ivas_format == MASA_ISM_FORMAT && ism_mode == ISM_MODE_NONE )

            {

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

                /* use the MASA number of transport channels bit to signal if there are 1 or 2 objects */

                if ( nchan_ism == 1 || nchan_ism == 2 )

                {
@@ -449,17 +448,6 @@ ivas_error ivas_masa_encode( 
                    /* for 3 or 4 objects write already the number of MASA directions */

                    push_next_indice( hMetaData, hQMetaData->no_directions - 1, MASA_TRANSP_BITS );

                }

#else

                /* use the MASA number of transport channels bit to signal if there are 3 or 4 objects */

                if ( nchan_ism == 4 )

                {

                    push_next_indice( hMetaData, 1, MASA_TRANSP_BITS );

                }

                else

                {

                    push_next_indice( hMetaData, 0, MASA_TRANSP_BITS );

                }

#endif

            }

            else

            {
@@ -471,7 +459,6 @@ ivas_error ivas_masa_encode( 


        if ( ivas_format == MASA_ISM_FORMAT && ism_mode == ISM_MODE_NONE )

        {

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

            if ( nchan_ism >= 3 ) /* if 3 or 4 objects */

            {

                push_next_indice( hMetaData, 5 - nchan_ism, MASA_HEADER_BITS );
@@ -480,16 +467,6 @@ ivas_error ivas_masa_encode( 
            {

                push_next_indice( hMetaData, 3, MASA_HEADER_BITS );

            }

#else

            if ( nchan_ism <= 3 )

            {

                push_next_indice( hMetaData, nchan_ism, MASA_HEADER_BITS );

            }

            else

            {

                push_next_indice( hMetaData, nchan_ism - 1, MASA_HEADER_BITS );

            }

#endif

            hQMetaData->metadata_max_bits -= MASA_HEADER_BITS;

        }

        else
@@ -499,16 +476,12 @@ ivas_error ivas_masa_encode( 
            push_next_indice( hMetaData, 0, MASA_HEADER_BITS );

            hQMetaData->metadata_max_bits -= MASA_HEADER_BITS;

        }

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

        if ( !( ivas_format == MASA_ISM_FORMAT && ism_mode == ISM_MODE_NONE && nchan_ism > 2 ) )

        {

#endif

            /* write number of directions */

            push_next_indice( hMetaData, hQMetaData->no_directions - 1, 1 );

            hQMetaData->metadata_max_bits -= 1;

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

        }

#endif



        /* write subframe mode */

        push_next_indice( hMetaData, hQMetaData->q_direction[0].cfg.nblocks == 1 ? 1 : 0, MASA_SUBFRAME_BITS );