Commit 157abb15 authored by vaclav's avatar vaclav
Browse files

Merge branch '2197-lib_dec-differs-a-lot-between-ivas-main-and-ivas-float-update' into 'main' 

Allign lib_dec.c to ivas-main

Closes #2197

See merge request !2536
parents ea04d386 ea1129e2

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" />

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
@@ -326,8 +326,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]        */
@@ -342,8 +342,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_dec/lib_dec.h

+4 −2
Original line number Diff line number Diff line
@@ -206,12 +206,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                          */

);

lib_dec/lib_dec_fx.c

+126 −92

File changed.

Preview size limit exceeded, changes collapsed.