Commit 065d7624 authored by PLAINSI's avatar PLAINSI
Browse files

Merge branch '652-mc-paramupmix-binaural-updates' into 'main' 

[non-BE] [Split Non BE] Resolve "MC ParamUpmix Binaural Updates"

See merge request !891
parents 29cd5ad3 7c76acf1

lib_com/options.h

100644 → 100755
+2 −0
Original line number Diff line number Diff line
@@ -229,6 +229,8 @@ 
#define FIX_653_BUG_IN_SKIP_MATRIX                      /* Dlb: fix for issue #653, bug in the ivas_spar_get_skip_mat function*/

#define FIX_663_PARAM_ISM_EXT                           /* FhG: Issue 663: ParamISM EXT output improvement */

#define FIX_673_OMASA_OBJ_MD_SYNC                       /* Nokia: Fix issue 673 by updating metadata in the third subframe to account for audio delay. */

#define PARAMUPMIX_BINAURAL_UPDATES                     /* Dlb : issue 652, MC ParamUpmix Binaural Updates */ 







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

lib_dec/ivas_init_dec.c

+11 −0
Original line number Diff line number Diff line
@@ -2609,8 +2609,19 @@ void ivas_init_dec_get_num_cldfb_instances( 
    }



    if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO )

    {

#ifdef PARAMUPMIX_BINAURAL_UPDATES

        if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

        {

            *numCldfbAnalyses = max( MC_PARAMUPMIX_MAX_INPUT_CHANS, *numCldfbAnalyses );

        }

        else

        {

            *numCldfbAnalyses = max( MC_PARAMUPMIX_MIN_CLDFB, *numCldfbAnalyses );

        }

#else

        *numCldfbAnalyses = max( MC_PARAMUPMIX_MIN_CLDFB, *numCldfbAnalyses );

#endif

        *numCldfbSyntheses = max( MC_PARAMUPMIX_MIN_CLDFB, *numCldfbSyntheses );

    }

lib_dec/ivas_mc_paramupmix_dec.c

+402 −64

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_output_config.c

+4 −0
Original line number Diff line number Diff line
@@ -293,7 +293,11 @@ void ivas_renderer_select( 
#ifdef JBM_PARAMUPMIX

                        if ( ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) && ( *renderer_type == RENDERER_BINAURAL_FASTCONV ) )

                        {

#ifndef PARAMUPMIX_BINAURAL_UPDATES

                            *internal_config = AUDIO_CONFIG_5_1_2;

#else

                            *internal_config = AUDIO_CONFIG_7_1_4;

#endif

                        }

#endif

                    }