Commit fa73f996 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch 'dlb_sr_xsan_fixes' into ci/sanitizer-tests-split-rendering

parents 3887abc8 d2a2e40b

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
variables:

  # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this

  # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information

  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF a31272de16bd1b556269a50bc179321a60f2a500

  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF main



include:

  - local: .gitlab-ci/variables.yml

apps/isar_post_rend.c

+0 −8
Original line number Diff line number Diff line
@@ -681,9 +681,7 @@ int main( 
    int argc,

    char **argv )

{

#ifdef FIX_1335_EXTREND_RETCODE

    bool mainFailed = true; /* Assume main failed until cleanup is reached without errors */

#endif

    ISAR_POST_REND_HANDLE hIsarPostRend = NULL;

    RotFileReader *headRotReader = NULL;

    RotFileReader *externalOrientationFileReader = NULL;
@@ -1225,10 +1223,8 @@ int main( 
     * Close files and deallocate resources

     *------------------------------------------------------------------------------------------*/



#ifdef FIX_1335_EXTREND_RETCODE

    mainFailed = false; /* This will stay set to true if cleanup is reached via a goto due to an error */



#endif

cleanup:



    free( inpInt16Buffer );
@@ -1259,11 +1255,7 @@ cleanup: 
    print_mem( NULL );

#endif



#ifdef FIX_1335_EXTREND_RETCODE

    return mainFailed ? -1 : 0;

#else

    return 0;

#endif

}

apps/renderer.c

+0 −8
Original line number Diff line number Diff line
@@ -659,9 +659,7 @@ int main( 
    int argc,

    char **argv )

{

#ifdef FIX_1335_EXTREND_RETCODE

    bool mainFailed = true; /* Assume main failed until cleanup is reached without errors */

#endif

    IVAS_REND_HANDLE hIvasRend = NULL;

    RotFileReader *headRotReader = NULL;

    RotFileReader *externalOrientationFileReader = NULL;
@@ -1979,10 +1977,8 @@ int main( 
     * Close files and deallocate resources

     *------------------------------------------------------------------------------------------*/



#ifdef FIX_1335_EXTREND_RETCODE

    mainFailed = false; /* This will stay set to true if cleanup is reached via a goto due to an error */



#endif

cleanup:



    free( inpInt16Buffer );
@@ -2039,11 +2035,7 @@ cleanup: 
    print_mem( NULL );

#endif



#ifdef FIX_1335_EXTREND_RETCODE

    return mainFailed ? -1 : 0;

#else

    return 0;

#endif

}

lib_com/options.h

+6 −8
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ 
#endif



#ifdef DEBUG_MODE_MDCT

/*#define DEBUG_PLOT_BITS*/

#define DEBUG_PLOT_BITS

#define DEBUG_OSBA_MD_BITS

#endif



#ifdef DEBUG_MODE_DFT
@@ -161,9 +162,8 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1335_EXTREND_RETCODE                        /* FhG: Add modification of returncode for external renderer when an error occurs */

#define FIX_938_COMPILER_WARNING                        /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */



#define FIX_1288_SPLIT_REND_XSAN                        /* Dlb: Fix asan, msan and usan issues in split rendering mode*/



/* #################### End BE switches ################################## */
@@ -174,10 +174,8 @@ 


#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_1250_MCMASA_LS_OUTPUT                     /* VA: issue 1250: fix crash in McMASA to custom LS output decoding */

#define NONBE_1302_FIX_OMASA_JBM_FLUSH                  /* VA: issue 1302: fix OMASA JBM bitrate switching flush in binaural output */

#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP               /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

#define NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND /* Eri: issue 1337: Missing directivity setting and distance attenuation in external renderer IVAS_rend */

#define NONBE_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_dirac_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -2453,14 +2453,10 @@ void ivas_dirac_dec_render_sf( 


            /* Move the separated and the LFE channels to temporary variables as spatial synthesis may overwrite current channels */

            mvr2r( &( output_f[st_ivas->hOutSetup.separateChannelIndex][subframe_start_sample] ), tmp_separated, num_samples_subframe );

#ifdef NONBE_1250_MCMASA_LS_OUTPUT

            if ( hDirACRend->hOutSetup.num_lfe > 0 )

            {

                mvr2r( &( output_f[LFE_CHANNEL][subframe_start_sample] ), tmp_lfe, num_samples_subframe );

            }

#else

            mvr2r( &( output_f[LFE_CHANNEL][subframe_start_sample] ), tmp_lfe, num_samples_subframe );

#endif



            for ( ch = 0; ch < outchannels; ch++ )

            {