Commit a149d593 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch 'main' into 1003-usan-applying-zero-offset-to-null-pointer-in-ivas_jbm_dec-c

parents 54d002d0 e0a027db

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ variables: 
      - 'default'

      - 'test-be-release'

      - 'test-long-self-test'

  GIT_CLEAN_FLAGS: -ffdxq





default:

apps/decoder.c

+4 −1
Original line number Diff line number Diff line
@@ -2334,7 +2334,11 @@ static ivas_error decodeG192( 
                {

                    if ( ( error = TsmScaleFileReader_readScale( tsmScaleFileReader, &scale ) ) != IVAS_ERR_OK )

                    {

#ifdef FIX_699_FILE_READER_JBM_TSM

                        fprintf( stderr, "\nError (%s) when reading TSM data from %s \n\n", arg.inputBitstreamFilename, TsmScaleFileReader_getFilePath( tsmScaleFileReader ) );

#else

                        fprintf( stderr, "\nError: input bitstream file couldn't be read: %s \n\n", arg.inputBitstreamFilename );

#endif

                        goto cleanup;

                    }

                    int16_t maxScaling;
@@ -2426,7 +2430,6 @@ static ivas_error decodeG192( 
#endif

                }

            }



        } while ( nSamplesRendered < nOutSamples && error == IVAS_ERR_OK );



        if ( error == IVAS_ERR_END_OF_FILE )

apps/encoder.c

+4 −0
Original line number Diff line number Diff line
@@ -686,7 +686,11 @@ int main( 
        {

            if ( ( error = JbmFileReader_readCAconfig( jbmReader, &caConfig ) ) != IVAS_ERR_OK )

            {

#ifdef FIX_699_FILE_READER_JBM_TSM

                fprintf( stderr, "\nError (%s) while reading Channel-Aware Config. from: %s\n\n", IVAS_ENC_GetErrorMessage( error ), JbmFileReader_getFilePath( jbmReader ) );

#else

                fprintf( stderr, "JbmFileReader_readCAconfig() failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );

#endif

                goto cleanup;

            }

lib_com/ivas_prot.h

+2 −1
Original line number Diff line number Diff line
@@ -4360,13 +4360,14 @@ void ivas_spar_dec_upmixer_sf( 
    const int16_t nchan_internal                                /* i  : number of internal channels             */

);



#ifndef FIX_997_REMOVE_SPAR_DEC_UPMIXER

void ivas_spar_dec_upmixer(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */

    float *output[],                                            /* i/o: input/output audio channels             */

    const int16_t nchan_internal,                               /* i  : number of internal channels             */

    const int16_t output_frame                                  /* i  : output frame length                     */

);



#endif

/* MD module */

ivas_error ivas_spar_md_enc_open(

    ivas_spar_md_enc_state_t **hMdEnc,                          /* i/o: SPAR MD encoder handle                  */

lib_com/options.h

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



#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

#define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */

#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */

#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */
@@ -180,6 +183,7 @@ 
#endif



#define NONBE_FIX_984_OMASA_EXT_OUTPUT                        /* Nokia: issue #984: complete the OMASA EXT output implementation */

#define NONBE_FIX_1000_G1_G2_SWB_TBE                          /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */



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