Commit b32ddc42 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main-pc' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... 

Merge branch 'main-pc' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 1606_basop_port_fl1402
parents 5c952379 32f8cd1f

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -1379,7 +1379,7 @@ split-rendering-pytest-on-merge-request: 
    - .test-job-linux-needs-testv-dir

    - .rules-merge-request-to-main-pc

  needs: ["build-codec-linux-make"]

  timeout: "45 minutes"

  timeout: "60 minutes"

  stage: compare

  script:

    - *print-common-info

apps/encoder.c

+4 −0
Original line number Diff line number Diff line
@@ -681,7 +681,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/options.h

100644 → 100755
+16 −4
Original line number Diff line number Diff line
@@ -110,15 +110,27 @@ 


#endif



#define NONBE_FIX_947_STEREO_DMX_EVS_POC                /* Orange: Fix clicks on POC */  

#define NONBE_FIX_947_STEREO_DMX_EVS_PHA                /* Orange: Fix issues on PHA */      

#define NONBE_FIX_951_MCMASA_5MS_RENDERING              /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2 kbps to BINAURAL */

#define NONBE_FIX_979_OSBA_STEREO_5MS                   /* FhG : issue #979 : 5ms and 20ms output different for OSBA and stereo */

#define FIX_983_DISC_ISM_DIGEST_NUM_OBJS                /* FhG: issue #983: the discrete ISM digest function uses the wrong number of objects */



#define NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN             /* FhG : issue #974: usan in mono and stereo output in OSBA JBM RS */

#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 NONBE_FIX_982_OMASA_DELAY_COMP_5MS              /* FhG : issue #982 : 5ms and 20ms output different for OMASA */

#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */

#define NONBE_FIX_986_MC_BW_SWITCHING                   /* FhG: fix crash in bw and br switching with MC */

#define NONBE_FIX_975_JBM_USAN                          /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */

#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 NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC

#define NONBE_FIX_947_STEREO_DMX_ROMOPT                       /* Orange: ROM optimisation for POC*/  

#endif

#define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#endif

#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_jbm_dec_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ ivas_error ivas_jbm_dec_tc_fx( 
        {

            hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );

        }

#ifndef FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO



        test();

        IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) && EQ_16( st_ivas->hDecoderConfig->nchan_out, 1 ) )
@@ -192,6 +193,7 @@ ivas_error ivas_jbm_dec_tc_fx( 
                Scale_sig32( p_output_fx[i], output_frame, negate( s ) ); // Q11

            }

        }

#endif

    }

    ELSE IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )

    {

lib_dec/ivas_output_config_fx.c

+0 −10
Original line number Diff line number Diff line
@@ -265,16 +265,6 @@ void ivas_renderer_select( 
                            move16();

                        }



#if 0 // def DEBUGGING  /*temp disabling this as paramMC crashes with CREND*/

                        IF ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND )

                        {

                            *renderer_type = RENDERER_BINAURAL_MIXER_CONV;

                        }

                        ELSE IF ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )

                        {

                            *renderer_type = RENDERER_BINAURAL_FASTCONV;

                        }

#endif

                        test();

                        IF( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation )

                        {