Commit d598a348 authored by vaclav's avatar vaclav
Browse files

port MR

parent 766ff2fc

lib_dec/lib_dec.c

+32 −33
Original line number Diff line number Diff line
@@ -408,40 +408,39 @@ static IVAS_DEC_BS_FORMAT mapIvasFormat( 
 *---------------------------------------------------------------------*/



ivas_error IVAS_DEC_Configure(

#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION

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

    const uint32_t sampleRate,                         /* i  : output sampling frequency                           */

    const AUDIO_CONFIG outputConfig,             /* i  : output configuration                       */

    const int16_t tsmEnabled,                    /* i  : enable time scale modification             */

    const IVAS_AUDIO_CONFIG outputConfig,              /* i  : output configuration                                */

    const bool tsmEnabled,                             /* i  : enable time scale modification                      */

    const IVAS_RENDER_FRAMESIZE renderFramesize,       /* i  : rendering frame size                                */

#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION

    const bool customLsOutputEnabled,                  /* i  : enable custom loudspeaker setup handle              */

    const bool hrtfReaderEnabled,                      /* i  : enable HRTF binary file input                       */

    const bool enableHeadRotation,                     /* i  : enable head rotation for binaural output            */

    const bool enableExternalOrientation,              /* i  : enable external orientations                        */

    const IVAS_HEAD_ORIENT_TRK_T orientation_tracking, /* i  : head orientation tracking type                      */

    const bool renderConfigEnabled,                    /* i  : enable Renderer config. file for binaural output    */

    const bool non_diegetic_pan_enabled,               /* i  : enabled diegetic panning                            */

    const float non_diegetic_pan_gain,                 /* i  : non diegetic panning gain                           */

    const bool dpidEnabled,                            /* i  : enable directivity pattern option                   */

    const uint16_t acousticEnvironmentId,              /* i  : Acoustic environment ID                             */

    const bool delayCompensationEnabled                /* i  : enable delay compensation                           */

#else

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

    const uint32_t sampleRate,                         /* i  : output sampling frequency                                               */

    const IVAS_AUDIO_CONFIG outputConfig,              /* i  : audio configuration                                                     */

    const int16_t tsmEnabled,                          /* i  : enable TSM                                                              */

    const IVAS_RENDER_FRAMESIZE renderFramesize,       /* i  : rendering frame size                       */

    const int16_t customLsOutputEnabled,               /* i  : enable custom loudspeaker setup handle                                  */

    const int16_t hrtfReaderEnabled,                   /* i  : enable HRTF binary file input                                           */

    const int16_t enableHeadRotation,                  /* i  : enable head rotation for binaural output                                */

    const int16_t enableExternalOrientation,           /* i  : enable external orientations                                            */

#endif

    const IVAS_HEAD_ORIENT_TRK_T orientation_tracking, /* i  : head orientation tracking type                                   */

#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION

    const bool renderConfigEnabled,      /* i  : enable Renderer config. file for binaural output */

    const bool non_diegetic_pan_enabled, /* i  : enabled diegetic panning                         */

#else

    const int16_t renderConfigEnabled,                 /* i  : enable Renderer config. file for binaural output                        */

    const int16_t Opt_non_diegetic_pan,                /* i  : diegetic or not                                                         */

#endif

    const float non_diegetic_pan_gain,                 /* i  : non diegetic panning gain                                               */

#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION

    const bool dpidEnabled, /* i  : enable directivity pattern option                */

#else

    const int16_t Opt_dpid_on,                         /* i  : enable directivity pattern option                                       */

#endif

    const uint16_t acousticEnvironmentId,              /* i  : Acoustic environment ID                                                 */

#ifdef FIX_745_FIX_DATA_TYPE_CONVERSION

    const bool delayCompensationEnabled /* i  : enable delay compensation                        */

#else

    const int16_t delayCompensationEnabled             /* i  : enable delay compensation                                               */

#endif

)

lib_dec/lib_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ ivas_error IVAS_DEC_Configure( 
    IVAS_DEC_HANDLE hIvasDec,                           /* i/o: IVAS decoder handle                                 */

    const uint32_t sampleRate,                          /* i  : output sampling frequency                           */

    const IVAS_AUDIO_CONFIG outputConfig,               /* i  : output configuration                                */

    const int16_t tsmEnabled,                           /* i  : enable time scale modification                      */

    const bool tsmEnabled,                              /* i  : enable time scale modification                      */

    const IVAS_RENDER_FRAMESIZE renderFramesize,        /* i  : rendering frame size                                */

    const bool customLsOutputEnabled,                   /* i  : enable custom loudspeaker setup handle              */

    const bool hrtfReaderEnabled,                       /* i  : enable HRTF binary file input                       */