Commit 37b0b691 authored by vaclav's avatar vaclav
Browse files

remove lib_util include from the codec library

parent 0cd7d42d

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
@@ -941,10 +941,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;
@@ -958,10 +958,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;

lib_com/common_api_types.h

+464 −11

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/lib_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include "jbm_jb4sb.h"

#include "jbm_pcmdsp_apa.h"

#include "jbm_pcmdsp_fifo.h"

#include "ivas_rtp_pi_data.h"

#include <math.h>

#include <assert.h>

#ifdef DEBUGGING
@@ -5720,7 +5719,7 @@ static void setDiegeticInputPI( 


ivas_error IVAS_DEC_FeedPiDataToDecoder(

    IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle                       */

    hPiDataTs piData,         /* i  : PI data received in rtp packet            */

    IVAS_PIDATA_TS *piData,   /* i  : PI data received in rtp packet            */

    uint32_t numPiData        /* i  : number of PI data received in rtp packet  */

)

{