Commit 29121cca authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 775-osba-bitrate-switching-crashes-with-foa-and-hoa2-output-with-higher-order-input
parents 942b4949 b2b43a4c

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 −4
Original line number Diff line number Diff line
@@ -1576,7 +1576,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 +1677,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

apps/renderer.c

+1 −1
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