Commit b890d8af authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into 799-add-ci-test-build-coded-split-rendering

parents b043acbf aaaa9234

Workspace_msvc/lib_rend.vcxproj

+2 −4
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 
    <ClCompile Include="..\lib_rend\ivas_lcld_rom_tables.c" />

    <ClCompile Include="..\lib_rend\ivas_sba_rendering.c" />

    <ClCompile Include="..\lib_rend\ivas_allrad_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_cldfb_codec_bitstream.c" />

    <ClCompile Include="..\lib_rend\ivas_MSPred.c" />

    <ClCompile Include="..\lib_rend\ivas_NoiseGen.c" />

    <ClCompile Include="..\lib_rend\ivas_PerceptualModel.c" />
@@ -195,7 +194,6 @@ 
    <ClCompile Include="..\lib_rend\lib_rend.c" />

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_rend\ivas_cldfb_codec_bitstream.h" />

    <ClInclude Include="..\lib_rend\ivas_lcld_prot.h" />

    <ClInclude Include="..\lib_rend\ivas_lcld_rom_tables.h" />

    <ClInclude Include="..\lib_rend\ivas_prot_rend.h" />

Workspace_msvc/lib_rend.vcxproj.filters

+0 −6
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ 
    <ClCompile Include="..\lib_rend\ivas_allrad_dec.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_cldfb_codec_bitstream.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_crend.c">

      <Filter>rend_c</Filter>

    </ClCompile>
@@ -206,9 +203,6 @@ 
    <ClInclude Include="..\lib_rend\ivas_lcld_rom_tables.h">

      <Filter>rend_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_rend\ivas_cldfb_codec_bitstream.h">

      <Filter>rend_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="rend_h">

apps/decoder.c

+0 −9
Original line number Diff line number Diff line
@@ -196,11 +196,7 @@ int main( 
    RotFileReader *refRotReader = NULL;

    Vector3PairFileReader *referenceVectorReader = NULL;

    RenderConfigReader *renderConfigReader = NULL;

#ifdef FIX_847_OUTPUT_PCM_BUFFER

    int16_t *pcmBuf = NULL;

#else

    int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE];

#endif

#ifdef DEBUGGING

    int32_t noClipping;

    int32_t cnt_frames_limited;
@@ -743,7 +739,6 @@ int main( 
        }

    }



#ifdef FIX_847_OUTPUT_PCM_BUFFER

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

     * Allocate output data buffer

     *------------------------------------------------------------------------------------------*/
@@ -757,8 +752,6 @@ int main( 


    pcmBuf = malloc( pcmBufSize * sizeof( int16_t ) );



#endif



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

     * Decoding

     *-----------------------------------------------------------------*/
@@ -812,9 +805,7 @@ int main( 


cleanup:



#ifdef FIX_847_OUTPUT_PCM_BUFFER

    free( pcmBuf );

#endif



#ifdef DEBUG_SBA_AUDIO_DUMP

    IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );

apps/renderer.c

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
#define RENDERER_MAX_METADATA_LINE_LENGTH 1024



#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_BITS_BUFF_SIZE ( ( ( ( (int32_t) SPLIT_REND_MAX_BRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 ) + SPLIT_REND_ADDITIONAL_BYTES_TO_READ )

#define SPLIT_REND_BITS_BUFF_SIZE ( ( ( ( (int32_t) IVAS_MAX_SPLIT_REND_BITRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 ) + IVAS_SPLIT_REND_ADDITIONAL_BYTES_TO_READ )

#endif



#define IVAS_MAX16B_FLT 32767.0f
@@ -3292,6 +3292,7 @@ static void parseObjectPosition( 
    int16_t read_values;

    float meta_prm[8] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f };





    readNextMetadataChunk( line, "," );

    *positionDuration = (uint16_t) strtol( line, &endptr, 10 );

    readNextMetadataChunk( line, "\n" );

lib_com/common_api_types.h

+3 −2
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ typedef struct _IVAS_JBM_TRACE_DATA 


#define IVAS_MAX_SPLIT_REND_BITRATE                   768000

#define IVAS_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (int32_t) IVAS_MAX_SPLIT_REND_BITRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )

#define IVAS_SPLIT_REND_ADDITIONAL_BYTES_TO_READ      1



typedef enum

{
@@ -235,7 +236,7 @@ typedef enum 


} IVAS_SPLIT_REND_RENDERER_SELECTION;



typedef struct ivas_split_rend_bits_t

typedef struct _IVAS_SPLIT_REND_BITS_DATA

{

    uint8_t *bits_buf;

    int32_t buf_len; /*size of bits_buf in bytes. This field should be set by allocator of bits_buf*/
@@ -245,7 +246,7 @@ typedef struct ivas_split_rend_bits_t 
    IVAS_SPLIT_REND_CODEC codec;

    IVAS_SPLIT_REND_POSE_CORRECTION_MODE pose_correction;



} ivas_split_rend_bits_t, IVAS_SPLIT_REND_BITS_DATA, *IVAS_SPLIT_REND_BITS_HANDLE;

} IVAS_SPLIT_REND_BITS_DATA, *IVAS_SPLIT_REND_BITS_HANDLE;



typedef struct _IVAS_SPLIT_REND_CONFIG

{