Commit 058fb70b authored by vaclav's avatar vaclav
Browse files

accept NONBE_FIX_833_OSBA_JBM_OBJECT_GAINS

parent 9548fa70

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_833_OSBA_JBM_OBJECT_GAINS                   /* Fhg: issue #833: Resolve "JBM OSBA: the gains for the discrete objects are not computed" */

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

#ifdef JBM_FOR_OSBA

#define OSBA_ROOM_IR

lib_dec/ivas_ism_param_dec.c

+1 −8
Original line number Diff line number Diff line
@@ -997,11 +997,9 @@ 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 NONBE_FIX_833_OSBA_JBM_OBJECT_GAINS

         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;
@@ -1012,10 +1010,9 @@ 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 ||

#ifdef NONBE_FIX_833_OSBA_JBM_OBJECT_GAINS

                 st_ivas->renderer_type == RENDERER_OSBA_AMBI ||

#endif

                 st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

            {

                st_ivas->hIsmRendererData->interpolator[0] = 0.0f;
@@ -1054,9 +1051,7 @@ void ivas_ism_dec_digest_tc( 
                elevation = (int16_t) floorf( st_ivas->hIsmMetaData[i]->elevation + 0.5f );



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

#ifdef NONBE_FIX_833_OSBA_JBM_OBJECT_GAINS

                       st_ivas->renderer_type == RENDERER_OSBA_LS ||

#endif

                       st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) &&

                     st_ivas->hCombinedOrientationData == NULL )

                {
@@ -1072,9 +1067,7 @@ void ivas_ism_dec_digest_tc( 
                    }

                }

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

#ifdef NONBE_FIX_833_OSBA_JBM_OBJECT_GAINS

                          st_ivas->renderer_type == RENDERER_OSBA_AMBI ||

#endif

                          st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

                {

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