Commit 4c7f7f0e authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'fix_compiler_warnings_under_split_rend_with_head_rot' into 'main' 

fix remaining split rendering warnings

See merge request !1261
parents a1e06713 2c40d634

CMakeLists.txt

+1 −2
Original line number Diff line number Diff line
@@ -208,8 +208,7 @@ endif() 


if(INCLUDE_SPLIT)

  if(NOT WMOPS)

  file(GLOB unitTestIvasLc3plusSrcs "scripts/split_rendering/lc3plus/*.c")

  add_executable(ivas_lc3plus_unit_test ${unitTestIvasLc3plusSrcs})

  add_executable(ivas_lc3plus_unit_test ${CMAKE_SOURCE_DIR}/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug)

  endif()

endif()

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ 
#define FIX_891_PARAMUPMIX_CLEANUP                      /* Dlb: issue 891: remove unneeded code from ParamUpmix */

#define FIX_917_LCLD_WARNINGS                           /* Dlb: issue 917 and 918: fix LCLD codec warnings*/

#define FIX_920_IGF_INIT_ERROR                          /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */

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

lib_dec/lib_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -3970,7 +3970,11 @@ 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

+4 −0
Original line number Diff line number Diff line
@@ -2253,7 +2253,9 @@ 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];
@@ -2328,11 +2330,13 @@ 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;

scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c

+4 −2
Original line number Diff line number Diff line
@@ -1242,6 +1242,7 @@ static int scenario_per_subframe_switches_dec_first( 
    return IVAS_ERR_OK;

}



#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING

/*

 * Step1:

 *   in: [dec, dec, skip, skip]
@@ -1428,7 +1429,7 @@ static int scenario_per_subframe_switches_dec_first_no_caching( 
    IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( selective_decoding_matrix );

    return IVAS_ERR_OK;

}



#endif



/*

 * Step1:
@@ -1922,6 +1923,7 @@ static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_bundle_swi 
    return err;

}



#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING

static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_switches_dec_first_no_caching( void )

{

    int err = 0;
@@ -1934,7 +1936,7 @@ static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_switches_d 
    }

    return err;

}



#endif



static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_get_active_dont_cache( void )

{