Commit d3159334 authored by multrus's avatar multrus
Browse files

Revert "Revert "Merge branch 'new-osba-baseline' of... 

Revert "Revert "Merge branch 'new-osba-baseline' of forge.3gpp.org:ivas-codec-pc/ivas-codec into new-osba-baseline""

This reverts commit 4951728e.
parent 4951728e

lib_dec/ivas_dec.c

+17 −3
Original line number Diff line number Diff line
@@ -899,12 +899,26 @@ ivas_error ivas_dec( 
        else /*EXT output = individual objects + HOA3*/

        {

#ifdef SBA_AND_OBJECTS

            if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

            {

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

                {

                    delay_signal( output[n], output_frame, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );

                }

            }

            ivas_sba_upmixer_renderer( st_ivas, &output[sba_ch_idx], output_frame );



            ivas_sba_upmixer_renderer( st_ivas, &output[st_ivas->nchan_ism], output_frame );

            if ( st_ivas->ism_mode == ISM_MODE_NONE )

            {

                for ( n = st_ivas->hIntSetup.nchan_out_woLFE - 1; n >= 0; n-- )

                {

                    mvr2r( output[n], output[n + nchan_ism], output_frame );

                }

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

                {

                    set_zero( output[n], output_frame );

                }

            }

#endif

        }

    }

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ ivas_error ivas_init_decoder( 
    if ( output_config == AUDIO_CONFIG_EXTERNAL )

    {

#ifdef SBA_AND_OBJECTS

        if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

        {

            hDecoderConfig->nchan_out = audioCfg2channels( AUDIO_CONFIG_HOA3 );

            hDecoderConfig->nchan_out += st_ivas->nchan_ism;

lib_enc/ivas_enc.c

+0 −5
Original line number Diff line number Diff line
@@ -391,11 +391,6 @@ ivas_error ivas_enc( 
    else if ( ivas_format == SBA_ISM_FORMAT )

    {



        if ( frame == 756 )

        {

            frame = frame;

        }



#ifdef SBA_AND_OBJECTS

        ivas_osba_enc_reconfig( st_ivas );

#endif