Commit fea284dc authored by multrus's avatar multrus
Browse files

[cleanup] accept PARAM_ISM_REFACTOR

parent 045e736d

lib_com/ivas_prot.h

+0 −11
Original line number Diff line number Diff line
@@ -1052,17 +1052,10 @@ void ivas_param_ism_enc( 
    const int16_t input_frame                                   /* i  : input frame length per channel              */

);



#ifndef PARAM_ISM_REFACTOR

void ivas_param_ism_enc_close(

    DIRAC_ENC_HANDLE *hDirAC,                                   /* i/o: encoder DirAC handle                        */

    const int32_t input_Fs                                      /* i  : input sampling_rate                         */

);

#else

void ivas_param_ism_enc_close(

    PARAM_ISM_CONFIG_HANDLE *hParamIsm,                         /* i/o: ParamISM handle                             */

    const int32_t input_Fs                                      /* i  : input sampling_rate                         */

);

#endif



void ivas_ism_metadata_close(

    ISM_METADATA_HANDLE hIsmMetaData[],                         /* i/o  : object metadata handles                   */
@@ -1101,11 +1094,7 @@ ivas_error ivas_param_ism_dec_open( 
);



void ivas_param_ism_dec_close(

#ifndef PARAM_ISM_REFACTOR

    DIRAC_DEC_HANDLE *hDirAC,                                   /* i/o: decoder DirAC handle                        */

#else

    PARAM_ISM_DEC_HANDLE *hParamIsmDec,                         /* i/o: decoder ParamISM handle                     */

#endif

    SPAT_PARAM_REND_COMMON_DATA_HANDLE *hSpatParamRendCom_out,  /* i/o: common spatial renderer data                */

    const AUDIO_CONFIG output_config                            /* i  : output audio configuration                  */

);

lib_com/ivas_stat_com.h

+0 −2
Original line number Diff line number Diff line
@@ -789,10 +789,8 @@ typedef struct ivas_fb_mixer_state_structure 


typedef struct ivas_param_ism_data_structure

{

#ifdef PARAM_ISM_REFACTOR

    IVAS_FB_MIXER_HANDLE hFbMixer;



#endif

    int16_t nbands;

    int16_t nblocks[MAX_PARAM_ISM_NBANDS];

    int16_t band_grouping[MAX_PARAM_ISM_NBANDS + 1];

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ 
#define FIX_708_DPID_COMMAND_LINE                       /* issue 708: sanity checks for '-dpid' command-line */

#define FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */

#define FIX_513_REND_MC_ALLOC                           /* FhG: issue 513, optimise external renderer allocation for multichannel */

#define PARAM_ISM_REFACTOR                              /* FhG: Issue 768: Refactoring to decouple hDirAC and hParamISM */

#define FIX_678_ISM_SBA_ASAN                            /* FhG: Issue 678: ASAN in ISM to SBA conversion in JBM */

#define FIX_676_JBM_USAN                                /* FhG: Issue 676: USAN in JBM */

#define FIX_796_MCT_MODE_DIFF_JBM                       /* FhG: Issue 796: fix differences between JBM and non-JBM fOR MC */

lib_dec/ivas_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -183,11 +183,7 @@ ivas_error ivas_dec( 
        }

        else if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

#ifndef PARAM_ISM_REFACTOR

            if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt, st_ivas->hSCE[0]->hCoreCoder[0] ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hParamIsmDec->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt, st_ivas->hSCE[0]->hCoreCoder[0] ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }

lib_dec/ivas_dirac_dec.c

+0 −15
Original line number Diff line number Diff line
@@ -85,10 +85,6 @@ static ivas_error ivas_dirac_dec_config_internal( 
            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC Config\n" ) );

        }



#ifndef PARAM_ISM_REFACTOR

        hDirAC->hParamIsm = NULL;

        hDirAC->hParamIsmRendering = NULL;

#endif

        st_ivas->hDirAC = hDirAC;

    }
@@ -1537,9 +1533,6 @@ void ivas_dirac_dec_set_md_map( 
    hDirAC = st_ivas->hDirAC;

    hSpatParamRendCom = st_ivas->hSpatParamRendCom;

#ifdef DEBUGGING

#ifndef PARAM_ISM_REFACTOR

    assert( hDirAC );

#endif

    assert( hSpatParamRendCom );

#endif
@@ -1570,11 +1563,7 @@ void ivas_dirac_dec_set_md_map( 
    {

        ivas_jbm_dec_get_md_map_even_spacing( nCldfbTs, num_slots_in_subfr, 0, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );

    }

#ifndef PARAM_ISM_REFACTOR

    else if ( hDirAC->hConfig == NULL || hDirAC->hConfig->dec_param_estim == 0 )

#else

    else if ( hDirAC == NULL || hDirAC->hConfig == NULL || hDirAC->hConfig->dec_param_estim == 0 )

#endif

    {

        ivas_jbm_dec_get_md_map( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, 0, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );

    }
@@ -1583,11 +1572,7 @@ void ivas_dirac_dec_set_md_map( 
        ivas_jbm_dec_get_md_map( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, hSpatParamRendCom->dirac_read_idx, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );

    }



#ifndef PARAM_ISM_REFACTOR

    if ( hDirAC->hConfig == NULL || hDirAC->hConfig->dec_param_estim == 0 )

#else

    if ( hDirAC == NULL || hDirAC->hConfig == NULL || hDirAC->hConfig->dec_param_estim == 0 )

#endif

    {

        float tmp;

        int16_t sf_idx, slot_idx, slot_idx_abs;