Commit 2c40d634 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into fix_compiler_warnings_under_split_rend_with_head_rot
parents c187a132 a1e06713

.gitlab-ci.yml

+12 −7
Original line number Diff line number Diff line
@@ -93,16 +93,19 @@ stages: 
  # needed when depth is lower than the number of commits in the branch

  - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME:$CI_MERGE_REQUEST_TARGET_BRANCH_NAME



.mr-get-target-commit:

  &mr-get-target-commit # compare to last target branch commit before pipeline was created

.mr-get-target-commit: &mr-get-target-commit # compare to last target branch commit before pipeline was created

  - target_commit=$(git log $CI_MERGE_REQUEST_TARGET_BRANCH_NAME -1 --oneline --before=${CI_PIPELINE_CREATED_AT} --format=%H)



.check-for-testvectors:

  &check-for-testvectors # check if the testvector files specified in scripts/config/ci_linux*.json are present

.check-for-testvectors: &check-for-testvectors # check if the testvector files specified in scripts/config/ci_linux*.json are present

  - python3 -m pytest ci/test_vectors_available.py



.merge-request-comparison-setup-codec:

  &merge-request-comparison-setup-codec ### build test binaries, initial clean for paranoia reasons

.disable-debugging-macro: &disable-debugging-macro

# automatically disable #DEBUGGING macro in options.h using /**/-comment

  - sed -i.bak -e "s/^[[:space:]]*\(#define[[:space:]]*DEBUGGING\)/\/\*\1\*\//g" lib_com/options.h



.merge-request-comparison-setup-codec: &merge-request-comparison-setup-codec 

  ### build test binaries, initial clean for paranoia reasons

  - *disable-debugging-macro

  - make clean

  - mkdir build

  - cd build
@@ -113,17 +116,18 @@ stages: 
  - mv IVAS_rend ../IVAS_rend_test

  - cd ..

  - rm -rf build/*

  - git restore .



  ### store the current commit hash

  - source_branch_commit_sha=$(git rev-parse HEAD)



  ### checkout version to compare against

  - *mr-fetch-target-branch



  - *mr-get-target-commit

  - git checkout $target_commit



  ### build reference binaries

  - *disable-debugging-macro

  - cd build

  - cmake ..

  - make -j
@@ -131,6 +135,7 @@ stages: 
  - mv IVAS_dec ../IVAS_dec_ref

  - mv IVAS_rend ../IVAS_rend_ref

  - cd ..

  - git restore .



  # rename test binaries back

  - mv IVAS_cod_test IVAS_cod

ci/smoke_test.sh

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat 
ism_md_cmd="--ism_metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"

duration_arg="-U 1:2"

verbosity_cmd="-z console"

ep_file="ci/complexity_measurements/ep_10pct_fer.g192"



if [ $BUILD -eq 1 ];then

	# Enable memory macros to find unbalanced memory allocations/deallocations
@@ -88,7 +89,7 @@ echo "\n======================= 2. ism modes no FEC =======================\n\n" 
./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $ism_md_cmd | tee smoke_test_output.txt

# run the decoding again, but with 15% frame loss

echo "\n======================= 3. all modes with FEC =======================\n\n"

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg -f="$ep_file" --decoder_only | tee smoke_test_output_plc.txt



# run JBM modes - EXT is excluded as not supported yet

# OMASA disabled for now

lib_com/options.h

100755 → 100644
+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ 
#define FIX_917_LCLD_WARNINGS                           /* Dlb: issue 917 and 918: fix LCLD codec warnings*/

#define FIX_920_IGF_INIT_ERROR                          /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */

#define FIX_SPLITREND_WARNINGS                          /* FhG: fix warnings related to split rendering observed in build jobs */

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



/* #################### End BE switches ################################## */

lib_dec/ACcontextMapping_dec.c

+11 −1
Original line number Diff line number Diff line
@@ -348,9 +348,11 @@ int16_t RCcontextMapping_decode2_no_mem_s17_LCS( 
    int16_t lastnz, n;

    uint16_t r;

    int16_t resQBits;

#ifdef DEBUGGING

    int16_t nbbits_m2;

    int16_t rest_bits;

#endif

    int16_t nt_half;

    int16_t nbbits_m2;

    int16_t bits_tups; /* No. of bits for coding the no. of tuples */



    set_s( x, 0, nt );
@@ -424,8 +426,10 @@ int16_t RCcontextMapping_decode2_no_mem_s17_LCS( 
        /* Initialize range decoder */

        rc_uni_dec_init( &rc_st_dec, &st->bit_stream[st->next_bit_pos], nbbits ); /* (nbbits + 30) entries are read by the decoder */



#ifdef DEBUGGING

        nbbits_m2 = nbbits;

        rest_bits = -nbbits_m2;

#endif



        /* Main Loop through the 2-tuples */

        for ( k = 0; k < lastnz; k += 2 )
@@ -484,11 +488,13 @@ int16_t RCcontextMapping_decode2_no_mem_s17_LCS( 
            a += a1 << lev;

            b += b1 << lev;



#ifdef DEBUGGING

            /* Add 2 LSB bits per bit-plane */

            rest_bits += 2 * lev;

            /* Sign bits */

            rest_bits += min( a, 1 );

            rest_bits += min( b, 1 );

#endif



            /* Update bitstream pointer */

            st->next_bit_pos = start_bit_pos + bits_tups + rc_uni_dec_virtual_finish( &rc_st_dec );
@@ -570,8 +576,10 @@ int16_t RCcontextMapping_decode2_no_mem_s17_LCS( 
        /* Initialize range decoder */

        rc_uni_dec_init( &rc_st_dec, &st->bit_stream[st->next_bit_pos], nbbits ); /* (nbbits + 30) entries are read by the decoder */



#ifdef DEBUGGING

        nbbits_m2 = nbbits;

        rest_bits = -nbbits_m2;

#endif



        t = 0;

        s = 0;
@@ -624,11 +632,13 @@ int16_t RCcontextMapping_decode2_no_mem_s17_LCS( 
            a += a1 << lev;

            b += b1 << lev;



#ifdef DEBUGGING

            /* Add 2 LSB bits per bit-plane */

            rest_bits += 2 * lev;

            /* Sign bits */

            rest_bits += min( a, 1 );

            rest_bits += min( b, 1 );

#endif



            /* Update bitstream pointer */

            st->next_bit_pos = start_bit_pos + bits_tups + rc_uni_dec_virtual_finish( &rc_st_dec );

lib_dec/lib_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -2352,7 +2352,11 @@ ivas_error IVAS_DEC_GetDelay( 
    nSamples[2] = (int16_t) roundf( (float) st_ivas->binaural_latency_ns * hDecoderConfig->output_Fs / 1000000000.f );

    nSamples[0] = nSamples[1] + nSamples[2];



#ifdef FIX_921_OMASA_DELAY_PRINTOUT

    if ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT )

#else

    if ( st_ivas->ivas_format == MASA_FORMAT )

#endif

    {

        /* note: in MASA, all delay is compensated at the decoder by default, so subtract the encoder delay for print-out */

        nSamples[1] -= NS2SA( hDecoderConfig->output_Fs, IVAS_ENC_DELAY_NS );