Commit f4f4f3db authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

re-enable code to set up parametric binaural rendering

parent 47574e7f

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -1147,11 +1147,9 @@ void ivas_param_ism_dec_render( 
    float *output_f[]                                           /* o  : rendered time signal                        */

);



#ifndef OBJ_EDITING_PARAMISM

void ivas_param_ism_params_to_masa_param_mapping(

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

);

#endif





/*----------------------------------------------------------------------------------*

lib_dec/ivas_ism_param_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1406,7 +1406,6 @@ void ivas_param_ism_dec_render( 
 *

 *

 *-------------------------------------------------------------------------*/

#ifndef OBJ_EDITING_PARAMISM

void ivas_param_ism_params_to_masa_param_mapping(

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

)
@@ -1419,7 +1418,9 @@ void ivas_param_ism_params_to_masa_param_mapping( 
    int16_t azimuth[2];

    int16_t elevation[2];

    float power_ratio[2];

#ifndef OBJ_EDITING_API

    int32_t ivas_total_brate;

#endif



    hParamIsmDec = st_ivas->hParamIsmDec;

    hSpatParamRendCom = st_ivas->hSpatParamRendCom;
@@ -1506,4 +1507,3 @@ void ivas_param_ism_params_to_masa_param_mapping( 


    return;

}
 
#endif

lib_dec/ivas_jbm_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -3122,9 +3122,7 @@ void ivas_jbm_dec_prepare_renderer( 
            if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

            {

                ivas_dirac_dec_set_md_map( st_ivas, n_render_timeslots );

#ifndef OBJ_EDITING_PARAMISM

                ivas_param_ism_params_to_masa_param_mapping( st_ivas );

#endif

            }

            else if ( st_ivas->renderer_type == RENDERER_PARAM_ISM || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

            {