Commit aedf300b authored by emerit's avatar emerit
Browse files

Merge branch 'main' into update_crend on going

parents c10c99e3 2950fee8

Workspace_msvc/lib_com.vcxproj

+4 −30
Original line number Diff line number Diff line
@@ -160,13 +160,11 @@ 
    <ClCompile Include="..\lib_com\disclaimer.c" />

    <ClCompile Include="..\lib_com\dlpc_bfi.c" />

    <ClCompile Include="..\lib_com\dlpc_bfi_fx.c" />

    <ClCompile Include="..\lib_com\edct.c" />

    <ClCompile Include="..\lib_com\edct_fx.c" />

    <ClCompile Include="..\lib_com\enh1632.c" />

    <ClCompile Include="..\lib_com\enh32.c" />

    <ClCompile Include="..\lib_com\enh40.c" />

    <ClCompile Include="..\lib_com\enh64.c" />

    <ClCompile Include="..\lib_com\enhancer.c" />

    <ClCompile Include="..\lib_com\enhancer_fx.c" />

    <ClCompile Include="..\lib_com\enhUL32.c" />

    <ClCompile Include="..\lib_com\enr_1_az.c" />
@@ -175,7 +173,6 @@ 
    <ClCompile Include="..\lib_com\env_stab_trans.c" />

    <ClCompile Include="..\lib_com\est_tilt.c" />

    <ClCompile Include="..\lib_com\est_tilt_fx.c" />

    <ClCompile Include="..\lib_com\fd_cng_com.c" />

    <ClCompile Include="..\lib_com\fd_cng_com_fx.c" />

    <ClCompile Include="..\lib_com\fft.c" />

    <ClCompile Include="..\lib_com\fft_cldfb.c" />
@@ -190,9 +187,9 @@ 
    <ClCompile Include="..\lib_com\fine_gain_bits.c" />

    <ClCompile Include="..\lib_com\fine_gain_bits_fx.c" />

    <ClCompile Include="..\lib_com\float_to_fix_ops.c" />

    <ClCompile Include="..\lib_com\frame_ener.c" />

    <ClCompile Include="..\lib_com\frame_ener_fx.c" />

    <ClCompile Include="..\lib_com\gain_inov_fx.c" />

    <ClCompile Include="..\lib_com\get_gain.c" />

    <ClCompile Include="..\lib_com\get_gain_fx.c" />

    <ClCompile Include="..\lib_com\gs_bitallocation.c" />

    <ClCompile Include="..\lib_com\gs_bitallocation_fx.c" />

    <ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c" />
@@ -202,10 +199,10 @@ 
    <ClCompile Include="..\lib_com\gs_inact_switching_fx.c" />

    <ClCompile Include="..\lib_com\gs_noisefill.c" />

    <ClCompile Include="..\lib_com\gs_noisefill_fx.c" />

    <ClCompile Include="..\lib_com\gs_preech.c" />

    <ClCompile Include="..\lib_com\gs_preech_fx.c" />

    <ClCompile Include="..\lib_com\guided_plc_util.c" />

    <ClCompile Include="..\lib_com\guided_plc_util_fx.c" />

    <ClCompile Include="..\lib_com\hp50.c" />

    <ClCompile Include="..\lib_com\hp50_fx.c" />

    <ClCompile Include="..\lib_com\hq2_bit_alloc.c" />

    <ClCompile Include="..\lib_com\hq2_bit_alloc_fx.c" />

    <ClCompile Include="..\lib_com\hq2_core_com.c" />
@@ -261,9 +258,7 @@ 
    <ClCompile Include="..\lib_com\ivas_spar_com.c" />

    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_dft_com.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_eclvq_com.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_eclvq_com_fx.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_ica_com.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com.c" />
