Commit a9747232 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'remotes/origin/649-renderer-application-dependency-on-prot-h' into framework_maintenance
parents 4cdda801 b61f64ce

Workspace_msvc/lib_debug.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
    </CustomBuildStep>

    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_util;..\lib_com;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

      <MinimalRebuild>false</MinimalRebuild>

      <ExceptionHandling />
@@ -124,7 +124,7 @@ 
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

      <IntrinsicFunctions>false</IntrinsicFunctions>

      <WholeProgramOptimization>false</WholeProgramOptimization>

      <AdditionalIncludeDirectories>..\lib_util;..\lib_com;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

Workspace_msvc/lib_rend.vcxproj

+7 −0
Original line number Diff line number Diff line
@@ -256,9 +256,16 @@ 
    <ClCompile Include="..\lib_rend\lib_rend.c" />

  </ItemGroup>

  <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

Workspace_msvc/renderer.vcxproj

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

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;..\lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

      <ExceptionHandling />

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

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;..\lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

apps/decoder.c

+14 −24
Original line number Diff line number Diff line
@@ -30,35 +30,31 @@ 


*******************************************************************************************************/



#include <stdio.h>

#include "lib_dec.h"

#include <string.h>

#include <stdlib.h>

#include <assert.h>

#include "options.h"

#include "lib_dec.h"

#include "cmdl_tools.h"

#include "audio_file_writer.h"

#include "bitstream_reader.h"

#include "masa_file_writer.h"

#include "evs_rtp_payload.h"

#include "ism_file_writer.h"

#include "ls_custom_file_reader.h"

#include "jbm_file_writer.h"

#include "hrtf_file_reader.h"

#include "ls_custom_file_reader.h"

#include "masa_file_writer.h"

#include "render_config_reader.h"

#include "rotation_file_reader.h"

#include "vector3_pair_file_reader.h"

#include "jbm_file_writer.h"

#include "evs_rtp_payload.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "split_render_file_read_write.h"

#endif

#ifdef VARIABLE_SPEED_DECODING

#include "tsm_scale_file_reader.h"

#endif

#include "vector3_pair_file_reader.h"

#ifdef DEBUGGING

#include "debug.h"

#endif

#include "wmc_auto.h"

#include "render_config_reader.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "split_render_file_read_write.h"

#endif

#include "hrtf_file_reader.h"





#define WMC_TOOL_SKIP
@@ -74,22 +70,16 @@ static 


#define MIN_NUM_BITS_ACTIVE_FRAME 56

#define NUM_BITS_SID_IVAS_5K2     104

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define NUM_FRAMES_PER_SEC 50

#define MAX_FRAME_SIZE     ( 48000 / NUM_FRAMES_PER_SEC )

#else

#define MAX_FRAME_SIZE ( 48000 / 50 )

#endif

#define MAX_NUM_OUTPUT_CHANNELS 16

#ifdef SBA_AND_OBJECTS

#define MAX_OUTPUT_PCM_BUFFER_SIZE ( ( MAX_NUM_OUTPUT_CHANNELS + IVAS_MAX_NUM_OBJECTS ) * MAX_FRAME_SIZE )

#define MAX_OUTPUT_PCM_BUFFER_SIZE ( ( IVAS_MAX_OUTPUT_CHANNELS + IVAS_MAX_NUM_OBJECTS ) * IVAS_MAX_FRAME_SIZE )

#else

#define MAX_OUTPUT_PCM_BUFFER_SIZE ( MAX_NUM_OUTPUT_CHANNELS * MAX_FRAME_SIZE )

#define MAX_OUTPUT_PCM_BUFFER_SIZE ( IVAS_MAX_OUTPUT_CHANNELS * IVAS_MAX_FRAME_SIZE )

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define MAX_SPLIT_REND_BITRATE                   ( 768000 ) /* TODO tmu: unify with SPLIT_REND_MAX_BRATE ? */

#define MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (int32_t) MAX_SPLIT_REND_BITRATE / NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )

#define MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (int32_t) MAX_SPLIT_REND_BITRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )

#endif



#define IVAS_PUBLIC_ORIENT_TRK_NONE        ( 0 )

#define IVAS_PUBLIC_ORIENT_TRK_REF         ( 1 )

#define IVAS_PUBLIC_ORIENT_TRK_AVG         ( 2 )

apps/encoder.c

+3 −4
Original line number Diff line number Diff line
@@ -30,21 +30,20 @@ 


*******************************************************************************************************/



#include <stdio.h>

#include <string.h>

#include <stdlib.h>

#include "lib_enc.h"

#include <string.h>

#include "cmdl_tools.h"

#include "audio_file_reader.h"

#include "bitstream_writer.h"

#include "ism_file_reader.h"

#include "jbm_file_reader.h"

#include "masa_file_reader.h"

#include "ism_file_reader.h"

#ifdef DEBUGGING

#include "debug.h"

#endif

#include "wmc_auto.h"





#define WMC_TOOL_SKIP



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