Commit b1c0bbd9 authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch '2052-ref-PortMr2088-from-float-leftovers-after-nonbe_unified_decoding_paths' into 'ivas-float-update'

Port MR2088 from float to FLP-ref - Leftovers after NONBE_UNIFIED_DECODING_PATHS

See merge request !2288
parents 8e74100b ff747703

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -175,7 +175,11 @@ typedef enum 
#define MAX_JBM_L_FRAME48k                      1920

#define MAX_JBM_L_FRAME_NS                      40000000L

#define MAX_SPAR_INTERNAL_CHANNELS              IVAS_SPAR_MAX_CH

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

#define MAX_CLDFB_DIGEST_CHANNELS               3                           /* == maximum of ParamISM TCs and ParamMC TCs */

#else

#define MAX_CLDFB_DIGEST_CHANNELS               (FOA_CHANNELS + MAX_NUM_OBJECTS)

#endif



typedef enum

{

lib_com/ivas_prot.h

+5 −3
Original line number Diff line number Diff line
@@ -886,12 +886,13 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder handle                                         */

);



#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS

void ivas_jbm_dec_copy_tc_no_tsm( 

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

    float *tc[],                                                /* i  : transport channels                                          */

    const int16_t output_frame                                  /* i  : output frame size                                           */

);



#endif

