Commit 6f3e8d4a authored by Ke Zhao's avatar Ke Zhao
Browse files

Merge branch 'main' into 584-update-sba-cldfb-domain-hrtfs

parents 631afa1a 354e7a8a

.gitlab-ci.yml

+21 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ workflow: 
    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main

    - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Scheduled in main

    - if: $CI_PIPELINE_SOURCE == 'web' # for testing

    - if: $CI_PIPELINE_SOURCE == 'trigger'



stages:

  - .pre
@@ -135,6 +136,8 @@ stages: 
      when: never

    - if: $CI_PIPELINE_SOURCE == 'schedule' # Don't run in any scheduled pipelines by default (use schedule templates below to enable again for certain conditions)

      when: never

    - if: $CI_PIPELINE_SOURCE == 'trigger'  # Don't run triggered pipeline by default

      when: never

    - when: on_success



.rules-merge-request:
@@ -1310,6 +1313,24 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
# Other jobs

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



upload-selection-BE-log:

  rules:

  - if: $UPLOAD_SELECTION_BE_RESULTS && $CI_PIPELINE_SOURCE == 'trigger'

    when: always

  timeout: 5 minutes

  tags:

    - ericsson-windows-runner

  script:

    - cp -r $SELECTION_BE_RESULT ./selection-BE-result

    - Get-Content -Path selection-BE-result/public_log--sha-*.txt

    - $has_failed = (Select-String -Path selection-BE-result/public_log--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line

    - If($has_failed) {exit -1}

  artifacts:

    paths:

      - selection-BE-result/public_log--sha-*.txt

    when: always

    expire_in: 1 week



# job that sets up gitlab pages website

pages:

  stage: deploy

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ 
#define FIX_565_SBA_BURST_IN_FEC                        /* VA: Issue 565: Fix noise burst during FEC, due to wrong total_brate initialization */

#define FIX_562_ISM2_64KBPS                             /* VA: issue 562: fix ISM2 at 64kbps issue */

#define FIX_559_EXTL_IGF_MISMATCH                       /* VA: issue 559: fix mismatch between st->extl and st->igf observed as crash in PlanarSBA bitrate switching */

#define FIX_571_REVERB_NOT_ACTIVATED_ISM                /* Philips: Issue 571: Reverb not activated for discrete and parametric ISM */

#define FIX_572_LFE_LPF_ENC                             /* FhG: issue 572: always apply the low pass filter to the LFE channel */

#define FIX_QMETA_SID_5k2                               /* Nokia: Issue 137: enable using full 5.2k bitrate in MASA SID */

#define FIX_578_PARAMMC_ILD_BS                          /* FhG: Issue 578: transmitt also center ILD in band 0 when LFE is active in 3TC ParamMC */

lib_dec/ivas_binRenderer_internal.c

+8 −0
Original line number Diff line number Diff line
@@ -758,7 +758,11 @@ ivas_error ivas_binRenderer_open( 
    }



    /* Allocate memories needed for reverb module */

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

    if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

    if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

    {

        if ( ( error = ivas_binaural_reverb_open( &( hBinRenderer->hReverb ),

                                                  hBinRenderer->conv_band,
@@ -766,7 +770,11 @@ ivas_error ivas_binRenderer_open( 
                                                  &( st_ivas->hRenderConfig->roomAcoustics ),

                                                  st_ivas->hIntSetup.output_config,

                                                  st_ivas->hDecoderConfig->output_Fs,

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                                                  RENDERER_BINAURAL_FASTCONV,

#else

                                                  RENDERER_BINAURAL_FASTCONV_ROOM,

#endif

                                                  st_ivas->hHrtfFastConv,

                                                  st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

        {

lib_dec/ivas_ism_dec.c

+17 −0
Original line number Diff line number Diff line
@@ -184,6 +184,15 @@ static ivas_error ivas_ism_bitrate_switching( 
                {

                    return error;

                }

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                if ( st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                {

                    if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

                    {

                        return error;

                    }

                }

#endif

            }

        }

        else
@@ -258,6 +267,14 @@ static ivas_error ivas_ism_bitrate_switching( 
                {

                    st_ivas->hHrtfTD = NULL;

                }



#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                {

                    ivas_reverb_close( &st_ivas->hReverb );

                }



#endif

            }

        }

        else

lib_dec/ivas_output_config.c

+20 −0
Original line number Diff line number Diff line
@@ -82,7 +82,11 @@ void ivas_renderer_select( 
        {

            if ( st_ivas->ism_mode == ISM_MODE_PARAM )

            {

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                if ( output_config == AUDIO_CONFIG_BINAURAL )

#else

                if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

                {

                    *renderer_type = RENDERER_BINAURAL_PARAMETRIC;

                }
@@ -104,11 +108,19 @@ void ivas_renderer_select( 
                    else

                    {

                        *renderer_type = RENDERER_BINAURAL_OBJECTS_TD;

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                        *internal_config = output_config;

#else

                        *internal_config = AUDIO_CONFIG_BINAURAL;

#endif

                    }

#else

                    *renderer_type = RENDERER_BINAURAL_OBJECTS_TD;

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                    *internal_config = output_config;

#else

                    *internal_config = AUDIO_CONFIG_BINAURAL;

#endif

#endif

                }

                else
@@ -139,7 +151,11 @@ void ivas_renderer_select( 
        else if ( st_ivas->ivas_format == SBA_FORMAT )

        {

            *internal_config = AUDIO_CONFIG_HOA3;

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

            if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

            if ( output_config == AUDIO_CONFIG_BINAURAL )

#endif

            {

                *renderer_type = RENDERER_BINAURAL_FASTCONV;

            }
@@ -187,7 +203,11 @@ void ivas_renderer_select( 
            else

            {

                *internal_config = transport_config;

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

                if ( output_config == AUDIO_CONFIG_BINAURAL )

#endif

                {

#ifdef DEBUGGING

                    if ( ( ( ( st_ivas->transport_config == AUDIO_CONFIG_5_1 || st_ivas->transport_config == AUDIO_CONFIG_7_1 ) && ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) ) || ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) ) && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) && !( st_ivas->hDecoderConfig->force_rend == FORCE_CLDFB_RENDERER ) )