Commit 56989b93 authored by sagnowski's avatar sagnowski
Browse files

Choose default split codec as agreed: TD -> LC3plus, CLDFB -> LCLD

parent 24b8224c

lib_com/common_api_types.h

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ typedef enum 
{

    IVAS_SPLIT_REND_CODEC_LCLD,

    IVAS_SPLIT_REND_CODEC_LC3PLUS,

    IVAS_SPLIT_REND_CODEC_DEFAULT, /* Will use LCLD for CLDFB rendering paths and LC3plus for TD rendering paths */

    IVAS_SPLIT_REND_CODEC_NONE

} IVAS_SPLIT_REND_CODEC;

#endif

lib_dec/ivas_init_dec.c

+10 −0
Original line number Diff line number Diff line
@@ -1273,6 +1273,10 @@ ivas_error ivas_init_decoder( 
        if ( ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) ||

             ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

        {

#ifdef SPLIT_REND_LC3PLUS

        ivas_split_rend_choose_default_codec( &st_ivas->hRenderConfig->split_rend_config.codec, 0 );

#endif



#ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING

            error =

#endif
@@ -1329,6 +1333,8 @@ ivas_error ivas_init_decoder( 
        if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB )

#endif

        {

            ivas_split_rend_choose_default_codec( &st_ivas->hRenderConfig->split_rend_config.codec, 1 );



            ivas_renderSplitGetMultiBinPoseData(

                &st_ivas->hRenderConfig->split_rend_config,

                &st_ivas->splitBinRend.splitrend.multiBinPoseData,
@@ -1396,6 +1402,10 @@ ivas_error ivas_init_decoder( 


        if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB )

        {

#ifdef SPLIT_REND_LC3PLUS

            ivas_split_rend_choose_default_codec( &st_ivas->hRenderConfig->split_rend_config.codec, 1 );

#endif



            ivas_renderSplitGetMultiBinPoseData(

                &st_ivas->hRenderConfig->split_rend_config,

                &st_ivas->splitBinRend.splitrend.multiBinPoseData,

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1532,7 +1532,7 @@ ivas_error IVAS_DEC_GetRenderConfig( 
    hRCout->split_rend_config.codec_delay_ms = 0;

#endif

#ifdef SPLIT_REND_LC3PLUS

    hRCout->split_rend_config.codec = IVAS_SPLIT_REND_CODEC_LCLD;

    hRCout->split_rend_config.codec = IVAS_SPLIT_REND_CODEC_DEFAULT;

    hRCout->split_rend_config.poseCorrectionMode = IVAS_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB;

#endif

lib_rend/ivas_prot_rend.h

+8 −1
Original line number Diff line number Diff line
@@ -1166,7 +1166,7 @@ ivas_error ivas_renderMultiBinToSplitBinaural( 
	const IVAS_QUATERNION headPositions[MAX_PARAM_SPATIAL_SUBFRAMES],

    const int32_t SplitRendBitRate,

#ifdef SPLIT_REND_LC3PLUS

    const IVAS_SPLIT_REND_CODEC splitCodec,

    IVAS_SPLIT_REND_CODEC splitCodec,

#endif

    ivas_split_rend_bits_t *pBits,

    float Cldfb_In_BinReal[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
@@ -1376,6 +1376,13 @@ void masaPrerendClose( 
    MASA_PREREND_HANDLE *hMasaPrerendPtr                        /* i/o: prerenderer handle to be closed */

);



#ifdef SPLIT_REND_LC3PLUS

void ivas_split_rend_choose_default_codec(

    IVAS_SPLIT_REND_CODEC *pCodec,                              /* i/o: pointer to codec setting                */

    int16_t isRenderingInTd                                     /* i  : flag: is rendering done in TD?          */

);

#endif



/* clang-format on */



#endif /* IVAS_PROT_REND_H */

lib_rend/ivas_render_config.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ ivas_error ivas_render_config_init_from_rom( 
    ( *hRenderConfig )->split_rend_config.codec_delay_ms = 0;

#endif

#ifdef SPLIT_REND_LC3PLUS

    ( *hRenderConfig )->split_rend_config.codec = IVAS_SPLIT_REND_CODEC_LCLD;

    ( *hRenderConfig )->split_rend_config.codec = IVAS_SPLIT_REND_CODEC_DEFAULT;

    ( *hRenderConfig )->split_rend_config.poseCorrectionMode = IVAS_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB;

#endif