Commit 7ce64eab authored by vaclav's avatar vaclav
Browse files

Merge branch 'object_editing_align_basop' into 'main' 

Back-port object editing changes from basop

See merge request !2311
parents 1ac5c3fc 6c534d16

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_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_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 );

lib_dec/lib_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -1501,11 +1501,6 @@ ivas_error IVAS_DEC_SetEditableParameters( 
        return IVAS_ERROR( IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED, "Object editing no supported in this operation mode." );

    }



    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL )

    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



    if ( st_ivas->ivas_format == ISM_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT )

    {

        if ( ism_mode == ISM_MODE_DISC || ism_mode == ISM_SBA_MODE_DISC )