Commit aa8513ef authored by mcdonaldb's avatar mcdonaldb
Browse files

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

Merge remote-tracking branch 'origin/main' into 1-ivas-internal-error-in-decoder-for-custom-loudspeaker-format-with-sba-input-at-24-4kbps
parents e8938793 5caba6eb

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ codec-smoke-test: 
  stage: test

  script:

    - bash ci/smoke_test.sh

    ### analyze for failures

    - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test failed"; exit 1; fi

  artifacts:

    paths:

      - out/logs

ci/smoke_test.sh

+1 −1
Original line number Diff line number Diff line
@@ -10,4 +10,4 @@ make all -j 


# get all modes except SBA rate switching (which is broken currently)

list=$(./scripts/runIvasCodec.py -l | grep -v "SBA.*rs")

./scripts/runIvasCodec.py -p ./scripts/config/ci_linux.json -m $list -U 1
 
./scripts/runIvasCodec.py -p ./scripts/config/ci_linux.json -m $list -U 1 | tee smoke_test_output.txt

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ 
/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/



#define FIX_1                                           /* fix bug 1-ivas-internal-error-in-decoder-for-custom-loudspeaker-format-with-sba-input-at-24-4kbps */

#define FIX_TDREND_STANDALONE                           /* Fix for TD standalone renderer (broken after update of hHrtfTD pointer and addition of hRenderConfig */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_objectRenderer.c

+29 −3
Original line number Diff line number Diff line
@@ -302,7 +302,22 @@ ivas_error ObjRenderIVASFrame( 
            TDREND_MIX_SRC_SetPlayState( st_ivas->hBinRendererTd, nS, TDREND_PLAYSTATUS_PLAYING );

        }

    }



#ifdef FIX_TDREND_STANDALONE

    if ( st_ivas->hRenderConfig != NULL ) /* Renderer Configuration not enabled in TD standalone renderer */

    {

        if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )

        {

            if ( st_ivas->ini_frame == 0 )

            {

                ivas_reverb_open( &st_ivas->hCrend->hReverb, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs );

            }

            for ( subframe_idx = 0; subframe_idx < 4; subframe_idx++ )

            {

                ivas_reverb_process( st_ivas->hCrend->hReverb, st_ivas->transport_config, 0, output, reverb_signal, subframe_idx );

            }

        }

    }

#else

    if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )

    {

        if ( st_ivas->ini_frame == 0 )
@@ -314,17 +329,28 @@ ivas_error ObjRenderIVASFrame( 
            ivas_reverb_process( st_ivas->hCrend->hReverb, st_ivas->transport_config, 0, output, reverb_signal, subframe_idx );

        }

    }

#endif



    /* Call the renderer */

    TDREND_GetMix( st_ivas->hBinRendererTd, output, output_frame, st_ivas->hDecoderConfig->output_Fs );



#ifdef FIX_TDREND_STANDALONE

    if ( st_ivas->hRenderConfig != NULL ) /* Renderer Configuration not enabled in TD standalone renderer */

    {

        if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )

        {

            /* add reverb to rendered signals */

            v_add( reverb_signal[0], output[0], output[0], output_frame );

            v_add( reverb_signal[1], output[1], output[1], output_frame );

        }



    }

#else

    if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )

    {

        /* add reverb to rendered signals */

        v_add( reverb_signal[0], output[0], output[0], output_frame );

        v_add( reverb_signal[1], output[1], output[1], output_frame );

    }

#endif

    return IVAS_ERR_OK;

}

scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone/renderer_standalone.c

+9 −0
Original line number Diff line number Diff line
@@ -151,7 +151,12 @@ int main( int argc, char *argv[] ) 
    /*------------------------------------------------------------------------------------------*

     * Struct initializations

     *------------------------------------------------------------------------------------------*/

#ifdef FIX_TDREND_STANDALONE

    st_ivas->hHrtfTD = NULL;

    st_ivas->hRenderConfig = NULL;

#else

    st_ivas->hHrtf = NULL;

#endif

    st_ivas->hHeadTrackData = NULL;

    st_ivas->ivas_format = ISM_FORMAT;

    f_quat_traj = NULL;
@@ -466,7 +471,11 @@ int main( int argc, char *argv[] ) 


    ivas_td_binaural_close( &st_ivas->hBinRendererTd );

    count_free( st_ivas->hDecoderConfig );

#ifdef FIX_TDREND_STANDALONE

    st_ivas->hHrtfTD = NULL;

#else    

    ivas_HRTF_binary_close( &st_ivas->hHrtfTD );

#endif



    /* ISM metadata handles */

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