Commit be8c8d32 authored by vaclav's avatar vaclav
Browse files

accept OSBA_ROOM_IR

parent 058fb70b

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -160,9 +160,6 @@ 
/* all switches in this category should start with "NONBE_" */



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

#ifdef JBM_FOR_OSBA

#define OSBA_ROOM_IR

#endif

#define NONBE_FIX_808_JBM_PARAMUPMIX_RS                       /* FhG: Issue 808: fix JBM MC rate switching */

#define NONBE_FIX_846_JBM_MASA_SIDSTART                       /* FhG: Issue #846: fix JBM for MASA DTX when the first frame is a SID frame */

#define NONBE_FIX_841_MC_RS_TDOBJ_RENDERER                    /* FhG: Issue #841: [Non-BE] Resolve "MC RS HRFT handle not set to NULL" */

lib_dec/ivas_dirac_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -2380,7 +2380,6 @@ void ivas_dirac_dec_render_sf( 


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

    {

#ifdef OSBA_ROOM_IR

        /* render objects in combined format onto the CICP19 channels for BINAURAL_ROOM_IR */

        if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

        {
@@ -2463,7 +2462,6 @@ void ivas_dirac_dec_render_sf( 
                }

            }

        }

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

lib_dec/ivas_init_dec.c

+1 −4
Original line number Diff line number Diff line
@@ -1171,7 +1171,6 @@ ivas_error ivas_init_decoder( 


    ivas_output_init( &( st_ivas->hOutSetup ), output_config );



#ifdef OSBA_ROOM_IR

    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

    {

        st_ivas->hOutSetup.ambisonics_order = SBA_HOA3_ORDER;
@@ -1179,7 +1178,6 @@ ivas_error ivas_init_decoder( 
        st_ivas->hOutSetup.output_config = st_ivas->intern_config;

        st_ivas->hOutSetup.nchan_out_woLFE = audioCfg2channels( st_ivas->intern_config );

    }

#endif



    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

    {
@@ -2915,12 +2913,11 @@ void ivas_init_dec_get_num_cldfb_instances( 
                    {

                        *numCldfbSyntheses = MAX_OUTPUT_CHANNELS;

                    }

#ifdef OSBA_ROOM_IR



                    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

                    {

                        *numCldfbAnalyses = st_ivas->nchan_ism + st_ivas->hSpar->hFbMixer->fb_cfg->num_in_chans;

                    }

#endif

                }

            }

            else if ( st_ivas->mc_mode == MC_MODE_PARAMMC )

lib_dec/ivas_jbm_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1169,18 +1169,14 @@ ivas_error ivas_jbm_dec_render( 
                    return error;

                }



#ifdef OSBA_ROOM_IR

                if ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM )

#endif

                {

                    ivas_ism_render_sf( st_ivas, p_output_ism, *nSamplesRendered );

                }



                for ( n = 0; n < nchan_out; n++ )

                {

#ifdef OSBA_ROOM_IR

                    if ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM )

#endif

                    {

                        v_add( p_output[n], p_output_ism[n], p_output[n], *nSamplesRendered );

                    }

lib_dec/ivas_output_config.c

+0 −2
Original line number Diff line number Diff line
@@ -173,12 +173,10 @@ void ivas_renderer_select( 
                *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;

            }



#ifdef OSBA_ROOM_IR

            if ( st_ivas->ivas_format == SBA_ISM_FORMAT && *renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

            {

                *internal_config = IVAS_AUDIO_CONFIG_7_1_4;

            }

#endif



            if ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation )

            {