Commit e93e1892 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1173_basop_Resolve_OSBA_decoder_crash_with_planar_SBA_input' into 'main-pc' 

patched MR1266 into basop.

See merge request !961
parents a54b38d4 49de6d51

.gitlab-ci.yml

+0 −1
Original line number Diff line number Diff line
@@ -1063,7 +1063,6 @@ check-naming-of-branch-for-main-pc-merges: 
  script:

    - *update-scripts-repo

    - if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then

    -   git fetch

    -   ci/get_float_ref_branch_name.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME

    - fi

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ 
#define NONBE_FIX_855_JBM_FLUSH_OFFSET                  /* FhG: issue #855: add missing switch here for the code in JBM flushing                 */

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



#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */



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

lib_dec/ivas_jbm_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -3401,7 +3401,11 @@ Word16 ivas_jbm_dec_get_num_tc_channels_fx( 


        test();

        test();

#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA

        if ( EQ_16( num_tc, 3 ) )

#else

        if ( ( st_ivas->sba_planar && GE_16( num_tc, 3 ) ) || EQ_16( num_tc, 3 ) )

#endif

        {

            num_tc = add( num_tc, 1 );

        }