Commit 01b7db38 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

working notes

parent 3179a68c

lib_dec/ivas_dirac_dec.c

+8 −5
Original line number Diff line number Diff line
@@ -878,6 +878,7 @@ ivas_error ivas_dirac_dec_config( 
                if ( ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) ||

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

                {

                    /* populate pMultiBinPoseData with the additional poses determined from the DoF */

                    ivas_renderSplitGetMultiBinPoseData(

                        &st_ivas->hRenderConfig->split_rend_config,

                        &st_ivas->splitBinRend.splitrend.multiBinPoseData,
@@ -893,14 +894,16 @@ ivas_error ivas_dirac_dec_config( 
            if ( ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) ||

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

            {

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

                                                      ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 );

                /* TODO: can we keep isRenderingInTd fixed? */

                ivas_split_rend_choose_default_codec( &st_ivas->hRenderConfig->split_rend_config.codec,

                                                      0,  /* isRenderingInTd */

                                                      ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 );  /* pcm_out */



                error = ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend,

                                                  &st_ivas->hRenderConfig->split_rend_config,

                                                  st_ivas->hDecoderConfig->output_Fs,

                                                  1,

                                                  ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 );

                                                  1,  /* is_cldfb_in */

                                                  ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 );  /* is_pcm_out */



                if ( error != IVAS_ERR_OK )

                {
@@ -909,7 +912,7 @@ ivas_error ivas_dirac_dec_config( 
            }

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT_MASA

            if ( st_ivas->hDiracDecBin[0] == NULL )

            if ( st_ivas->hDiracDecBin[0] == NULL )  /* TODO: is it enough to check the first element or do we need to check all n_poses pointers? the init function runs over n_poses */

#else

            if ( st_ivas->hDiracDecBin == NULL )

#endif

lib_rend/ivas_dirac_dec_binaural_functions.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
#ifdef SPLIT_REND_WITH_HEAD_ROT_MASA

    int16_t pos_idx;



    for ( pos_idx = 0; pos_idx < st_ivas->splitBinRend.splitrend.multiBinPoseData.num_poses; pos_idx++ )

    for ( pos_idx = 0; pos_idx < st_ivas->splitBinRend.splitrend.multiBinPoseData.num_poses; pos_idx++ )  /* TODO: maybe add more robust detection of non-split case */

    {

        hDiracDecBin = st_ivas->hDiracDecBin[pos_idx];

#else