Commit f93f72b6 authored by bayers's avatar bayers
Browse files

temp fixes for issues #833, #829 (MRs already exist)

parent 6303c127

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ 
#define FIX_XXX_MASA_CNA

/*#define UNIFY_CHANNEL_MEM_HEAP*/

#define FIX_XXX_CREND_ER

#define FIX_XXX_JBM_FOR_OSBA

#endif

#define NONBE_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX               /* Dlb : issue 722: memory leak fix in MC param upmix mode with BR switching*/

#define NONBE_FIX_780_ISM_STARTS_WITH_SID                     /* VA: issue 780: fix Crash in ISM decoding when bitstream starts with an SID and output_config is not EXT */

lib_dec/ivas_ism_param_dec.c

+20 −3
Original line number Diff line number Diff line
@@ -2610,6 +2610,11 @@ void ivas_ism_dec_digest_tc( 
         st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ||

         st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ||

         st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ||

#ifdef FIX_XXX_JBM_FOR_OSBA

         st_ivas->renderer_type == RENDERER_OSBA_AMBI ||

         st_ivas->renderer_type == RENDERER_OSBA_LS ||

         st_ivas->renderer_type == RENDERER_OSBA_STEREO ||

#endif

         ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->hDecoderConfig->Opt_Headrotation == 0 ) )

    {

        int16_t i, num_objects;
@@ -2620,7 +2625,11 @@ void ivas_ism_dec_digest_tc( 
        if ( ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ) == st_ivas->hTcBuffer->n_samples_available )

        {

            int16_t interpolator_length = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC );

            if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

            if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ||

#ifdef FIX_XXX_JBM_FOR_OSBA

                 st_ivas->renderer_type == RENDERER_OSBA_AMBI ||

#endif

                 st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

            {

                st_ivas->hIsmRendererData->interpolator[0] = 0.0f;

                for ( i = 1; i < interpolator_length; i++ )
@@ -2657,7 +2666,11 @@ void ivas_ism_dec_digest_tc( 
                azimuth = (int16_t) floorf( st_ivas->hIsmMetaData[i]->azimuth + 0.5f );

                elevation = (int16_t) floorf( st_ivas->hIsmMetaData[i]->elevation + 0.5f );



                if ( ( st_ivas->renderer_type == RENDERER_TD_PANNING || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) &&

                if ( ( st_ivas->renderer_type == RENDERER_TD_PANNING ||

#ifdef FIX_XXX_JBM_FOR_OSBA

                       st_ivas->renderer_type == RENDERER_OSBA_LS ||

#endif

                       st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) &&

                     st_ivas->hCombinedOrientationData == NULL )

                {

                    if ( st_ivas->hIntSetup.is_planar_setup )
@@ -2671,7 +2684,11 @@ void ivas_ism_dec_digest_tc( 
                        efap_determine_gains( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains[i], azimuth, elevation, EFAP_MODE_EFAP );

                    }

                }

                else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

                else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ||

#ifdef FIX_XXX_JBM_FOR_OSBA

                          st_ivas->renderer_type == RENDERER_OSBA_AMBI ||

#endif

                          st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

                {

                    /*get HOA gets for direction (ACN/SN3D)*/

                    ivas_dirac_dec_get_response( azimuth, elevation, st_ivas->hIsmRendererData->gains[i], st_ivas->hIntSetup.ambisonics_order );

lib_dec/ivas_jbm_dec.c

+9 −0
Original line number Diff line number Diff line
@@ -617,6 +617,15 @@ ivas_error ivas_jbm_dec_tc( 
            /* Rendering */

            if ( ( st_ivas->renderer_type == RENDERER_MC ) && ( output_config == IVAS_AUDIO_CONFIG_MONO || output_config == IVAS_AUDIO_CONFIG_STEREO ) )

            {



#ifdef NONBE_FIX_787_PARAM_UPMIX_LEVEL

                /* Compensate loudness for not doing full upmix */

                for ( n = 4; n < 8; n++ )

                {

                    v_multc( p_output[n], 2.0f, p_output[n], output_frame  );

                }

#endif



                if ( output_config == IVAS_AUDIO_CONFIG_MONO || output_config == IVAS_AUDIO_CONFIG_STEREO )

                {

                    ivas_ls_setup_conversion( st_ivas, audioCfg2channels( IVAS_AUDIO_CONFIG_5_1_2 ), output_frame, p_output, p_output );