Commit 0af26325 authored by vaclav's avatar vaclav
Browse files

- fix crashes for default self-test 

- fixes for highest bitrates - 'sw_13k2_512k.bin' switching profile + formatting
- fix crashes for 'binaural' and 'binaural_room' outputs + formatting
parent fb01a525

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -911,7 +911,7 @@ typedef enum 
{

    DIRAC_OPEN,                                 /* initialize to default value              */

    DIRAC_RECONFIGURE                           /* HOA3                                     */

#ifdef SBA_BITRATE_SWITCHING // VE: TBV - just dirty patch for the moment

#ifdef SBA_BITRATE_SWITCHING // VE2FhG: TBV - just dirty patch for the moment

   ,DIRAC_RECONFIGURE_MODE                      /* HOA3                                     */

#endif

} DIRAC_CONFIG_FLAG;

lib_com/ivas_prot.h

+6 −0
Original line number Diff line number Diff line
@@ -191,6 +191,9 @@ ivas_error pre_proc_ivas( 
    Encoder_State *st,                                          /* i/o: encoder state structure                 */

    const int16_t last_element_mode,                            /* i  : last element mode                       */

    const int32_t element_brate,                                /* i  : element bitrate                         */

#ifdef SBA_BITRATE_SWITCHING

    const int32_t last_element_brate,                           /* i  : last element bitrate                    */

#endif   

    const int16_t input_frame,                                  /* i  : frame length                            */

    float old_inp_12k8[],                                       /* i/o: buffer of old input signal              */

    float old_inp_16k[],                                        /* i/o: buffer of old input signal @ 16kHz      */
@@ -387,6 +390,9 @@ ivas_error ivas_core_enc( 
    float enerBuffer[CPE_CHANNELS][CLDFB_NO_CHANNELS_MAX],                   /* i  : energy buffer                           */

    float fft_buff[CPE_CHANNELS][2 * L_FFT],                                 /* i  : FFT buffer                              */

    const int16_t tdm_SM_flag,                                               /* i  : channel combination scheme flag                 */

#ifdef SBA_BITRATE_SWITCHING

    const int16_t ivas_format,                                               /* i  : IVAS format                             */

#endif

    const int16_t flag_16k_smc                                               /* i  : flag to indicate if the OL SMC is run at 16 kHz */

);

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ 


#ifdef DEBUGGING



#define MEM_COUNT_DETAILS                   /* RAM counting tool: print per sub-structure details */

/*#define MEM_COUNT_DETAILS*/                   /* RAM counting tool: print per sub-structure details */



#define DEBUG_MODE_INFO                     /* output most important parameters to the subdirectory "res/" */

/*#define DEBUG_MODE_INFO*/                     /* output most important parameters to the subdirectory "res/" */

#ifdef DEBUG_MODE_INFO

/*#define DEBUG_MODE_ACELP*/                    /* output most important ACELP core parameters to the subdirectory "res/" */

/*#define DEBUG_MODE_TCX*/                      /* output most important TCX core parameters to the subdirectory "res/" */

lib_dec/ACcontextMapping_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -633,8 +633,8 @@ int16_t RCcontextMapping_decode2_no_mem_s17_LCS( 
            /* Update bitstream pointer */

            st->next_bit_pos = start_bit_pos + bits_tups + rc_uni_dec_virtual_finish( &rc_st_dec );



            /* Confirm that there is no overflow */

#ifdef DEBUGGING

            /* Confirm that there is no overflow */

            assert( st->next_bit_pos - start_bit_pos + rest_bits <= 0 );

#endif

lib_dec/ivas_binauralRenderer.c

+11 −3
Original line number Diff line number Diff line
@@ -472,10 +472,17 @@ ivas_error ivas_binRenderer_open( 
        }



        ivas_output_init( &out_setup, AUDIO_CONFIG_7_1_4 );



#ifdef SBA_BITRATE_SWITCHING

        if( st_ivas->hoa_dec_mtx == NULL )

#endif

        {

            if ( ( error = ivas_sba_get_hoa_dec_matrix( out_setup, &st_ivas->hoa_dec_mtx, st_ivas->hIntSetup.ambisonics_order ) ) != IVAS_ERR_OK )

            {

                return error;

            }

        }



        hBinRenderer->hoa_dec_mtx = st_ivas->hoa_dec_mtx;

        st_ivas->binaural_latency_ns = (int32_t) ( FASTCONV_BRIR_latency_s * 1000000000.f );

    }
@@ -504,6 +511,7 @@ ivas_error ivas_binRenderer_open( 
        {

            return error;

        }



        if ( !st_ivas->hRenderConfig->roomAcoustics.override )

        {

            ivas_binaural_reverb_setReverbTimes( hBinRenderer->hReverb, st_ivas->hDecoderConfig->output_Fs, fastconvReverberationTimes, fastconvReverberationEneCorrections );