Commit 07de37b3 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into 1785-10ms_Rendering_Assert_in_ivas_jbm_dec_render_fx()_scale_sig32

parents a5b7e84a 21f7601f

Workspace_msvc/decoder.vcxproj

+1 −3
Original line number Diff line number Diff line
@@ -151,8 +151,6 @@ 
  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\apps\decoder.c" />

    <ClCompile Include="..\lib_util\test_fft.c" />

    <ClCompile Include="..\lib_util\test_mdct.c" />

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="lib_basop.vcxproj">

Workspace_msvc/lib_enc.vcxproj.filters

+3 −3
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ 
    <ClCompile Include="..\lib_enc\enc_gen_voic_rf_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_gen_voic_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_nelp_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>
@@ -596,6 +593,9 @@ 
    <ClCompile Include="..\lib_enc\rom_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_gen_voic_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_enc\lib_enc.h" />

Workspace_msvc/lib_util.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ 
    <ClCompile Include="..\lib_util\cmdl_tools.c" />

    <ClCompile Include="..\lib_util\evs_rtp_payload.c" />

    <ClCompile Include="..\lib_util\g192.c" />

    <ClCompile Include="..\lib_util\test_fft.c" />

    <ClCompile Include="..\lib_util\vector3_pair_file_reader.c" />

    <ClCompile Include="..\lib_util\hrtf_file_reader.c" />

    <ClCompile Include="..\lib_util\ism_file_reader.c" />

apps/decoder.c

+6 −6
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ typedef struct 
    uint16_t count;

    uint16_t selected;

    uint16_t frameCounter;

} AcousticEnvironmentSequence;



} AcousticEnvironmentSequence;



typedef struct

{
@@ -504,6 +504,7 @@ int main( 
            fprintf( stderr, "Failed to get Distance Attenuation \n\n" );

            goto cleanup;

        }



        if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

        {

            if ( asked_frame_size != IVAS_RENDER_FRAMESIZE_20MS &&
@@ -2486,7 +2487,6 @@ static ivas_error decodeG192( 
cleanup:



    RenderConfigReader_close( &renderConfigReader );



    split_rend_reader_writer_close( &splitRendWriter );

    AudioFileWriter_close( &afWriter );

    MasaFileWriter_close( &masaWriter );
@@ -2861,15 +2861,15 @@ static ivas_error decodeVoIP( 
        {

#ifdef SUPPORT_JBM_TRACEFILE

#ifdef OBJ_EDITING_API

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, systemTime_ms ) ) != IVAS_ERR_OK )

#endif

#else

#ifdef OBJ_EDITING_API

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, &bitstreamReadDone, &parametersAvailableForEditing ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, &bitstreamReadDone, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, &bitstreamReadDone ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, &bitstreamReadDone, systemTime_ms ) ) != IVAS_ERR_OK )

#endif

#endif

            {

lib_com/bitalloc_fx.c

+6 −7
Original line number Diff line number Diff line
@@ -225,8 +225,7 @@ Word16 BitAllocF_fx( 
    Word16 B,                  /* i  : number of available bits                 :Q0  */

    Word16 N,                  /* i  : number of sub-vectors                    :Q0  */

    Word16 *R,                 /* o  : bit-allocation indicator                 :Q0  */

    Word16 *Rsubband_fx /* o  : sub-band bit-allocation vector           :Q3  */

    ,

    Word16 *Rsubband_fx,       /* o  : sub-band bit-allocation vector           :Q3  */

    const Word16 hqswb_clas,   /* i  : hq swb class                             :Q0  */

    const Word16 num_env_bands /* i  : Number sub bands to be encoded for HF GNERIC :Q0  */

)