Commit 2438bd9c authored by vaclav's avatar vaclav
Browse files

- Merge branch 'main' into 251-propagation-of-etot-parameter 

- update within REMOVE_ETOT_PROPAGATION - fix observed non-BE synthesis
parents 444b72d4 d302cdb6

.gitlab-ci.yml

+29 −13
Original line number Diff line number Diff line
@@ -1080,6 +1080,12 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
# Other jobs

# ---------------------------------------------------------------





# helper for pages job

.unzip-or-cat: &unzip-or-cat

  - unzip -t $ARTIFACTS >> /dev/null

  - if [ $? -eq 0 ]; then unzip -o $ARTIFACTS; rm $ARTIFACTS; else cat $ARTIFACTS; rm $ARTIFACTS; fi



# job that sets up gitlab pages website

# is run on a separate schedule and collects artifacts from other jobs (currently

# only the complexity measurements) multiple times a day
@@ -1096,39 +1102,49 @@ pages: 
    - branch=$CI_COMMIT_REF_NAME



    - mkdir public

    - ARTIFACTS=artifacts.zip



    ### fetch artifacts from latest run of complexity jobs

    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-stereo-in-stereo-out)

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_stereo.zip

    - cat artifacts_comp_stereo.zip

    - unzip -o artifacts_comp_stereo.zip

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS

    - *unzip-or-cat

    - mv complexity-stereo-in-stereo-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-ism-in-binaural-out)

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_ism.zip

    - unzip -o artifacts_comp_ism.zip

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS

    - *unzip-or-cat

    - mv complexity-ism-in-binaural-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-sba-hoa3-in-hoa3-out)

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_sba.zip

    - unzip -o artifacts_comp_sba.zip

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS

    - *unzip-or-cat

    - mv complexity-sba-hoa3-in-hoa3-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-mc-in-7_1_4-out)

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_mc.zip

    - unzip -o artifacts_comp_mc.zip

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS

    - *unzip-or-cat

    - mv complexity-mc-in-7_1_4-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-masa-in-7_1_4-out)

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_masa.zip

    - unzip -o artifacts_comp_masa.zip

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS

    - *unzip-or-cat

    - mv complexity-masa-in-7_1_4-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-StereoDmxEVS-stereo-in-mono-out)

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_StereoDmxEVS.zip

    - unzip -o artifacts_comp_StereoDmxEVS.zip

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS

    - *unzip-or-cat

    - mv complexity-StereoDmxEVS-stereo-in-mono-out-public ./public/



    - cp ci/index-pages.html public/index.html

Workspace_msvc/lib_dec.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_lfe_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_lfe_plc.c" />

    <ClCompile Include="..\lib_dec\ivas_masa_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_mcmasa_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_mct_core_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_mct_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -500,6 +500,9 @@ 
    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_mcmasa_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h">

lib_com/bitstream.c

+2 −0
Original line number Diff line number Diff line
@@ -879,10 +879,12 @@ static ivas_error write_indices_element( 


        for ( n = 0; n < n_channels; n++ )

        {

#ifndef MC_BITRATE_SWITCHING

            if ( ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT ) && ( st_ivas->mc_mode == MC_MODE_MCT ) && ( element_id * CPE_CHANNELS + n == LFE_CHANNEL ) )

            {

                continue;

            }

#endif

            reset_indices_enc( sts[n]->hBstr, MAX_NUM_INDICES );

        }

    }

lib_com/delay_comp.c

+19 −4
Original line number Diff line number Diff line
@@ -50,13 +50,18 @@ 
 *--------------------------------------------------------------------------*/



/*! r: delay value in ns */



int32_t get_delay(

    const int16_t enc_dec,           /* i  : encoder/decoder flag                */

    const int32_t io_fs,             /* i  : input/output sampling frequency     */

    const IVAS_FORMAT ivas_format,   /* i  : IVAS format                         */

    HANDLE_CLDFB_FILTER_BANK hCldfb, /* i  : Handle of Cldfb analysis            */

#ifndef FIX_I59_LFE_TD_DELAY

    RENDERER_TYPE renderer_type,      /* i  : IVAS rendering type                 */

    const int32_t binaural_latency_ns /* i  : binaural renderer HRTF delay in ns  */

#else

    const int32_t binaural_latency_ns /* i  : binauralization delay in ns         */

#endif

)

{

    int32_t delay = 0;
@@ -94,7 +99,16 @@ int32_t get_delay( 
        else /* IVAS */

        {

            delay = IVAS_DEC_DELAY_NS;

#ifdef FIX_I59_LFE_TD_DELAY

            if ( hCldfb != NULL )

            {

                /* compensate for filterbank delay */

                delay += IVAS_FB_DEC_DELAY_NS;

            }



            /* compensate for binauralization delay */

            delay += binaural_latency_ns;

#else

            if ( hCldfb != NULL || renderer_type == RENDERER_BINAURAL_OBJECTS_TD )

            {

                delay += IVAS_FB_DEC_DELAY_NS;
@@ -104,6 +118,7 @@ int32_t get_delay( 
            {

                delay += binaural_latency_ns;

            }

#endif

        }

    }