Commit d1208061 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 28-wrong-decoding-of-framing-in-tcx10-frames-after-lost-frames-possible-180
parents 9ac408cf df94a0c0

.gitlab-ci.yml

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ build-codec-sanitizers-linux: 
# test that runs all modes with 1s input signals

codec-smoke-test:

  extends: .test-job-linux-needs-testv-dir

  # temporarily restrict this job to the only runner which (so far) seems to runit without problems

  tags:

    - test-fhg-linux-runner1

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

  stage: test

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ 
#define FIX_IVAS_180_PLC_SIGNAL_LAST_OVLP_IN_TCX10      /* IVAS-180 write last overlap mode in TCX10 frames to allow for correct TCX10/TCX5 subframe decomposition in TCX10 frames after a lost frame */

/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/



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

lib_dec/ivas_spar_foa_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -976,7 +976,11 @@ void ivas_spar_foa_dec_upmixer( 
    /* determine if we can skip certain data */

    ivas_spar_get_skip_mat( hSparFoa, numch_out, numch_in, num_spar_bands, b_skip_mat ); /* this can be precomputed based on bitrate and format*/



#ifdef FIX_1_CUSTOM_LS

    numch_out_dirac = st_ivas->hDecoderConfig->nchan_out;

#else

    numch_out_dirac = audioCfg2channels( st_ivas->hDecoderConfig->output_config );

#endif



    for ( int16_t i_sf = 0; i_sf < MAX_PARAM_SPATIAL_SUBFRAMES; i_sf++ )

    {

scripts/prerenderer/prerenderer.c

+6 −0
Original line number Diff line number Diff line
@@ -448,6 +448,12 @@ int32_t main( int32_t argc, char **argv ) 
            break;

        }



        if ( numSamplesRead == 0 )

        {

            /* end of input data */

            break;

        }



        /* Convert from int to float and from interleaved to packed */

        for ( smpl = 0; smpl < args.frameSize; ++smpl )

        {