Commit 0698da33 authored by bayers's avatar bayers
Browse files

fix #825: make sure AGC and PCA are run only once for JBM SBA MONO and STEREO output

parent 3e68439f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ 
#define NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ                 /* VA: issue 797:  fix of crash when the separated object is inactive and the MASA metadata is using very few bits */

#define NONBE_FIX_798_OSBA_MC_DEC_CRASH

#define NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX             /* Nokia: issue 806: fix one separated object mode transport mix of the separated object */

#define NONBE_FIX_825_SBA_JBM_MONO_STEREO_OUTPUT              /* FhG: issue #825: Resolve "JBM SBA: AGC and PCA run twice for MONO and STEREO output"   */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_jbm_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -309,7 +309,11 @@ ivas_error ivas_jbm_dec_tc( 
                num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( st_ivas->sba_analysis_order, ivas_total_brate, st_ivas->last_active_ivas_total_brate );

                ivas_sba_mix_matrix_determiner( st_ivas->hSpar, p_output, st_ivas->bfi, nchan_remapped, output_frame, num_md_sub_frames );

            }

#ifdef NONBE_FIX_825_SBA_JBM_MONO_STEREO_OUTPUT

            else if ( st_ivas->renderer_type != RENDERER_DISABLE )

#else

            else

#endif

            {

                ivas_spar_dec_agc_pca( st_ivas, p_output, output_frame );

            }