Commit ab56b049 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

remove call to the conversion functioins from the codec itself

parent 52dfffed

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -164,8 +164,6 @@ 
#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */

#define FIX_1111_TDM_LSP_BUFFER                         /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */



#define AMBISONICS_CONVENTIONS



/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

lib_dec/ivas_sba_dec.c

+0 −12
Original line number Diff line number Diff line
@@ -812,18 +812,6 @@ ivas_error ivas_sba_dec_render( 
        }

    }



#ifdef AMBISONICS_CONVENTIONS

    if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_FOA ||

         st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_HOA2 ||

         st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_HOA3 )

    {

        if ( st_ivas->hDecoderConfig->sba_output_fmt != 0 )

        {

            convert_ambi_format( output_f, output_f, st_ivas->sba_analysis_order, AMBI_FMT_ACN_SN3D, st_ivas->hDecoderConfig->sba_output_fmt );

        }

    }

#endif



    if ( st_ivas->hDirAC != NULL && hSpar->slots_rendered == hSpar->num_slots )

    {

        if ( st_ivas->hDirAC->hConfig->dec_param_estim == 1 )

lib_dec/ivas_stat_dec.h

+0 −3
Original line number Diff line number Diff line
@@ -988,9 +988,6 @@ typedef struct decoder_config_structure 
    int16_t Opt_Headrotation;                    /* indicates whether head-rotation is used */

    int16_t Opt_RendConfigCustom;                /* indicates whether Renderer configuration custom setup is used */

    IVAS_HEAD_ORIENT_TRK_T orientation_tracking; /* indicates orientation tracking type */

#ifdef AMBISONICS_CONVENTIONS

    AMBI_FMT sba_output_fmt;

#endif

    int16_t Opt_non_diegetic_pan;    /* indicates diegetic or not */

    float non_diegetic_pan_gain;     /* non diegetic panning gain*/

    int16_t Opt_AMR_WB;              /* flag indicating AMR-WB IO mode */

lib_dec/lib_dec.c

+0 −7
Original line number Diff line number Diff line
@@ -418,10 +418,6 @@ ivas_error IVAS_DEC_Configure( 
    const int16_t Opt_dpid_on,                         /* i  : enable directivity pattern option                */

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

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

#ifdef AMBISONICS_CONVENTIONS

    ,

    const AMBI_FMT sba_output_fmt

#endif

)

{

    Decoder_Struct *st_ivas;
@@ -462,9 +458,6 @@ ivas_error IVAS_DEC_Configure( 
        st_ivas->element_mode_init = EVS_MONO;

        hDecoderConfig->nchan_out = 1;

    }

#ifdef AMBISONICS_CONVENTIONS

    hDecoderConfig->sba_output_fmt = sba_output_fmt;

#endif



    if ( outputConfig != IVAS_AUDIO_CONFIG_EXTERNAL && outputConfig != IVAS_AUDIO_CONFIG_LS_CUSTOM )

    {

lib_dec/lib_dec.h

+0 −7
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ 
#define LIB_DEC_H



#include "common_api_types.h"

#ifdef AMBISONICS_CONVENTIONS

#include "ambi_convert.h"

#endif

#include <stdbool.h>



/*---------------------------------------------------------------------*
@@ -138,10 +135,6 @@ ivas_error IVAS_DEC_Configure( 
    const int16_t Opt_dpid_on,                  /* i  : enable directivity pattern option                                       */

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

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

#ifdef AMBISONICS_CONVENTIONS

	,

	const AMBI_FMT sba_output_fmt

#endif

);



void IVAS_DEC_Close(