@@ -276,53 +271,33 @@ 
    <ClCompile Include="..\lib_com\limit_t0.c" />

    <ClCompile Include="..\lib_com\limit_t0_fx.c" />

    <ClCompile Include="..\lib_com\log2.c" />

    <ClCompile Include="..\lib_com\logqnorm.c" />

    <ClCompile Include="..\lib_com\logqnorm_fx.c" />

    <ClCompile Include="..\lib_com\longarith.c" />

    <ClCompile Include="..\lib_com\low_rate_band_att.c" />

    <ClCompile Include="..\lib_com\low_rate_band_att_fx.c" />

    <ClCompile Include="..\lib_com\lpc_tools.c" />

    <ClCompile Include="..\lib_com\lpc_tools_fx.c" />

    <ClCompile Include="..\lib_com\lsf_dec_bfi.c" />

    <ClCompile Include="..\lib_com\lsf_dec_bfi_fx.c" />

    <ClCompile Include="..\lib_com\lsf_msvq_ma.c" />

    <ClCompile Include="..\lib_com\lsf_msvq_ma_fx.c" />

    <ClCompile Include="..\lib_com\lsf_tools.c" />

    <ClCompile Include="..\lib_com\lsf_tools_fx.c" />

    <ClCompile Include="..\lib_com\lsp_conv_poly.c" />

    <ClCompile Include="..\lib_com\lsp_conv_poly_fx.c" />

    <ClCompile Include="..\lib_com\math_op.c" />

    <ClCompile Include="..\lib_com\modif_fs.c" />

    <ClCompile Include="..\lib_com\modif_fs_fx.c" />

    <ClCompile Include="..\lib_com\mslvq_com.c" />

    <ClCompile Include="..\lib_com\mslvq_com_fx.c" />

    <ClCompile Include="..\lib_com\nelp.c" />

    <ClCompile Include="..\lib_com\nelp_fx.c" />

    <ClCompile Include="..\lib_com\oper_32b.c" />

    <ClCompile Include="..\lib_com\parameter_bitmaping.c" />

    <ClCompile Include="..\lib_com\parameter_bitmaping_fx.c" />

    <ClCompile Include="..\lib_com\phase_dispersion.c" />

    <ClCompile Include="..\lib_com\phase_dispersion_fx.c" />

    <ClCompile Include="..\lib_com\ppp.c" />

    <ClCompile Include="..\lib_com\ppp_fx.c" />

    <ClCompile Include="..\lib_com\pred_lt4.c" />

    <ClCompile Include="..\lib_com\pred_lt4_fx.c" />

    <ClCompile Include="..\lib_com\preemph.c" />

    <ClCompile Include="..\lib_com\preemph_fx.c" />

    <ClCompile Include="..\lib_com\pvq_com.c" />

    <ClCompile Include="..\lib_com\pvq_com_fx.c" />

    <ClCompile Include="..\lib_com\range_com.c" />

    <ClCompile Include="..\lib_com\range_com_fx.c" />

    <ClCompile Include="..\lib_com\re8_ppv.c" />

    <ClCompile Include="..\lib_com\re8_ppv_fx.c" />

    <ClCompile Include="..\lib_com\re8_util.c" />

    <ClCompile Include="..\lib_com\re8_util_fx.c" />

    <ClCompile Include="..\lib_com\realft.c" />

    <ClCompile Include="..\lib_com\recovernorm.c" />

    <ClCompile Include="..\lib_com\recovernorm_fx.c" />

    <ClCompile Include="..\lib_com\reordvct.c" />

    <ClCompile Include="..\lib_com\reordvct_fx.c" />

    <ClCompile Include="..\lib_com\residu.c" />

    <ClCompile Include="..\lib_com\residu_fx.c" />

    <ClCompile Include="..\lib_com\rom_basic_math.c" />

    <ClCompile Include="..\lib_com\rom_basop_util.c" />
@@ -358,7 +333,6 @@ 
    <ClCompile Include="..\lib_com\tec_com.c" />

    <ClCompile Include="..\lib_com\tec_com_flt.c" />

    <ClCompile Include="..\lib_com\tns_base.c" />

    <ClCompile Include="..\lib_com\tns_base_flt.c" />

    <ClCompile Include="..\lib_com\tools.c" />

    <ClCompile Include="..\lib_com\tools_fx.c" />

    <ClCompile Include="..\lib_com\trans_direct.c" />

Workspace_msvc/lib_com.vcxproj.filters

+5 −41
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <ItemGroup>

    <ClCompile Include="..\lib_com\nelp.c">

      <Filter>common_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ppp.c">

      <Filter>common_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\wi.c">

      <Filter>common_evs_c</Filter>

    </ClCompile>
@@ -37,12 +31,6 @@ 
    <ClCompile Include="..\lib_com\ivas_stereo_dft_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_stereo_eclvq_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_stereo_ica_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>
