Commit 45132b71 authored by kinuthia's avatar kinuthia
Browse files

Merge branch 'main' into 824-ci-incorrect-comparison-in-clang-format-check-job

parents 0a18f68a 832d7978

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ endif() 
if(INCLUDE_SPLIT)

  file(GLOB libLC3plusSrcs "lib_lc3plus/*.c")

  file(GLOB libLC3plusHeaders "lib_lc3plus/*.h")

  add_library(lc3plus ${libLC3plusSrcs} ${libLC3plusHeaders})

  add_library(lib_lc3plus ${libLC3plusSrcs} ${libLC3plusHeaders})

  target_include_directories(lib_lc3plus PUBLIC lib_lc3plus)

  target_link_libraries(lib_lc3plus lib_com) # For including options.h, which is needed for instrumentation to work correctly

  if(WMOPS)

Workspace_msvc/lib_com.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ 
    <ClCompile Include="..\lib_com\ivas_fb_mixer.c" />

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

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

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

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

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

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

Workspace_msvc/lib_com.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -469,6 +469,9 @@ 
    <ClCompile Include="..\lib_com\ivas_omasa_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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

apps/decoder.c

+9 −23
Original line number Diff line number Diff line
@@ -439,9 +439,7 @@ int main( 
#ifdef FIX_708_DPID_COMMAND_LINE

                                       arg.Opt_dpid_on,

#endif

#ifdef FIX_708_AEID_COMMAND_LINE

                                       arg.acousticEnvironmentId,

#endif

                                       arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -658,11 +656,7 @@ int main( 
                    goto cleanup;

                }

            }

#ifdef FIX_708_AEID_COMMAND_LINE

            else

#else

            else if ( error != IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING )

#endif

            {

                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", arg.acousticEnvironmentId );

                goto cleanup;
@@ -1034,11 +1028,7 @@ static bool parseCmdlIVAS_dec( 
    arg->noBadFrameDelay = false;

#endif

#endif

#ifdef FIX_708_AEID_COMMAND_LINE

    arg->acousticEnvironmentId = 65535;

#else

    arg->acousticEnvironmentId = 0;

#endif

    for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )

    {

#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
@@ -1417,7 +1407,6 @@ static bool parseCmdlIVAS_dec( 
        else if ( strcmp( argv_to_upper, "-AEID" ) == 0 )

        {

            ++i;

#ifdef FIX_708_AEID_COMMAND_LINE

            if ( argc - i <= 4 )

            {

                fprintf( stderr, "Error: Acoustic environment ID not specified!\n\n" );
@@ -1431,7 +1420,6 @@ static bool parseCmdlIVAS_dec( 
                usage_dec();

                return false;

            }

#endif

            arg->acousticEnvironmentId = (int16_t) atoi( argv[i++] );

        }

        else if ( strcmp( argv_to_upper, "-DPID" ) == 0 )
@@ -1576,7 +1564,12 @@ static bool parseCmdlIVAS_dec( 
        return false;

    }



#ifdef FIX_807_VARIABLE_SPEED_DECODING

    if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) && ( !arg->tsmEnabled ) )

#else

    if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) )

#endif



    {

        arg->enable5ms = false;

    }
@@ -1672,10 +1665,10 @@ static void usage_dec( void ) 
    fprintf( stdout, "-exof File          : External orientation File for external orientation trajectory\n" );

#ifdef FIX_708_DPID_COMMAND_LINE

    fprintf( stdout, "-dpid ID            : Directivity pattern ID(s) = [ID1, ID2, ID3, ID4]. Space-separated list of up\n" );

    fprintf( stdout, "                      to 4 numbers (unsigned integers) can be specified for BINAURAL output configuration.\n" );

    fprintf( stdout, "                      ID1, ID2, ID3, ID4 specify the directivity pattern IDs used for ISMs 1,2,3 and 4 respectively.\n" );

    fprintf( stdout, "                      This options needs to be accompanied by a render_config file, otherwise a default\n" );

    fprintf( stdout, "                      directivity pattern is used.\n" );

    fprintf( stdout, "                      to 4 numbers (unsigned integers) can be specified for BINAURAL and BINAURAL_ROOM_REVERB\n" );

    fprintf( stdout, "                      output configuration. ID1, ID2, ID3, ID4 specify the directivity pattern IDs used for\n" );

    fprintf( stdout, "                      ISMs 1,2,3 and 4 respectively. This options needs to be accompanied by a render_config file,\n" );

    fprintf( stdout, "                      otherwise a default directivity pattern is used.\n" );

#else

    fprintf( stdout, "-dpid ID            : Directivity pattern ID(s) (space-separated list of up to 4 numbers can be specified) for binaural output configuration\n" );

#endif
@@ -2476,18 +2469,11 @@ static ivas_error decodeG192( 
        {

            // update_mem(); TODO: verify this

            update_wmops();

#ifdef FIX_RAM_COUNTING_5MS_RENDERING

            update_mem();

#ifdef MEM_COUNT_DETAILS

            export_mem( "mem_analysis.csv" );

#endif

#endif

        }

#ifndef FIX_RAM_COUNTING_5MS_RENDERING

#ifdef MEM_COUNT_DETAILS

        export_mem( "mem_analysis.csv" );

#endif

#endif

#endif

    }

apps/renderer.c

+1 −7
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static const CmdLnParser_Option cliOptions[] = { 
        .match = "ism_directivity_pattern_id",

        .matchShort = "dpid",

#ifdef FIX_708_DPID_COMMAND_LINE

        .description = "Directivity pattern ID(s) = [ID1, ID2, ID3, ID4]. Space-separated list of up to 4 numbers (unsigned integers) can be specified for BINAURAL output configuration.\nID1, ID2, ID3, ID4 specify the directivity pattern IDs used for ISMs 1,2,3 and 4 respectively.\nThis options needs to be accompanied by a render_config file, otherwise a default directivity pattern is used.",

        .description = "Directivity pattern ID(s) = [ID1, ID2, ID3, ID4]. Space-separated list of up to 4 numbers (unsigned integers) can be specified for BINAURAL and BINAURAL_ROOM_REVERB output configuration.\nID1, ID2, ID3, ID4 specify the directivity pattern IDs used for ISMs 1,2,3 and 4 respectively.\nThis options needs to be accompanied by a render_config file, otherwise a default directivity pattern is used.",

#else

        .description = "Directivity pattern ID(s) (space-separated list of up to 4 numbers can be specified) for binaural output configuration",

#endif
@@ -2647,11 +2647,7 @@ static CmdlnArgs defaultArgs( 
#endif

    }



#ifdef FIX_708_AEID_COMMAND_LINE

    args.acousticEnvironmentId = 65535;

#else

    args.acousticEnvironmentId = 0;

#endif



    return args;

}
@@ -2819,13 +2815,11 @@ static void parseOption( 
            break;

        case CmdLnOptionId_acousticEnvironmentId:

            assert( numOptionValues == 1 );

#ifdef FIX_708_AEID_COMMAND_LINE

            if ( !is_digits_only( optionValues[0] ) )

            {

                fprintf( stderr, "Invalid acousting environment ID specified: %s\n", optionValues[0] );

                exit( -1 );

            }

#endif

            args->acousticEnvironmentId = (int16_t) strtol( optionValues[0], NULL, 10 );

            break;

        case CmdLnOptionId_syncMdDelay: