Commit c2a6b479 authored by Adam Mills's avatar Adam Mills
Browse files

Merge branch 'main' into 698-Fix-SBA-MSAN-issue-properly

parents 719307ed 1c9da7c7

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ codec-smoke-test: 
  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  timeout: "10 minutes"

  timeout: "15 minutes"

  stage: test

  needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"]

  script:

lib_com/bits_alloc.c

+14 −7
Original line number Diff line number Diff line
@@ -476,6 +476,10 @@ static ivas_error acelp_FCB_allocator( 
        }



        /* try to increase the FCB of the first subframe in cases when the next step is lower than the current step */

#ifdef NONBE_FIX_694_OMASA_ACELP

        if ( fixed_cdk_index[sfr] < ACELP_FIXED_CDK_NB - 1 )

        {

#endif

            step = fcb_table( fixed_cdk_index[sfr] + 1, L_subfr ) - fcb_table( fixed_cdk_index[sfr], L_subfr );

            if ( *nBits >= step && cdbk >= 0 )

            {
@@ -489,6 +493,9 @@ static ivas_error acelp_FCB_allocator( 
                    *nBits -= step;

                }

            }

#ifdef NONBE_FIX_694_OMASA_ACELP

        }

#endif

    }

    /* TRANSITION coding: allocate highest FCBQ bit-budget to the subframe with the glottal-shape codebook */

    if ( tc_subfr >= L_SUBFR )

lib_com/bitstream.c

+4 −0
Original line number Diff line number Diff line
@@ -2740,7 +2740,11 @@ ivas_error preview_indices( 
            /* Read SBA planar flag and SBA order */

            st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS] == 1 );



#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT

            if ( total_brate >= IVAS_256k )

#else

            if ( total_brate > IVAS_256k )

#endif

            {

                st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS + 2] == 1 );

                st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS + 1] == 1 );

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1187,7 +1187,11 @@ enum 


#define QMETADATA_MAXBIT_REQ_MASA               900                         /* max bit-bit/direction for avoiding requantization in MASA path */

#define QMETADATA_MAXBIT_REQ_SBA                400                         /* max bit-bit/direction for avoiding requantization in SBA path */

#ifdef NONBE_FIX_760_COHERENCE_MASA

#define MASA_COH_LIMIT_2IDX                     96                          /* limit for sum of values across components for having two joint indexes */

#else

#define MASA_COH_LIMIT_2IDX                     144                         /* limit for sum of values across components for having two joint indexes */

#endif

#define QMETADATA_MAX_NO_DIRECTIONS             2

#define MASA_MAX_BITS                           1300                        /* max. bit-budget for MASA metadata */

lib_com/ivas_stereo_td_bit_alloc.c

+11 −0
Original line number Diff line number Diff line
@@ -308,7 +308,18 @@ void tdm_bit_alloc( 
    {

        *total_brate_sec = min( *total_brate_sec, element_brate_wo_meta - ( 5900 + BWE_brate ) );



#ifdef NONBE_FIX_694_OMASA_ACELP

        if ( coder_type == INACTIVE )

        {

            *total_brate_sec = max( *total_brate_sec, tdm_bit_allc_tbl[0][0] ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */

        }

        else

        {

            *total_brate_sec = max( *total_brate_sec, 3500 ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */

        }

#else

        *total_brate_sec = max( *total_brate_sec, tdm_bit_allc_tbl[idx][coder_type] ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */

#endif

    }



    /* Secondary channel bitrate adjusment                                                      */