Commit 18f6fe3a authored by norvell's avatar norvell
Browse files

Fixes for CI builds

parent aa1d6f09

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ stages: 


  ### build reference binaries

  - *disable-debugging-macro

  - make clean

  - make -j

  - mv IVAS_cod IVAS_cod_ref

  - mv IVAS_dec IVAS_dec_ref
@@ -986,7 +987,7 @@ build-codec-linux-instrumented-make: 
  script:

    - *print-common-info

    - *update-scripts-repo

    - bash scripts/prepare_instrumentation.sh -m MEM_ONLY -p BASOP

    - bash scripts/prepare_instrumentation.sh -m MEM_ONLY -p FLOAT

    - make -j -C $INSTR_DIR



# make sure that the codec builds with msan, asan and usan

lib_enc/ivas_qmetadata_enc.c

+18 −1
Original line number Diff line number Diff line
@@ -3772,12 +3772,15 @@ static ivas_error requantize_direction_EC_3( 
    /* gradually increase the bits following the performance of the EC layer*/

    int16_t j, k;

    int16_t use_vq;

    int16_t diff, allowed_bits, nbits, last_j;

    int16_t diff, allowed_bits, last_j;

    int16_t no_subframes, start_band;

    float st[MAX_PARAM_SPATIAL_SUBFRAMES], ct[MAX_PARAM_SPATIAL_SUBFRAMES];

    int16_t *bits_dir0;

#ifdef DEBUGGING

    int16_t nbits;



    nbits = 0;

#endif

    no_subframes = q_direction->cfg.nblocks;

    start_band = q_direction->cfg.start_band;
@@ -3808,7 +3811,9 @@ static ivas_error requantize_direction_EC_3( 
    else /* 2D */

    {

        diff = 0;

#ifdef DEBUGGING

        nbits = 0;

#endif

        for ( j = start_band; j < coding_subbands; j++ )

        {

            bits_dir0 = (int16_t *) q_direction->band_data[j].bits_sph_idx;
@@ -3834,11 +3839,19 @@ static ivas_error requantize_direction_EC_3( 


                if ( q_direction->cfg.mc_ls_setup != MC_LS_SETUP_INVALID )

                {

#ifdef DEBUGGING

                    nbits += truncGR0_chan( azimuth_orig[j], q_direction->band_data[j].azimuth, q_direction->band_data[j].azimuth_index, no_subframes, allowed_bits, st, ct );

#else

                    truncGR0_chan( azimuth_orig[j], q_direction->band_data[j].azimuth, q_direction->band_data[j].azimuth_index, no_subframes, allowed_bits, st, ct );

#endif

                }

                else

                {

#ifdef DEBUGGING

                    nbits += truncGR0( azimuth_orig[j], q_direction->band_data[j].azimuth, q_direction->band_data[j].azimuth_index, no_subframes, allowed_bits, st, ct );

#else

                    truncGR0( azimuth_orig[j], q_direction->band_data[j].azimuth, q_direction->band_data[j].azimuth_index, no_subframes, allowed_bits, st, ct );

#endif

                }



                if ( allowed_bits <= no_subframes + 1 )
@@ -3865,7 +3878,11 @@ static ivas_error requantize_direction_EC_3( 
                                                                                         &q_direction->band_data[j].azimuth_index[k], q_direction->cfg.mc_ls_setup );

                    q_direction->band_data[j].elevation_index[k] = 0;

                }

#ifdef DEBUGGING

                nbits += write_fixed_rate_direction( hMetaData, q_direction, j, no_subframes );

#else

                write_fixed_rate_direction( hMetaData, q_direction, j, no_subframes );

#endif

            }

        }

    }