Commit 0c4c5c56 authored by bayers's avatar bayers
Browse files

Merge branch '825-jbm-sba-agc-and-pca-run-twice-for-mono-and-stereo-output' into 'main' 

[Non-BE] Resolve "JBM SBA: AGC and PCA run twice for MONO and STEREO output"

See merge request !1111
parents f99275d4 bb81f61f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ 
#define OSBA_ROOM_IR

#endif

#define NONBE_FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */

#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
@@ -296,7 +296,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 );

            }