@@ -219,9 +207,6 @@ 
    <ClCompile Include="..\lib_com\lsp_conv_poly_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\tns_base_flt.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\tns_base.c">

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -424,31 +409,23 @@ 
    <ClCompile Include="..\lib_com\delay_comp.c" />

    <ClCompile Include="..\lib_com\disclaimer.c" />

    <ClCompile Include="..\lib_com\dlpc_bfi.c" />

    <ClCompile Include="..\lib_com\edct.c" />

    <ClCompile Include="..\lib_com\enh1632.c" />

    <ClCompile Include="..\lib_com\enh40.c" />

    <ClCompile Include="..\lib_com\enhancer.c" />

    <ClCompile Include="..\lib_com\enr_1_az.c" />

    <ClCompile Include="..\lib_com\env_adj.c" />

    <ClCompile Include="..\lib_com\env_stab.c" />

    <ClCompile Include="..\lib_com\env_stab_trans.c" />

    <ClCompile Include="..\lib_com\est_tilt.c" />

    <ClCompile Include="..\lib_com\fd_cng_com.c" />

    <ClCompile Include="..\lib_com\fft.c" />

    <ClCompile Include="..\lib_com\fft_cldfb.c" />

    <ClCompile Include="..\lib_com\fft_rel.c" />

    <ClCompile Include="..\lib_com\fill_spectrum.c" />

    <ClCompile Include="..\lib_com\findpulse.c" />

    <ClCompile Include="..\lib_com\fine_gain_bits.c" />

    <ClCompile Include="..\lib_com\frame_ener.c" />

    <ClCompile Include="..\lib_com\get_gain.c" />

    <ClCompile Include="..\lib_com\gs_bitallocation.c" />

    <ClCompile Include="..\lib_com\gs_gains.c" />

    <ClCompile Include="..\lib_com\gs_inact_switching.c" />

    <ClCompile Include="..\lib_com\gs_noisefill.c" />

    <ClCompile Include="..\lib_com\gs_preech.c" />

    <ClCompile Include="..\lib_com\guided_plc_util.c" />

    <ClCompile Include="..\lib_com\hp50.c" />

    <ClCompile Include="..\lib_com\hq2_bit_alloc.c" />

    <ClCompile Include="..\lib_com\hq2_core_com.c" />

    <ClCompile Include="..\lib_com\hq2_noise_inject.c" />
@@ -475,28 +452,10 @@ 
    <ClCompile Include="..\lib_com\lag_wind.c" />

    <ClCompile Include="..\lib_com\lerp.c" />

    <ClCompile Include="..\lib_com\limit_t0.c" />

    <ClCompile Include="..\lib_com\logqnorm.c" />

    <ClCompile Include="..\lib_com\longarith.c" />

    <ClCompile Include="..\lib_com\low_rate_band_att.c" />

    <ClCompile Include="..\lib_com\lpc_tools.c" />

    <ClCompile Include="..\lib_com\lsf_dec_bfi.c" />

    <ClCompile Include="..\lib_com\lsf_msvq_ma.c" />

    <ClCompile Include="..\lib_com\lsf_tools.c" />

    <ClCompile Include="..\lib_com\lsp_conv_poly.c" />

    <ClCompile Include="..\lib_com\modif_fs.c" />

    <ClCompile Include="..\lib_com\mslvq_com.c" />

    <ClCompile Include="..\lib_com\parameter_bitmaping.c" />

    <ClCompile Include="..\lib_com\phase_dispersion.c" />

    <ClCompile Include="..\lib_com\pred_lt4.c" />

    <ClCompile Include="..\lib_com\preemph.c" />

    <ClCompile Include="..\lib_com\pvq_com.c" />

    <ClCompile Include="..\lib_com\range_com.c" />

    <ClCompile Include="..\lib_com\re8_ppv.c" />

    <ClCompile Include="..\lib_com\re8_util.c" />

    <ClCompile Include="..\lib_com\realft.c" />

    <ClCompile Include="..\lib_com\recovernorm.c" />

    <ClCompile Include="..\lib_com\reordvct.c" />

    <ClCompile Include="..\lib_com\residu.c" />

    <ClCompile Include="..\lib_com\rom_com.c" />

    <ClCompile Include="..\lib_com\stab_est.c" />

    <ClCompile Include="..\lib_com\stat_noise_uv_mod.c" />
@@ -523,6 +482,11 @@ 
    <ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c" />

    <ClCompile Include="..\lib_com\count.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c" />

    <ClCompile Include="..\lib_com\frame_ener_fx.c" />

    <ClCompile Include="..\lib_com\get_gain_fx.c" />

    <ClCompile Include="..\lib_com\gs_preech_fx.c" />

    <ClCompile Include="..\lib_com\hp50_fx.c" />

    <ClCompile Include="..\lib_com\env_stab_trans.c" />

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\basop_proto_func.h">

apps/decoder.c

+1 −50
Original line number Diff line number Diff line
@@ -111,9 +111,7 @@ typedef struct 
    int16_t orientation_tracking;

    int16_t Opt_non_diegetic_pan;

    float non_diegetic_pan_gain;

#ifdef IVAS_FLOAT_FIXED

    Word16 non_diegetic_pan_gain_fx; /* Q15 */

#endif

    bool renderConfigEnabled;

    char *renderConfigFilename;

    IVAS_DEC_COMPLEXITY_LEVEL complexityLevel;
