merge define FIX_COMBINED_FORMATS_ISM_GAINS into JBM_FOR_OSBA

#define OSBA_SPLIT_RENDERING

#endif

<<<<<<< HEAD

#define JBM_FOR_OSBA

#define FIX_COMBINED_FORMATS_ISM_GAINS

#define FIX_719_CRASH_IN_CLEANUP                        /* VA: issue 719: fix Decoder crash after call to goto to cleanup */

=======

#define FIX_708_DPID_COMMAND_LINE                       /* issue 708: sanity checks for '-dpid' command-line */

#define 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. */

>>>>>>> main

#define FIX_RAM_COUNTING_5MS_RENDERING                  /* FhG: fix for correct RAM reporting with 5ms rendering */

#define NONBE_FIX_760_COHERENCE_MASA                          /* Nokia: Issue 760: fixes decoder crash for some cases when all energy ratios are 1 */

#define NONBE_FIX_752_OSBA_MISCONFIG_MCT                      /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/

#define JBM_FOR_OSBA                                          /* FhG: implement OSBA format in the JBM path */

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

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

            ivas_jbm_dec_get_adapted_linear_interpolator( (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ), st_ivas->hTcBuffer->n_samples_available, st_ivas->hIsmRendererData->interpolator );

        }

        /* also get the gains here */

#ifdef FIX_COMBINED_FORMATS_ISM_GAINS

#ifdef JBM_FOR_OSBA

        num_objects = st_ivas->nchan_ism;

#else

        num_objects = st_ivas->nchan_transport;