Commit 3d1c900b authored by bayers's avatar bayers
Browse files

use correct ifndef instead of #if 0, fix some whitespace changes coming from... 

use correct ifndef instead of #if 0, fix some whitespace changes coming from merging/stripping, fix a merge error
parent b4b8a7e7

lib_com/ivas_prot.h

+11 −12
Original line number Diff line number Diff line
@@ -892,8 +892,7 @@ ivas_error ivas_jbm_dec_tc_buffer_open( 
);



ivas_error ivas_jbm_dec_tc_buffer_reconfigure(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                                      */

    ,

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                      */

    const TC_BUFFER_MODE tc_buffer_mode,                        /* i  : new buffer mode                                             */

    const int16_t nchan_transport_jbm,                          /* i  : new number of real transport channels                       */

    const int16_t nchan_transport_internal,                     /* i  : new number of totally buffered channels                     */

lib_dec/ivas_dirac_dec.c

+5 −4
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ ivas_error ivas_dirac_dec_config( 
        }

    }



#if 0

#ifndef NONBE_UNIFIED_DECODING_PATHS

    /* Allocate transport channel buffers for SBA format when in JBM */

    if ( dec_config_flag == DIRAC_OPEN )

    {
@@ -982,6 +982,7 @@ ivas_error ivas_dirac_dec_config( 
        }

    }

#endif



    return error;

}

lib_dec/ivas_jbm_dec.c

+7 −7
Original line number Diff line number Diff line
@@ -961,7 +961,6 @@ ivas_error ivas_jbm_dec_render( 
    nSamplesAskedLocal = nSamplesAsked + st_ivas->hTcBuffer->n_samples_discard;





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

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

    {

        p_output[n] = &output[n][0];
@@ -1185,6 +1184,7 @@ ivas_error ivas_jbm_dec_render( 


                /* render objects */

                ivas_ism_render_sf( st_ivas, p_output, *nSamplesRendered );



                /* add already rendererd SBA part */

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

                {
@@ -2181,6 +2181,7 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
    {

        num_tc = MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN;

    }



    return num_tc;

}
@@ -2405,8 +2406,7 @@ ivas_error ivas_jbm_dec_tc_buffer_open( 
 *--------------------------------------------------------------------------*/



ivas_error ivas_jbm_dec_tc_buffer_reconfigure(

    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure                  */

    ,

    Decoder_Struct *st_ivas,                /* i/o: IVAS decoder structure                  */

    const TC_BUFFER_MODE tc_buffer_mode,    /* i  : new buffer mode                         */

    const int16_t nchan_transport_jbm,      /* i  : new number of real transport channels   */

    const int16_t nchan_transport_internal, /* i  : new number of totally buffered channels */

lib_dec/ivas_omasa_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ ivas_error ivas_omasa_dirac_td_binaural( 
    ivas_dirac_dec_binaural( st_ivas, st_ivas->hCombinedOrientationData, output, st_ivas->nchan_transport, MAX_PARAM_SPATIAL_SUBFRAMES );



#ifdef NONBE_UNIFIED_DECODING_PATHS

    /* update combined orientation access index */

    /* reset combined orientation access index before calling the td renderer */

    ivas_combined_orientation_set_to_start_index( st_ivas->hCombinedOrientationData );

#endif
@@ -777,7 +777,7 @@ ivas_error ivas_omasa_dirac_td_binaural_jbm( 
    ivas_dirac_dec_binaural_render( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailable, nchan_transport, output_f );



#ifdef NONBE_UNIFIED_DECODING_PATHS

    /* update combined orientation access index */

    /* reset combined orientation access index before calling the td renderer */

    ivas_combined_orientation_set_to_start_index( st_ivas->hCombinedOrientationData );

#endif

lib_dec/ivas_sba_rendering_internal.c

+0 −1
Original line number Diff line number Diff line
@@ -426,7 +426,6 @@ void ivas_ism2sba_sf( 
    assert( ( sba_order <= 3 ) && "Only order up to 3 is supported!" );

    assert( hIsmRendererData != NULL && "hIsmRendererData not allocated!" );





    /* Init*/

    sba_num_chans = ( sba_order + 1 ) * ( sba_order + 1 );

    for ( j = 0; j < sba_num_chans; j++ )