Commit 3e05bec5 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into 1019-socket-interface-for-pose-and-audio

parents 97dad48e fdcce24c

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


# Compiler output Unix

IVAS_cod

IVAS_cod_fmtsw

IVAS_dec

IVAS_rend

ISAR_post_rend
@@ -16,6 +17,7 @@ build*/**/* 


# Compiler output VS2017

IVAS_cod.exe

IVAS_cod_fmtsw.exe

IVAS_dec.exe

IVAS_rend.exe

ISAR_post_rend.exe

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ file(GLOB libDecSrcs "lib_dec/*.c") 
file(GLOB libDecHeaders "lib_dec/*.h")

add_library(lib_dec ${libDecSrcs} ${libDecHeaders})

target_link_libraries(lib_dec lib_com lib_rend lib_debug lib_isar)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar lib_util)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar)



file(GLOB libUtilSrcs "lib_util/*.c")

file(GLOB libUtilHeaders "lib_util/*.h")
@@ -175,7 +175,7 @@ target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar) 


if(NOT WMOPS)

  add_executable(ivas_lc3plus_unit_test scripts/split_rendering/lc3plus_float/ivas_lc3plus_unit_test.c)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug lib_isar)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_com lib_debug lib_isar)

endif()



file(GLOB libISARSrcs "lib_isar/*.c")

Workspace_msvc/lib_dec.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_isar;..\lib_rend;..\lib_lc3plus;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_isar;..\lib_rend;..\lib_lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -109,7 +109,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_isar;..\lib_rend;..\lib_lc3plus;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_isar;..\lib_rend;..\lib_lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

apps/encoder.c

+4 −4
Original line number Diff line number Diff line
@@ -834,10 +834,10 @@ int main( 
            /* scene orientation */

            if ( sceneOrientationFileReader )

            {

                PIDATA_TS *piDataTs = &ivasRtp.piData[ivasRtp.nWrittenPiData++];

                IVAS_PIDATA_TS *piDataTs = &ivasRtp.piData[ivasRtp.nWrittenPiData++];

                IVAS_PIDATA_ORIENTATION *scene = &piDataTs->data.scene;



                memset( piDataTs, 0, sizeof( PIDATA_TS ) );

                memset( piDataTs, 0, sizeof( IVAS_PIDATA_TS ) );

                scene->size = sizeof( IVAS_PIDATA_ORIENTATION );

                scene->piDataType = IVAS_PI_SCENE_ORIENTATION;
@@ -851,10 +851,10 @@ int main( 
            /* device orientation */

            if ( deviceOrientationFileReader )

            {

                PIDATA_TS *piDataTs = &ivasRtp.piData[ivasRtp.nWrittenPiData++];

                IVAS_PIDATA_TS *piDataTs = &ivasRtp.piData[ivasRtp.nWrittenPiData++];

                IVAS_PIDATA_ORIENTATION *device = &piDataTs->data.deviceUnCompensated;



                memset( piDataTs, 0, sizeof( PIDATA_TS ) );

                memset( piDataTs, 0, sizeof( IVAS_PIDATA_TS ) );

                device->size = sizeof( IVAS_PIDATA_ORIENTATION );

                device->piDataType = IVAS_PI_DEVICE_ORIENTATION_COMPENSATED;

apps/encoder_fmtsw.c

+4 −4
Original line number Diff line number Diff line
@@ -942,10 +942,10 @@ int encoder_main( 
            /* scene orientation */

            if ( sceneOrientationFileReader )

            {

                PIDATA_TS *piDataTs = &ivasRtp->piData[ivasRtp->nWrittenPiData++];

                IVAS_PIDATA_TS *piDataTs = &ivasRtp->piData[ivasRtp->nWrittenPiData++];

                IVAS_PIDATA_ORIENTATION *scene = &piDataTs->data.scene;



                memset( piDataTs, 0, sizeof( PIDATA_TS ) );

                memset( piDataTs, 0, sizeof( IVAS_PIDATA_TS ) );

                scene->size = sizeof( IVAS_PIDATA_ORIENTATION );

                scene->piDataType = IVAS_PI_SCENE_ORIENTATION;
@@ -959,10 +959,10 @@ int encoder_main( 
            /* device orientation */

            if ( deviceOrientationFileReader )

            {

                PIDATA_TS *piDataTs = &ivasRtp->piData[ivasRtp->nWrittenPiData++];

                IVAS_PIDATA_TS *piDataTs = &ivasRtp->piData[ivasRtp->nWrittenPiData++];

                IVAS_PIDATA_ORIENTATION *device = &piDataTs->data.deviceUnCompensated;



                memset( piDataTs, 0, sizeof( PIDATA_TS ) );

                memset( piDataTs, 0, sizeof( IVAS_PIDATA_TS ) );

                device->size = sizeof( IVAS_PIDATA_ORIENTATION );

                device->piDataType = IVAS_PI_DEVICE_ORIENTATION_COMPENSATED;