void ivas_jbm_dec_get_md_map_even_spacing(

    const int16_t len,                                          /* i  : length of the modfied frames in metadata slots              */

    const int16_t subframe_len,                                 /* i  : default length of a subframe                                */
@@ -1140,7 +1141,7 @@ void ivas_ism_dec_digest_tc( 
void ivas_param_ism_dec_digest_tc(

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

    const uint16_t nCldfbSlots,                                 /* i  : number of CLDFB slots in transport channels */

    float *transport_channels_f[]                               /* i  : synthesized core-coder transport channels/DirAC output  */

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

);



void ivas_param_ism_dec_dequant_md(
@@ -1152,13 +1153,14 @@ void ivas_param_ism_dec_prepare_renderer( 
    const uint16_t nCldfbSlots                                  /* i  : number of CLDFB slots in transport channels */

);



#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS

void ivas_ism_param_dec_tc_gain_ajust(

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

    const uint16_t nSamples,                                    /* i  : number of samples to be compensate          */

    const uint16_t nFadeLength,                                 /* i  : length of the crossfade in samples          */

    float *transport_channels_f[]                               /* i  : synthesized core-coder transport channels/DirAC output  */

);



#endif

void ivas_param_ism_dec_render(

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

    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested             */

lib_com/options.h

+1 −4
Original line number Diff line number Diff line
@@ -189,12 +189,9 @@ 
#define FIX_1388_MSAN_ivas_init_decoder                 /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */

#define FIX_1288_SPLIT_REND_XSAN                        /* Dlb: Fix asan, msan and usan issues in split rendering mode*/

#define LIB_DEC_REVISION                                /* VA: cleaning and simplification of lib_dec.c */

#define UNIFIED_DECODING_PATHS_LEFTOVERS                /* VA: issue 880: remove leftovers after NONBE_UNIFIED_DECODING_PATHS */



// object-editing feature porting

#define TMP_FIX_SPLIT_REND                              // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

#define TMP_FIX_OMASA_SR_BE                             // temporary fix to keep OMASA split-rendering BE



// objject-editing feature porting

#define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features

#define TMP_FIX_SPLIT_REND                              // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

#define TMP_FIX_OMASA_SR_BE                             // temporary fix to keep OMASA split-rendering BE

lib_dec/ivas_dirac_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1552,7 +1552,7 @@ void ivas_dirac_dec_render( 
    uint16_t slot_size, n_samples_sf, ch, nchan_intern;

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;

    float *output_f_local[MAX_OUTPUT_CHANNELS];

    float output_f_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k]; // VE2SB: TBV

    float output_f_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k];



    hSpatParamRendCom = st_ivas->hSpatParamRendCom;

lib_dec/ivas_ism_param_dec.c

+65 −29
Original line number Diff line number Diff line
@@ -45,6 +45,15 @@ 
#include "wmc_auto.h"





#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

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

 * Local function declarations

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



static void ivas_ism_param_dec_tc_gain_adjust( Decoder_Struct *st_ivas, const int16_t nSamples, const int16_t nFadeLength, float *p_data_f[] );



#endif



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

 * Local function definitions

 *-----------------------------------------------------------------------*/
@@ -807,17 +816,31 @@ void ivas_ism_dec_digest_tc( 
void ivas_param_ism_dec_digest_tc(

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

    const uint16_t nCldfbSlots, /* i  : number of CLDFB slots in transport channels               */

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

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

)

{

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

    int16_t ch, slot_idx, output_frame;

    int16_t num_freq_bands, cldfb_ch, n_ch_cldfb;

    float *cldfb_real_buffer, *cldfb_imag_buffer;

#else

    int16_t ch, nchan_transport;

    int16_t slot_idx;

    int16_t output_frame;

    PARAM_ISM_DEC_HANDLE hParamIsmDec;

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;

    int16_t fade_len;

#endif



    /* Initialization */

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

    num_freq_bands = st_ivas->hSpatParamRendCom->num_freq_bands;

    output_frame = nCldfbSlots * num_freq_bands;

    n_ch_cldfb = st_ivas->hTcBuffer->nchan_transport_jbm - st_ivas->hTcBuffer->nchan_buffer_full;



    cldfb_real_buffer = st_ivas->hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc;

    cldfb_imag_buffer = st_ivas->hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc;

#else

    hParamIsmDec = st_ivas->hParamIsmDec;

    assert( hParamIsmDec );

    hSpatParamRendCom = st_ivas->hSpatParamRendCom;
@@ -826,16 +849,31 @@ void ivas_param_ism_dec_digest_tc( 
    fade_len = output_frame / 2;



    nchan_transport = st_ivas->nchan_transport;

#endif





    push_wmops( "ivas_param_ism_dec_digest_tc" );



#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

    ivas_ism_param_dec_tc_gain_adjust( st_ivas, output_frame, output_frame / 2, p_data_f );

#else

    if ( st_ivas->hDecoderConfig->Opt_tsm )

    {

        /*TODO : FhG to check*/

        ivas_ism_param_dec_tc_gain_ajust( st_ivas, output_frame, fade_len, transport_channels_f );

        ivas_ism_param_dec_tc_gain_ajust( st_ivas, output_frame, fade_len, p_data_f );

    }

#endif



#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

    /* CLDFB Analysis */

    for ( ch = 0, cldfb_ch = 0; cldfb_ch < n_ch_cldfb; cldfb_ch++, ch++ )

    {

        for ( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ )

        {

            cldfbAnalysis_ts( &( p_data_f[ch][num_freq_bands * slot_idx] ),

                              &cldfb_real_buffer[slot_idx * num_freq_bands * n_ch_cldfb + cldfb_ch * num_freq_bands],

                              &cldfb_imag_buffer[slot_idx * num_freq_bands * n_ch_cldfb + cldfb_ch * num_freq_bands],

                              num_freq_bands, st_ivas->cldfbAnaDec[cldfb_ch] );

        }

    }

#else

    for ( ch = 0; ch < nchan_transport; ch++ )

    {

        /* CLDFB Analysis */
@@ -847,15 +885,13 @@ void ivas_param_ism_dec_digest_tc( 
                float RealBuffer[CLDFB_NO_CHANNELS_MAX];

                float ImagBuffer[CLDFB_NO_CHANNELS_MAX];



                cldfbAnalysis_ts( &( transport_channels_f[ch][hSpatParamRendCom->num_freq_bands * slot_idx] ), RealBuffer, ImagBuffer, hSpatParamRendCom->num_freq_bands, st_ivas->cldfbAnaDec[ch] );

                cldfbAnalysis_ts( &( p_data_f[ch][hSpatParamRendCom->num_freq_bands * slot_idx] ), RealBuffer, ImagBuffer, hSpatParamRendCom->num_freq_bands, st_ivas->cldfbAnaDec[ch] );

                mvr2r( RealBuffer, &hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc[slot_idx * hSpatParamRendCom->num_freq_bands * nchan_transport + ch * hSpatParamRendCom->num_freq_bands], hSpatParamRendCom->num_freq_bands );

                mvr2r( ImagBuffer, &hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc[slot_idx * hSpatParamRendCom->num_freq_bands * nchan_transport + ch * hSpatParamRendCom->num_freq_bands], hSpatParamRendCom->num_freq_bands );

            }

        }

    }





    pop_wmops();

#endif



    return;

}
@@ -927,8 +963,6 @@ void ivas_param_ism_dec_prepare_renderer( 
        nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE;

    }



    push_wmops( "ivas_param_ism_dec_digest_tc" );



    /* general setup */

    ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbSlots, hParamIsmDec->hParamIsmRendering->interpolator );
@@ -1009,23 +1043,25 @@ void ivas_param_ism_dec_prepare_renderer( 
    /* Compute mixing matrix */

    ivas_param_ism_compute_mixing_matrix( st_ivas->nchan_ism, hParamIsmDec, st_ivas->hISMDTX, direct_response, nchan_transport, nchan_out_woLFE, cx_diag, ref_power, hParamIsmDec->hParamIsmRendering->mixing_matrix_lin );



    pop_wmops();



    return;

}





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

 * ivas_ism_param_dec_tc_gain_ajust()

 * ivas_ism_param_dec_tc_gain_adjust()

 *

 *

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



#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

static void ivas_ism_param_dec_tc_gain_adjust(

#else

void ivas_ism_param_dec_tc_gain_ajust(

#endif

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

    const uint16_t nSamples,      /* i  : number of samples to be compensate                    */

    const uint16_t nFadeLength,   /* i  : length of the crossfade in samples                    */

    float *transport_channels_f[] /* i  : synthesized core-coder transport channels/DirAC output*/

    const int16_t nSamples,    /* i  : number of samples to be compensate                    */

    const int16_t nFadeLength, /* i  : length of the crossfade in samples                    */

    float *p_data_f[]          /* i  : synthesized core-coder transport channels/DirAC output*/

)



{
@@ -1039,8 +1075,8 @@ void ivas_ism_param_dec_tc_gain_ajust( 


    for ( i = 0; i < nSamples; i++ )

    {

        ene_tc += transport_channels_f[0][i] * transport_channels_f[0][i] + transport_channels_f[1][i] * transport_channels_f[1][i];          /* L*L + R*R */

        ene_sum += ( transport_channels_f[0][i] + transport_channels_f[1][i] ) * ( transport_channels_f[0][i] + transport_channels_f[1][i] ); /* (L+R)*(L+R) */

        ene_tc += p_data_f[0][i] * p_data_f[0][i] + p_data_f[1][i] * p_data_f[1][i];          /* L*L + R*R */

        ene_sum += ( p_data_f[0][i] + p_data_f[1][i] ) * ( p_data_f[0][i] + p_data_f[1][i] ); /* (L+R)*(L+R) */

    }

    gain = sqrtf( ene_tc / ( ene_sum + EPSILON ) );

    if ( st_ivas->hSCE[0]->hCoreCoder[0]->ini_frame > 1 )
@@ -1051,21 +1087,21 @@ void ivas_ism_param_dec_tc_gain_ajust( 
        grad = ( gain - last_gain ) / (float) nFadeLength; /* slope between two consecutive gains, 480 samples length */

        for ( i = 0; i < ( nFadeLength ); i++ )

        {

            transport_channels_f[0][i] *= ( last_gain + i * grad );

            transport_channels_f[1][i] *= ( last_gain + i * grad );

            p_data_f[0][i] *= ( last_gain + i * grad );

            p_data_f[1][i] *= ( last_gain + i * grad );

        }

        for ( ; i < nSamples; i++ )

        {

            transport_channels_f[0][i] *= gain;

            transport_channels_f[1][i] *= gain;

            p_data_f[0][i] *= gain;

            p_data_f[1][i] *= gain;

        }

    }

    else

    {

        for ( i = 0; i < nSamples; i++ )

        {

            transport_channels_f[0][i] *= gain;

            transport_channels_f[1][i] *= gain;

            p_data_f[0][i] *= gain;

            p_data_f[1][i] *= gain;

        }

    }