Commit 34dde513 authored by multrus's avatar multrus
Browse files

clean up SBA_AND_OBJECTS conditions

parent e26e5fb4

lib_dec/ivas_dec.c

+0 −10
Original line number Diff line number Diff line
@@ -736,7 +736,6 @@ ivas_error ivas_dec( 
            }

        }



#ifdef SBA_AND_OBJECTS

        if ( st_ivas->sba_dirac_stereo_flag )

        {

            ivas_agc_dec_process( st_ivas->hSpar->hAgcDec, &output[sba_ch_idx], &output[sba_ch_idx], st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport, output_frame );
@@ -756,7 +755,6 @@ ivas_error ivas_dec( 


            ivas_sba_dirac_stereo_dec( st_ivas, &output[sba_ch_idx], output_frame, 0 );

        }

#endif



        /* HP filtering */

        for ( n = 0; n < getNumChanSynthesis( st_ivas ); n++ )
@@ -838,7 +836,6 @@ ivas_error ivas_dec( 
                ivas_sba_upmixer_renderer( st_ivas, &output[sba_ch_idx], output_frame );

            }

        }

#ifdef SBA_AND_OBJECTS

        else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC && ( st_ivas->renderer_type == RENDERER_OSBA_STEREO || st_ivas->renderer_type == RENDERER_MONO_DOWNMIX ) )

        {

            if ( st_ivas->renderer_type == RENDERER_MONO_DOWNMIX )
@@ -861,8 +858,6 @@ ivas_error ivas_dec( 
                v_add( output[n], output[n + max( nchan_out, nchan_ism )], output[n], output_frame );

            }

        }

#endif

#ifdef SBA_AND_OBJECTS

        else if ( st_ivas->renderer_type == RENDERER_OSBA_AMBI || st_ivas->renderer_type == RENDERER_OSBA_LS )

        {

            float tmp_ism_out[MAX_OUTPUT_CHANNELS][L_FRAME48k];
@@ -896,16 +891,12 @@ ivas_error ivas_dec( 
                v_multc( output[n], 0.5f, output[n], output_frame );

            }

        }

#endif

#ifdef SBA_AND_OBJECTS

        else if ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_EXTERNAL && !st_ivas->sba_dirac_stereo_flag && nchan_out != 1 )

        {

            ivas_sba_upmixer_renderer( st_ivas, output, output_frame ); /* Note: ivas_sba_linear_renderer() or ivas_dirac_dec() are called internally */

        }

#endif

        else if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) /*EXT output = individual objects + HOA3*/

        {

#ifdef SBA_AND_OBJECTS

            if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

            {

                for ( n = 0; n < nchan_ism; n++ )
@@ -926,7 +917,6 @@ ivas_error ivas_dec( 
                    set_zero( output[n], output_frame );

                }

            }

#endif

        }

    }

#endif

lib_dec/ivas_dirac_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -878,8 +878,6 @@ ivas_error ivas_dirac_dec_config( 
        case RENDERER_SBA_LINEAR_DEC:

#ifdef SBA_AND_OBJECTS

        case RENDERER_OSBA_AMBI:

#endif

#ifdef SBA_AND_OBJECTS

        case RENDERER_OSBA_LS:

#endif

            need_dirac_rend = 1;

lib_dec/ivas_init_dec.c

+0 −10
Original line number Diff line number Diff line
@@ -2070,11 +2070,7 @@ ivas_error ivas_init_decoder( 
           st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ||

#ifdef SBA_AND_OBJECTS

           st_ivas->renderer_type == RENDERER_OSBA_STEREO ||

#endif

#ifdef SBA_AND_OBJECTS

           st_ivas->renderer_type == RENDERER_OSBA_AMBI ||

#endif

#ifdef SBA_AND_OBJECTS

           st_ivas->renderer_type == RENDERER_OSBA_LS ||

#endif

           st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ||
@@ -2911,14 +2907,8 @@ void ivas_init_dec_get_num_cldfb_instances( 
        case RENDERER_BINAURAL_FASTCONV_ROOM:

#ifdef SBA_AND_OBJECTS

        case RENDERER_OSBA_STEREO:

#endif

#ifdef SBA_AND_OBJECTS

        case RENDERER_OSBA_AMBI:

#endif

#ifdef SBA_AND_OBJECTS

        case RENDERER_OSBA_LS:

#endif

#ifdef SBA_AND_OBJECTS

            if ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT )

#else

            if ( st_ivas->ivas_format == SBA_FORMAT )

lib_enc/ivas_osba_enc.c

100755 → 100644
+3 −3

File changed.File mode changed from 100755 to 100644.

Contains only whitespace changes.