Commit fed0cff0 authored by vaclav's avatar vaclav
Browse files

rename 'hHrtf' to 'hHrtfBinary'

parent f3650acf

apps/decoder.c

+8 −8
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ typedef struct 
    IVAS_AUDIO_CONFIG intern_audio_config;

    int16_t room_reverb_flag;



} IVAS_DEC_HRTF_WRAPPER;

} IVAS_DEC_HRTF_BINARY_WRAPPER;



#endif
@@ -188,17 +188,17 @@ typedef struct 
static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );

static void usage_dec( void );

#ifdef FIX_HRTF_LOAD

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

#else

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

#endif

#ifdef FIX_HRTF_LOAD_JBM

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );

#else

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );

#endif

#ifdef FIX_HRTF_LOAD

static ivas_error IVAS_DEC_LoadHrtfFromFile( IVAS_DEC_HRTF_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const int32_t output_Fs );

static ivas_error IVAS_DEC_LoadHrtfFromFile( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const int32_t output_Fs );

#endif



#ifdef DEBUGGING
@@ -236,7 +236,7 @@ int main( 
    int16_t *pcmBuf = NULL;

    IVAS_RENDER_FRAMESIZE asked_frame_size;

#ifdef FIX_HRTF_LOAD

    IVAS_DEC_HRTF_WRAPPER hHrtfBinary;

    IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;

#else

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
@@ -2179,7 +2179,7 @@ static ivas_error decodeG192( 
    DecArguments arg,

    BS_READER_HANDLE hBsReader,

#ifdef FIX_HRTF_LOAD

    IVAS_DEC_HRTF_WRAPPER *hHrtfBinary,

    IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary,

#endif

    RotFileReader *headRotReader,

    RotFileReader *externalOrientationFileReader,
@@ -3150,7 +3150,7 @@ static ivas_error decodeVoIP( 
    DecArguments arg,

    BS_READER_HANDLE hBsReader,

#ifdef FIX_HRTF_LOAD_JBM

    IVAS_DEC_HRTF_WRAPPER *hHrtf,

    IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf,

#endif

    RotFileReader *headRotReader,

    RotFileReader *externalOrientationFileReader,
@@ -3873,7 +3873,7 @@ static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( 
 *---------------------------------------------------------------------*/



static ivas_error IVAS_DEC_LoadHrtfFromFile(

    IVAS_DEC_HRTF_WRAPPER *hHrtfBinary,

    IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary,

    IVAS_DEC_HANDLE hIvasDec,

    const int32_t output_Fs )

{