Commit 65b77edf authored by reutelhuber's avatar reutelhuber
Browse files

update to main

parents d65269ec b15a5701

apps/decoder.c

+24 −1
Original line number Diff line number Diff line
@@ -196,7 +196,11 @@ int main( 
    RotFileReader *refRotReader = NULL;

    Vector3PairFileReader *referenceVectorReader = NULL;

    ivas_error error = IVAS_ERR_UNKNOWN;

#ifdef FIX_847_OUTPUT_PCM_BUFFER

    int16_t *pcmBuf = NULL;

#else

    int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE];

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

    uint8_t splitRendBitsBuf[IVAS_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES];

#endif
@@ -743,6 +747,21 @@ int main( 
        }

    }



#ifdef FIX_847_OUTPUT_PCM_BUFFER

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

     * Allocate output data buffer

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



    int16_t pcmBufSize;

    if ( ( error = IVAS_DEC_GetOutputBufferSize( hIvasDec, &pcmBufSize ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nGetOutputBufferSize failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

    }



    pcmBuf = malloc( pcmBufSize * sizeof( int16_t ) );



#endif



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

     * Decoding
@@ -797,10 +816,14 @@ int main( 


cleanup:



#ifdef FIX_847_OUTPUT_PCM_BUFFER

    free( pcmBuf );

#endif



#ifdef DEBUG_SBA_AUDIO_DUMP

    IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );

#endif



#endif

    if ( arg.hrtfReaderEnabled )

    {

        IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;

lib_com/ivas_error.h

+7 −0
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ typedef enum 
    IVAS_ERR_INVALID_FEC_CONFIG,

    IVAS_ERR_INVALID_FEC_OFFSET,

    IVAS_ERR_INVALID_INPUT_BUFFER_SIZE,

#ifdef FIX_847_OUTPUT_PCM_BUFFER

    IVAS_ERR_INVALID_OUTPUT_BUFFER_SIZE,

#endif

    IVAS_ERR_DTX_NOT_SUPPORTED,

    IVAS_ERR_UNEXPECTED_NULL_POINTER,

    IVAS_ERR_METADATA_NOT_EXPECTED,
@@ -217,6 +220,10 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Invalid FEC offset";

        case IVAS_ERR_INVALID_INPUT_BUFFER_SIZE:

            return "Invalid input buffer size";

#ifdef FIX_847_OUTPUT_PCM_BUFFER

        case IVAS_ERR_INVALID_OUTPUT_BUFFER_SIZE:

            return "Invalid output buffer size";

#endif

        case IVAS_ERR_DTX_NOT_SUPPORTED:

            return "DTX is not supported in this IVAS format and element mode";

        case IVAS_ERR_UNEXPECTED_NULL_POINTER:

lib_com/options.h

+7 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ 
/*#define ALLOW_BYTE_EP*/                       /* allow byte fer pattern files and check fer pattern file validity */

#define WRAP_AS_EIDXOR                          /* wraps  FER file (as in STL_eid-xor.c/softbit.c) */



#define DEBUG_FORCE_MDCT_STEREO_MODE            /* Force stereo mode decision for MDCT stereo: -stereo 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */

/*#define DEBUG_FORCE_MDCT_STEREO_MODE*/        /* Force stereo mode decision for MDCT stereo: -stereo 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */

/*#define DEBUG_STEREO_DFT_NOCORE*/             /* DFT stereo: by-pass core coder at decoder side*/

/*#define DEBUG_STEREO_DFT_NOSTEREO*/           /* DFT stereo: by-pass stereo processing at encoder and decoder side*/

/*#define DEBUG_STEREO_DFT_NOQRES*/
@@ -158,9 +158,14 @@ 
#define ROM_TO_RAM                                     /*Dlb : ROM optimization in SR mode*/     

#define FIX_712_713_SPLIT_REND_MASA_MC                 /*Dlb : Fix for issue 712 and 713*/

#endif

#define REMOVE_UNUSED_FUNCTION                          /* Dlb: Remove functions that are unhit/unused */

#define FIX_MSAN_USAN_ERROR_JBM                         /* Dlb: Resolve MSAN and USAN errors in the SBA-JBM test case added*/





#define FIX_818_DOUBLE_PREC_KERNEL_SW                   /* FhG: Issue 818: Avoid double precision in kernel switching */

#define FIX_822_REFACTOR_BIN_REVERB_OPEN                /* Nokia: Addresses first step of issue 822 by refactoring ivas_binaural_reverb_open */

#define FIX_847_OUTPUT_PCM_BUFFER                       /* VA: issue 847: Allocate decoder output PCM buffer dynamically */





/* #################### End BE switches ################################## */
@@ -179,6 +184,7 @@ 
#define NONBE_FIX_841_MC_RS_TDOBJ_RENDERER                    /* FhG: Issue #841: [Non-BE] Resolve "MC RS HRFT handle not set to NULL" */

#define NONBE_FIX_840_PARAMMC_RS                              /* FhG: Issue #840: Resolve "MC RS ParamMC hoa encoder wrongly set to zero" */

#define NONBE_FIX_826_JBM_MASA_CNA_CNG                        /* FhG: issue #826:  Resolve "JBM MASA: CNA and CNG not in sync with non-JBM decoding" */

#define NONBE_FIX_835_JBM_PARAMUPMIX_HEADROT                  /* FhG: issue #835: Resolve "JBM: ParamUpmix head rotation broken" */

#define NONBE_FIX_838_CRASH_24_4_WB                           /* FhG: Issue 838: fix encoder crashes for Unified Stereo and MASA 2 TC at 24.4 kbps WB due to missing IGF (re-) allocation */



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

lib_dec/ivas_masa_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1615,7 +1615,11 @@ void ivas_spar_param_to_masa_param_mapping( 
    for ( slot_idx = 0; slot_idx < hSpar->subframe_nbslots[subframe]; slot_idx++ )

    {

        sf = hSpar->render_to_md_map[slot_idx + slot_idx_start] / JBM_CLDFB_SLOTS_IN_SUBFRAME;

#ifndef FIX_MSAN_USAN_ERROR_JBM

        if ( subframe < SPAR_META_DELAY_SUBFRAMES )

#else

        if ( ( sf < SPAR_META_DELAY_SUBFRAMES ) )

#endif

        {

            mixer_mat_index = sf + MAX_PARAM_SPATIAL_SUBFRAMES - SPAR_META_DELAY_SUBFRAMES + 1;

            for ( band = 0; band < SPAR_DIRAC_SPLIT_START_BAND; band++ )

lib_dec/ivas_mc_paramupmix_dec.c

+24 −0
Original line number Diff line number Diff line
@@ -1020,6 +1020,17 @@ static void ivas_mc_paramupmix_dec_sf( 
    int16_t noparamupmix_delay, n_samples_rendered;

    MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix;

    int16_t subframeIdx, idx_in, maxBand;

#ifdef NONBE_FIX_835_JBM_PARAMUPMIX_HEADROT

    float Cldfb_RealBuffer_subfr[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_subfr[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

#ifdef SPLIT_REND_WITH_HEAD_ROT

    float Cldfb_RealBuffer_Binaural[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_Binaural[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

#else

    float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

#endif

#else

#ifdef SPLIT_REND_WITH_HEAD_ROT

    float Cldfb_RealBuffer_subfr[MC_PARAMUPMIX_MAX_INPUT_CHANS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_subfr[MC_PARAMUPMIX_MAX_INPUT_CHANS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
@@ -1031,6 +1042,7 @@ static void ivas_mc_paramupmix_dec_sf( 
    float Cldfb_ImagBuffer_subfr[3 + MC_PARAMUPMIX_MAX_TRANSPORT_CHANS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];

#endif

#endif



    hMCParamUpmix = st_ivas->hMCParamUpmix;
@@ -1119,10 +1131,21 @@ static void ivas_mc_paramupmix_dec_sf( 
            idx_in += 2;

        }



#ifdef NONBE_FIX_835_JBM_PARAMUPMIX_HEADROT

        if ( st_ivas->hCombinedOrientationData && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

        {

            for ( slot_idx = 0; slot_idx < st_ivas->hTcBuffer->subframe_nbslots[st_ivas->hTcBuffer->subframes_rendered]; slot_idx++ )

            {

                ivas_param_mc_mc2sba_cldfb( st_ivas->hTransSetup, hMCParamUpmix->hoa_encoder, slot_idx, Cldfb_RealBuffer_subfr, Cldfb_ImagBuffer_subfr, maxBand, GAIN_LFE );

            }

        }

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

        /*LFE handling for split rendering cases*/

        if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

        {

#ifndef NONBE_FIX_835_JBM_PARAMUPMIX_HEADROT

            for ( idx_lfe = 0; idx_lfe < st_ivas->hIntSetup.num_lfe; idx_lfe++ )

            {

                ch = st_ivas->hIntSetup.index_lfe[idx_lfe];
@@ -1132,6 +1155,7 @@ static void ivas_mc_paramupmix_dec_sf( 
                }

                idx_in++;

            }

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

            if ( st_ivas->hSplitBinRend.hCldfbDataOut != NULL )