Commit aa7883ff authored by sagnowski's avatar sagnowski
Browse files

Further cleanup of lib_rend.h

parent f823842a

lib_com/ivas_prot.h

+2 −2
Original line number Diff line number Diff line
@@ -5416,7 +5416,7 @@ ivas_error ivas_crend_process( 
    float output[][L_FRAME48k]                                  /* i/o: input/output audio channels             */

);



#else

#else /* FIX_197_CREND_INTERFACE */



#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H

IVAS_REND_AudioConfigType getAudioConfigType(
@@ -5428,7 +5428,7 @@ ivas_error getAudioConfigNumChannels( 


IVAS_REND_AudioConfig getRendAudioConfigFromIvasAudioConfig(

    AUDIO_CONFIG config );

#endif

#endif /* FIX_197_CREND_INTERFACE_LIB_REND_H */



ivas_error ivas_rend_initCrend(

    CREND_WRAPPER *pCrend,

lib_rend/ivas_lib_rend_internal.h

+20 −13
Original line number Diff line number Diff line
@@ -30,33 +30,37 @@ 


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



#ifndef IVAS_LIB_REND_INTERNALS_H

#define IVAS_LIB_REND_INTERNALS_H



#include "options.h"

#include "ivas_error.h"



#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

#ifndef FIX_197_CREND_INTERFACE

#include "lib_rend.h"

#include "ivas_cnst.h"

#include <stdint.h>

#include "ivas_stat_dec.h"

#endif

#else



#else /* FIX_197_CREND_INTERFACE_LIB_REND_H */



#ifdef FIX_197_CREND_INTERFACE

#include "ivas_stat_rend.h"

#else

#else /* FIX_197_CREND_INTERFACE */

#include "lib_rend.h"

#endif

#include "ivas_stat_dec.h"

#endif /* FIX_197_CREND_INTERFACE */



#endif

#include "ivas_stat_dec.h"



#ifndef IVAS_LIB_REND_INTERNALS_H

#define IVAS_LIB_REND_INTERNALS_H

#endif /* FIX_197_CREND_INTERFACE_LIB_REND_H */



#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H

typedef struct

{

    int8_t headRotEnabled;

    IVAS_QUATERNION headPositions[RENDERER_HEAD_POSITIONS_PER_FRAME];

    float crossfade[L_FRAME48k / RENDERER_HEAD_POSITIONS_PER_FRAME];

} IVAS_REND_HeadRotData;

#endif



typedef struct

{

    int32_t binaural_latency_ns;
@@ -82,10 +86,13 @@ ivas_error getAudioConfigNumChannels( 
    const IVAS_REND_AudioConfig config,

    int16_t *numChannels );



#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

IVAS_REND_AudioConfig getRendAudioConfigFromIvasAudioConfig(

    AUDIO_CONFIG config );

#endif



AUDIO_CONFIG getIvasAudioConfigFromRendAudioConfig(

    IVAS_REND_AudioConfig config );

#endif



#ifndef FIX_197_CREND_INTERFACE

lib_rend/ivas_stat_rend.h

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ 
#define IVAS_STAT_REND_H



#include <stdint.h>

#include "options.h"

#include "ivas_cnst.h"



#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H



#define MAX_SPEAKERS 12 /* Max number of speakers (including LFE) in a channel-based config */

lib_rend/lib_rend.c

+0 −3
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ 
#include "ivas_rom_dec.h"

#include "ivas_rom_rend.h"

#include "ivas_lib_rend_internal.h"

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

#include "ivas_stat_dec.h"

#endif

#include "prot.h"

#include "wmc_auto.h"

lib_rend/lib_rend.h

+4 −14
Original line number Diff line number Diff line
@@ -40,13 +40,10 @@ 
#include "options.h"

#include "common_api_types.h"

#include "ivas_error.h"

#ifdef FIX_197_CREND_INTERFACE

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

#include "ivas_cnst.h"

#else



#if defined FIX_197_CREND_INTERFACE && !defined FIX_197_CREND_INTERFACE_LIB_REND_H

#include "ivas_stat_rend.h"

#endif

#endif



#define RENDERER_MAX_ISM_INPUTS  4

#define RENDERER_MAX_MC_INPUTS   1
@@ -57,15 +54,6 @@ 


#define RENDERER_HEAD_POSITIONS_PER_FRAME 4



#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

typedef struct

{

    int8_t headRotEnabled;

    IVAS_QUATERNION headPositions[RENDERER_HEAD_POSITIONS_PER_FRAME];

    float crossfade[L_FRAME48k / RENDERER_HEAD_POSITIONS_PER_FRAME];

} IVAS_REND_HeadRotData;

#endif



typedef float IVAS_REND_LfePanMtx[IVAS_MAX_INPUT_LFE_CHANNELS][IVAS_MAX_OUTPUT_CHANNELS];



typedef struct
@@ -154,6 +142,7 @@ typedef uint16_t IVAS_REND_InputId; 


#endif



#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H

#ifdef FIX_197_CREND_INTERFACE

AUDIO_CONFIG getIvasAudioConfigFromRendAudioConfig(

    IVAS_REND_AudioConfig config );
@@ -170,6 +159,7 @@ ivas_error getAudioConfigNumChannels( 
    const IVAS_REND_AudioConfig config,

    int16_t *numChannels );

#endif

#endif



/* clang-format off */

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