@@ -134,10 +132,7 @@ static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg ); 
static void usage_dec( void );

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );

#if 0

void run_fft_unit_test( void );

void run_mdct_unit_test( void );

#endif





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

 * main()
@@ -172,9 +167,6 @@ int main( 
    IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

#endif

#if 0

    int16_t run_unit_tests = 0;

#endif



#ifdef WMOPS

    reset_wmops();
@@ -187,16 +179,6 @@ int main( 


    IVAS_DEC_PrintDisclaimer();



#if 0

    if ( run_unit_tests )

    {

        run_fft_unit_test();

        run_mdct_unit_test();

        return 0;

    }



#endif



    if ( !parseCmdlIVAS_dec( (int16_t) argc, argv, &arg ) )

    {

        /* Error printout done in parseCmdlIVAS_dec() */
@@ -388,13 +370,8 @@ int main( 
     *------------------------------------------------------------------------------------------*/



    asked_frame_size = arg.renderFramesize;

#ifndef IVAS_FLOAT_FIXED

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain,

                                       arg.Opt_dpid_on, arg.acousticEnvironmentId, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain_fx,

                                       arg.Opt_dpid_on, arg.acousticEnvironmentId, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

#endif



    {

        fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -464,14 +441,12 @@ int main( 
            fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );

            goto cleanup;

        }

#ifdef IVAS_FLOAT_FIXED

        FOR( Word16 i = 0; i < 4; i++ )

        {

            renderConfig.directivity_fx[i * 3] = (Word16) ( renderConfig.directivity[i * 3] * ( 1u << 6 ) );

            renderConfig.directivity_fx[i * 3 + 1] = (Word16) ( renderConfig.directivity[i * 3 + 1] * ( 1u << 6 ) );

            renderConfig.directivity_fx[i * 3 + 2] = (Word16) ( renderConfig.directivity[i * 3 + 2] * ( ( 1u << 15 ) - 1 ) );

        }

#endif // IVAS_FLOAT_FIXED



        if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {
@@ -512,13 +487,11 @@ int main( 
            fprintf( stderr, "\nError in reading Custom loudspeaker file %s: %s\n\n", arg.customLsSetupFilename, CustomLoudspeakerLayout_getError( lsCustomError ) );

            goto cleanup;

        }

#ifdef IVAS_FLOAT_FIXED

        for ( int i = 0; i < IVAS_MAX_OUTPUT_CHANNELS; i++ )

        {

            hLsCustomData.azimuth_fx[i] = (Word32) ( hLsCustomData.azimuth[i] * ( 1u << 22 ) );

            hLsCustomData.elevation_fx[i] = (Word32) ( hLsCustomData.elevation[i] * ( 1u << 22 ) );

        }

#endif

        if ( ( error = IVAS_DEC_FeedCustomLsData( hIvasDec, hLsCustomData ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_FeedCustomLsData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -1184,7 +1157,6 @@ static bool parseCmdlIVAS_dec( 
                    return false;

                }

            }

#ifdef IVAS_FLOAT_FIXED

            if ( arg->non_diegetic_pan_gain == 1.0f )

            {

                arg->non_diegetic_pan_gain_fx = 32767;
@@ -1194,7 +1166,6 @@ static bool parseCmdlIVAS_dec( 
                arg->non_diegetic_pan_gain_fx = (Word16) ( arg->non_diegetic_pan_gain * ( 1u << 15 ) );

            }



#endif

            i++;

        }

        else if ( strcmp( argv_to_upper, "-LEVEL" ) == 0 )
@@ -1646,17 +1617,7 @@ static ivas_error decodeG192( 
    bool needNewFrame;

    int16_t nSamplesRendered, nSamplesRendered_loop, nSamplesToRender;

    IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];

#ifdef IVAS_FLOAT_FIXED

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 } };

#else

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0 }, {

                                                                            0,

                                                                            0,

                                                                            0,

                                                                        },

                                                           { 0, 0, 0 },

                                                           { 0, 0, 0 } };

#endif

    int16_t vec_pos_update, vec_pos_len;
@@ -2216,17 +2177,7 @@ static ivas_error decodeVoIP( 


    IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN;

    IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];

#ifdef IVAS_FLOAT_FIXED

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 } };

#else

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0 }, {

                                                                            0,

                                                                            0,

                                                                            0,

                                                                        },

                                                           { 0, 0, 0 },

                                                           { 0, 0, 0 } };

#endif

    int16_t vec_pos_update, vec_pos_len;

    int16_t nOutSamples = 0;

apps/encoder.c

+251 −21

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+1 −191

File changed.

Preview size limit exceeded, changes collapsed.