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

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 2194_basop_port_float_MR2105_default_reverb_configuration
parents 7afa2547 157abb15

Workspace_msvc/lib_rend.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ 
      <Filter>rend_c</Filter>

    </ClCompile>

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

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

      <Filter>rend_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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

apps/renderer.c

+9 −0
Original line number Diff line number Diff line
@@ -1577,7 +1577,16 @@ int main( 
            audioWriter = NULL;

        }



#ifdef FIX_1437_LC3PLUS_EXTREND_HIRES

        if ( ( error = IVAS_REND_GetSplitRendBitstreamHeader( hIvasRend,

                                                              &bitsBuffer.config.codec,

                                                              &bitsBuffer.config.poseCorrection,

                                                              &bitsBuffer.config.codec_frame_size_ms,

                                                              &bitsBuffer.config.isar_frame_size_ms,

                                                              &bitsBuffer.config.lc3plus_highres ) ) != IVAS_ERR_OK )

#else

        if ( ( error = IVAS_REND_GetSplitRendBitstreamHeader( hIvasRend, &bitsBuffer.config.codec, &bitsBuffer.config.poseCorrection, &bitsBuffer.config.codec_frame_size_ms, &bitsBuffer.config.isar_frame_size_ms ) ) != IVAS_ERR_OK )

#endif

        {

            fprintf( stderr, "\nError in IVAS_REND_GetSplitRendBitstreamHeader(): %s!\n", ivas_error_to_string( error ) );

            goto cleanup;

lib_com/common_api_types.h

+3 −3
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ typedef struct _IVAS_EDITABLE_PARAMETERS 


typedef struct

{

    // float w, x, y, z;

    Word32 w_fx, x_fx, y_fx, z_fx;

    Word16 q_fact;
@@ -168,6 +167,7 @@ typedef struct 
    float x, y, z;

    Word32 x_fx, y_fx, z_fx;

    Word16 q_fact;



} IVAS_VECTOR3;



typedef enum
@@ -336,8 +336,8 @@ typedef enum 
    IVAS_RENDER_TYPE_OVERRIDE_FASTCONV



} IVAS_RENDER_TYPE_OVERRIDE;

#endif



#endif

typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG

{

    Word16 nBands;                                                                                                                       /* Number of frequency bands for which reverb properties are provided, integer, range [2..256]        */
@@ -352,8 +352,8 @@ typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG 
    Word32 lowComplexity;                    /* Low complexity ER flag  */

    IVAS_VECTOR3 dimensions;                 /* Room dimensions [m]     */

    float AbsCoeff[IVAS_ROOM_ABS_COEFF];     /* Absorption coeffs       */

    IVAS_VECTOR3 ListenerOrigin;             /* Listener origin         */

    Word32 AbsCoeff_fx[IVAS_ROOM_ABS_COEFF]; /* Absorption coeffs       */

    IVAS_VECTOR3 ListenerOrigin;             /* Listener origin         */



} IVAS_ROOM_ACOUSTICS_CONFIG_DATA;

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ 
#define FIX_1419_MONO_STEREO_UMX                        /* FhG: fix for issue 1419 : support upmix to all output formats for mono and stereo */

#define NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG       /* FhG: Fix MDCT-Stereo comfort noise for certain noise types */

#define NONBE_1344_REND_MASA_LOW_FS                     /* Nokia: Issue 1344: Fix sanitizer errors when using IVAS_rend to render MASA with lower sampling rates */

#define FIX_1437_LC3PLUS_EXTREND_HIRES                  /* FhG: fix external renderer split bitstream header writing causing a crash for LC3plus High-res mode */

#define NONBE_1412_AVOID_ROUNDING_AZ_ELEV               /* FhG:  Avoid rounding when passing azimuth and elevation to efap_determine_gains() */

#define FIX_1318_ROOM_SIZE_CMD_LINE                     /* Philips/Nokia/FhG: Default room sizes support */

lib_dec/lib_dec.h

+4 −2
Original line number Diff line number Diff line
@@ -209,12 +209,14 @@ ivas_error IVAS_DEC_GetCldfbSamples( 
    Word16 *nOutSamples                                     /* o  : number of samples per channel written to output buffer                  */

);



Word16 IVAS_DEC_is_split_rendering_enabled(

/*! r: decoder error code */

ivas_error IVAS_DEC_is_split_rendering_enabled(

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

    Word16 *isSplitRend                                     /* o  : flag to indicate if split rendering is enabled                          */

);



Word16 IVAS_DEC_is_split_rendering_coded_out(

/*! r: decoder error code */

ivas_error IVAS_DEC_is_split_rendering_coded_out(

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

    Word16 *isSplitCoded                                    /* o  : flag to indicate if split rendering is enabled                          */

);