Commit 3cb76d6c authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_SPLITREND_WARNINGS

parent d4e05338

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_CRASH_LONG_BRIR                             /* Orange : Fix crash when long BRIR is set */

#define FIX_SPLITREND_WARNINGS                          /* FhG: fix warnings related to split rendering observed in build jobs */

#define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */

#define FIX_921_OMASA_DELAY_PRINTOUT                    /* VA: issue 921: correct OMASA decoder delay printout */

#define FIX_929_RENDERER_CMDL                           /* Nokia: issue #929: renderer command line option */

lib_dec/lib_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -3715,11 +3715,7 @@ static ivas_error set_pcm_buffer_to_zero( 
            error = IVAS_ERR_INTERNAL;

    }



#ifdef FIX_SPLITREND_WARNINGS

    return error;

#else

    return IVAS_ERR_OK;

#endif

}

lib_rend/ivas_crend.c

+0 −10
Original line number Diff line number Diff line
@@ -2266,9 +2266,6 @@ ivas_error ivas_rend_crendProcessSubframesSplitBin( 
    ivas_error error;

    float gain_lfe;

    float tmpLfeBuffer[L_FRAME48k];

#ifndef FIX_SPLITREND_WARNINGS

    float *p_bin_output[BINAURAL_CHANNELS];

#endif

    int16_t original_subframes_rendered, original_slots_rendered;

    float tmpInputBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k];

    float *p_tmpInputBuffer[MAX_OUTPUT_CHANNELS];
@@ -2343,13 +2340,6 @@ ivas_error ivas_rend_crendProcessSubframesSplitBin( 


        pCombinedOrientationDataLocal = &combinedOrientationDataLocal;



#ifndef FIX_SPLITREND_WARNINGS

        /* set output channels */

        for ( i = 0; i < BINAURAL_CHANNELS; i++ )

        {

            p_bin_output[i] = output[pos_idx * BINAURAL_CHANNELS + i];

        }

#endif

        hTcBuffer->subframes_rendered = original_subframes_rendered;

        hTcBuffer->slots_rendered = original_slots_rendered;