Commit ec0c2c3e authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Fix various warnings.

parent 625ace49

lib_rend/ivas_dirac_dec_binaural_functions.c

+1 −1
Original line number Diff line number Diff line
@@ -3657,7 +3657,7 @@ static void ivas_masa_ext_rend_parambin_internal( 


                ivas_dirac_dec_binaural_determine_processing_matrices( hDiracDecBin, hSpatParamRendCom, &config_data, max_band_decorr, Rmat_local, subframe,

                                                                       hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[subframe] > 0,

                                                                       nchanSeparateChannels, NULL );

                                                                       0, NULL );





                /* re-use reverb and decorr from main direction for the sides */

lib_rend/ivas_dirac_rend.c

+3 −4
Original line number Diff line number Diff line
@@ -2462,9 +2462,8 @@ static void ivas_masa_ext_dirac_render_sf( 
}



void ivas_masa_ext_dirac_render(

    MASA_EXT_REND_HANDLE hMasaExtRend, /* i/o: IVAS decoder structure                                  */

    float *output_f[],                 /* i/o: synthesized core-coder transport channels/DirAC output  */

    const int16_t nchan_transport,     /* i  : number of transport channels                            */

    MASA_EXT_REND_HANDLE hMasaExtRend, /* i/o: MASA renderer structure             */

    float *output_f[],                 /* i/o: input/output signals in time domain */

    const int16_t num_subframes        /* i  : number of subframes to render       */

)

{

lib_rend/ivas_prot_rend.h

+0 −1
Original line number Diff line number Diff line
@@ -517,7 +517,6 @@ void ivas_dirac_deallocate_parameters( 
void ivas_masa_ext_dirac_render(

    MASA_EXT_REND_HANDLE hMasaExtRend,                          /* i/o: MASA renderer structure             */

    float *output_f[],                                          /* i/o: input/output signals in time domain */

    const int16_t nchan_transport,                              /* i  : number of transport channels        */

    const int16_t num_subframes                                 /* i  : number of subframes to render       */

);

lib_rend/lib_rend.c

+2 −2
Original line number Diff line number Diff line
@@ -7779,13 +7779,13 @@ static ivas_error renderInputMasa( 


        copyBufferTo2dArray( masaInput->base.inputBuffer, tmpBuffer_buff );



        num_subframes = masaInput->base.inputBuffer.config.numSamplesPerChannel / ( *masaInput->base.ctx.pOutSampleRate / ( IVAS_NUM_FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) );

        num_subframes = (int16_t) ( masaInput->base.inputBuffer.config.numSamplesPerChannel / ( *masaInput->base.ctx.pOutSampleRate / ( IVAS_NUM_FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) ) );



        switch ( masaInput->hMasaExtRend->renderer_type )

        {

            case RENDERER_DIRAC:

                copyMasaMetadataToDiracRenderer( &masaInput->masaMetadata, masaInput->hMasaExtRend->hSpatParamRendCom );

                ivas_masa_ext_dirac_render( masaInput->hMasaExtRend, tmpBuffer, masaInput->hMasaExtRend->nchan_input, num_subframes );

                ivas_masa_ext_dirac_render( masaInput->hMasaExtRend, tmpBuffer, num_subframes );

                break;

            case RENDERER_STEREO_PARAMETRIC:

            case RENDERER_BINAURAL_PARAMETRIC: