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

Merge remote-tracking branch 'origin/main' into nokia/fix-masa-test-vector-names

parents 3c84daeb 24cbdac5

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -1148,7 +1148,7 @@ void ivas_param_ism_dec_render( 
    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested             */

    uint16_t *nSamplesRendered,                                 /* o  : number of CLDFB slots rendered              */

    uint16_t *nSamplesAvailable,                                /* o  : number of CLDFB slots still to render       */

    float *output_f[]                                           /* o  : rendered time signal                        */

    float *output_f[]                                           /* i/o: synthesized core-coder TCs / rendered signal*/

);



void ivas_param_ism_params_to_masa_param_mapping(

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ 
#define NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS    /* FhG: fix non-BE in DFT stereo encoder between optimization levels */

#define NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2  /* FhG: fix even more non-BEnesses */

#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP               /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

#define FIX_1330_JBM_MEMORY_FIX                         /* VA: basop issue: 2179 fix non-BE difference in FIX_1330_JBM_MEMORY */

#define NONBE_1380_OMASA_BUILD_DIFF                     /* Nokia: Fix for issue #1380: Large differences in OMASA output between Debug and Release builds */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_ism_param_dec.c

+5 −5
Original line number Diff line number Diff line
@@ -1169,7 +1169,7 @@ void ivas_param_ism_dec_render( 
    const uint16_t nSamplesAsked,    /* i  : number of CLDFB slots requested                */

    uint16_t *nSamplesRendered,      /* o  : number of CLDFB slots rendered                 */

    uint16_t *nSamplesAvailableNext, /* o  : number of CLDFB slots still to render          */

    float *output_f[]                /* o  : rendered time signal                      */

    float *output_f[]                /* i/o: synthesized core-coder TCs / rendered signal   */

)

{

    int16_t ch, slots_to_render, first_sf, last_sf, subframe_idx;

lib_dec/ivas_jbm_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -791,6 +791,9 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
            for ( ch = 0; ch < max( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full ); ch++ )

            {

                hTcBuffer->tc[ch] = &hTcBuffer->tc_buffer[offset];

#ifdef FIX_1330_JBM_MEMORY_FIX

                st_ivas->p_output_f[ch] = hTcBuffer->tc[ch];

#endif

                offset += len_offset;

            }

        }

lib_dec/ivas_mc_param_dec.c

+3 −9
Original line number Diff line number Diff line
@@ -654,7 +654,6 @@ ivas_error ivas_param_mc_dec_reconfig( 
        float *ild_q_old = hParamMC->icld_q;

        float *icc_q_old = hParamMC->icc_q;





        /* init arrays for the quantized parameters */

        if ( ( hParamMC->icc_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( float ) ) ) == NULL )

        {
@@ -724,7 +723,6 @@ ivas_error ivas_param_mc_dec_reconfig( 
     *-----------------------------------------------------------------*/



    /* prototype signal computation */



    if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO )

    {

        if ( nchan_transport_old != nchan_transport )
@@ -750,8 +748,8 @@ ivas_error ivas_param_mc_dec_reconfig( 
                mvr2r( st_ivas->hLsSetUpConversion->dmxMtx[k], &hParamMC->ls_conv_dmx_matrix[k * nchan_out_cov], nchan_out_cov );

            }

        }

        /* convert ParamMC parameter bands to SFB */



        /* convert ParamMC parameter bands to SFB */

        st_ivas->hLsSetUpConversion->sfbCnt = hParamMC->num_param_bands_synth;

        for ( k = 0; k <= hParamMC->num_param_bands_synth; k++ )

        {
@@ -956,7 +954,6 @@ ivas_error ivas_param_mc_dec_reconfig( 
        set_zero( hParamMC->proto_frame_f, 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands );

    }





    if ( nchan_transport_old != nchan_transport )

    {

        if ( hParamMC->synthesis_conf != PARAM_MC_SYNTH_MONO_STEREO )
@@ -1005,6 +1002,7 @@ ivas_error ivas_param_mc_dec_reconfig( 
            }

        }

    }



    return error;

}
@@ -1391,8 +1389,6 @@ void ivas_param_mc_dec_prepare_renderer( 
    hParamMC = st_ivas->hParamMC;

    assert( hParamMC );



    push_wmops( "param_mc_dec_digest_tc" );



    set_s( channel_active, 0, MAX_LS_CHANNELS );

    nchan_transport = st_ivas->nchan_transport;

    nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe;
@@ -1508,7 +1504,6 @@ void ivas_param_mc_dec_prepare_renderer( 
            mvr2r( cx, cx_next_band, nchan_transport * nchan_transport );

        }





        for ( is_next_band = 0; is_next_band < 2; is_next_band++ )

        {

            if ( is_next_band && skip_next_band )
@@ -1530,8 +1525,6 @@ void ivas_param_mc_dec_prepare_renderer( 
        }

    }



    pop_wmops();



    return;

}
@@ -2434,6 +2427,7 @@ static void ivas_param_mc_get_mixing_matrices( 


        diag_matrix_product( Cy_diag, nY_band, proto_matrix_ptr, nY_band, nX, 0, mixing_matrix_local );

    }



    if ( remove_lfe )

    {

        set_zero( mixing_matrix[param_band_idx], nX * nY_cov );