Commit 5ad32b4b authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_732_PLANAR_SBA_OSBA

parent 7a5b79f8

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -5710,10 +5710,8 @@ void ivas_osba_enc( 
    const ISM_MODE ism_mode,                                    /* i  : ISM mode                                  */

    const int16_t sba_analysis_order,                           /* i  : SBA order evaluated in DirAC/SPAR encoder */

    const int32_t input_Fs                                      /* i  : input sampling rate                       */

#ifdef FIX_732_PLANAR_SBA_OSBA

    ,

    const int16_t sba_planar                                    /* i  : planar SBA flag                         */

#endif

);



#ifdef FIX_782_OSBA_FUNCTION_NAMES

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ 
#endif





#define FIX_732_PLANAR_SBA_OSBA                         /* Dlb : issue 732: fix for crash in planar mode in OSBA format*/

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

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

lib_enc/ivas_enc.c

+0 −10
Original line number Diff line number Diff line
@@ -388,27 +388,19 @@ ivas_error ivas_enc( 
    }

    else if ( ivas_format == SBA_ISM_FORMAT )

    {

#ifdef FIX_732_PLANAR_SBA_OSBA

        int16_t planar_sba_orig;

        planar_sba_orig = hEncoderConfig->sba_planar;

#endif

#ifndef NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING

        ivas_osba_enc_reconfig( st_ivas );

#endif



        /* Analyze objects and determine needed audio signals */

#ifdef FIX_732_PLANAR_SBA_OSBA

        ivas_osba_enc( st_ivas->hOSba, st_ivas->hIsmMetaData, data_f, input_frame, hEncoderConfig->nchan_ism, st_ivas->ism_mode, st_ivas->sba_analysis_order, hEncoderConfig->input_Fs, hEncoderConfig->sba_planar );

#else

        ivas_osba_enc( st_ivas->hOSba, st_ivas->hIsmMetaData, data_f, input_frame, hEncoderConfig->nchan_ism, st_ivas->ism_mode, st_ivas->sba_analysis_order, hEncoderConfig->input_Fs );

#endif



        if ( st_ivas->ism_mode == ISM_MODE_NONE )

        {

#ifdef FIX_732_PLANAR_SBA_OSBA

            /*once SBA and ISM are combined into SBA signal then disable planar flag*/

            hEncoderConfig->sba_planar = 0;

#endif

            if ( st_ivas->nchan_transport == 1 )

            {

#ifndef FIX_759_CODE_COVERAGE_OSBA
@@ -472,9 +464,7 @@ ivas_error ivas_enc( 
                }

            }

#endif

#ifdef FIX_732_PLANAR_SBA_OSBA

            hEncoderConfig->sba_planar = planar_sba_orig;

#endif

        }

        else

        {

lib_enc/ivas_osba_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -392,10 +392,8 @@ void ivas_osba_enc( 
    const ISM_MODE ism_mode,          /* i  : ISM mode                                    */

    const int16_t sba_analysis_order, /* i  : SBA order evaluated in DirAC/SPAR encoder   */

    const int32_t input_Fs            /* i  : input sampling rate                         */

#ifdef FIX_732_PLANAR_SBA_OSBA

    ,

    const int16_t sba_planar /* i  : planar SBA flag                             */

#endif

)

{

    float data_out_f[MAX_INPUT_CHANNELS][L_FRAME48k];
@@ -413,12 +411,10 @@ void ivas_osba_enc( 
        /* Convert ISM to SBA */

        ivas_osba_render_ism_to_sba( data_in_f, data_out_f, input_frame, sba_analysis_order, nchan_ism, hIsmMeta, hOSba->prev_object_dm_gains, hOSba->interpolator );



#ifdef FIX_732_PLANAR_SBA_OSBA

        if ( sba_planar )

        {

            ivas_sba_zero_vert_comp( &( data_in_f[nchan_ism] ), sba_analysis_order, sba_planar, input_frame );

        }

#endif



        /* Merge SBA signals */

        ivas_merge_sba_transports( data_out_f, &( data_in_f[nchan_ism] ), data_in_f, input_frame, sba_analysis_order );

lib_enc/lib_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -573,12 +573,8 @@ ivas_error IVAS_ENC_ConfigureForSBAObjects( 
    st_ivas->hEncoderConfig->sba_order = order;



    /* Input in ACN/SN3D in all cases (3D and planar): get number of channels */

#ifdef FIX_732_PLANAR_SBA_OSBA

    /*Input file will always contain all channels for a given order irrespective of planar flag*/

    st_ivas->hEncoderConfig->nchan_inp = ivas_sba_get_nchan( st_ivas->hEncoderConfig->sba_order, 0 ) + numObjects;

#else

    st_ivas->hEncoderConfig->nchan_inp = ivas_sba_get_nchan( st_ivas->hEncoderConfig->sba_order, isPlanar ) + numObjects;

#endif



    st_ivas->hEncoderConfig->Opt_PCA_ON = (int16_t) Opt_PCA_ON;