Commit 32f8cd1f authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1605_basop_port_fl1389' into 'main-pc' 

Port MR 1389 into main-pc

See merge request !1615
parents 6db41064 a9ab10d6

.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

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
#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 */

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 ) )

    {