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

Merge branch 'main' into 828-use-new-long-testvector-files-for-masa-in-sidstart-test

parents fbcc78cc ea24f573

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -909,6 +909,7 @@ clang-format-check: 
      - run: git apply $PATCH_FILE_NAME\n

      - commit new changes"



    - format_problems=0

    - scripts/check-format.sh -af -p 8 || format_problems=$?

    - if [ $format_problems == 0 ] ; then exit 0; fi
@@ -926,7 +927,7 @@ clang-format-check: 
    expire_in: 1 day

    paths:

      - tmp-formatting-fix/

    when: always

    when: on_failure

    name: "$ARTIFACT_BASE_NAME"

    expose_as: "formatting patch"

apps/decoder.c

+2 −2
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ int main( 


        if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, arg.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK )

        {

#ifdef FIX_730_DPID_NOT_SET_CORRECTLY

#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY

            fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );

#else

            fprintf( stderr, "Failed to get directivity for objects: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );
@@ -1031,7 +1031,7 @@ static bool parseCmdlIVAS_dec( 
    arg->acousticEnvironmentId = 65535;

    for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )

    {

#ifdef FIX_730_DPID_NOT_SET_CORRECTLY

#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY

        arg->directivityPatternId[i] = 65535;

#else

        arg->directivityPatternId[i] = 0;

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -2640,7 +2640,7 @@ static CmdlnArgs defaultArgs( 


    for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )

    {

#ifdef FIX_730_DPID_NOT_SET_CORRECTLY

#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY

        args.directivityPatternId[i] = 65535;

#else

        args.directivityPatternId[i] = 0;

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 




#define FIX_708_DPID_COMMAND_LINE                       /* issue 708: sanity checks for '-dpid' command-line */

#define FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */

#define FIX_513_REND_MC_ALLOC                           /* FhG: issue 513, optimise external renderer allocation for multichannel */

#define FIX_812_DOUBLE_PREC_MCT                         /* FhG: Issue 812: Avoid double precision in MCT */

#define FIX_807_VARIABLE_SPEED_DECODING                 /* FhG: Issue 807: Resolve "Variable Speed Decoding broken" */
@@ -185,6 +184,7 @@ 
#ifdef JBM_FOR_OSBA

#define OSBA_ROOM_IR

#endif

#define NONBE_FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */



/* ##################### End NON-BE switches ########################### */

lib_util/render_config_reader.c

+6 −6
Original line number Diff line number Diff line
@@ -2617,7 +2617,7 @@ ivas_error RenderConfigReader_read( 
                    return IVAS_ERR_INVALID_RENDER_CONFIG;

                }

                idx = strtol( strtok( NULL, ":" ), NULL, 0 );

#ifndef FIX_730_DPID_NOT_SET_CORRECTLY

#ifndef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY

                pRenderConfigReader->pDP->id = idx;

#endif
@@ -2627,7 +2627,7 @@ ivas_error RenderConfigReader_read( 
                {

                    params_idx += (int32_t) ( strlen( item ) + strlen( pValue ) + 2 );

#ifdef DEBUGGING

#ifdef FIX_730_DPID_NOT_SET_CORRECTLY

#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY

                    fprintf( stderr, "        PARAM: %s -> %s, DIRECTIVITYPATTERN -> %u\n", item, pValue, idx );

#else

                    fprintf( stderr, "        PARAM: %s -> %s\n", item, pValue );
@@ -2638,7 +2638,7 @@ ivas_error RenderConfigReader_read( 
                    {

                        return IVAS_ERR_FAILED_ALLOC;

                    }

#ifdef FIX_730_DPID_NOT_SET_CORRECTLY

#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY

                    pRenderConfigReader->pDP[accDPIdx].id = idx;

#endif

                    if ( strcmp( item, "DIRECTIVITY" ) == 0 )
@@ -2841,7 +2841,7 @@ ivas_error RenderConfigReader_getDirectivity( 
)

{

    uint16_t n, m;

#ifdef FIX_730_DPID_NOT_SET_CORRECTLY

#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY

    uint16_t last_specified_id;

#endif

    bool idExists;
@@ -2862,7 +2862,7 @@ ivas_error RenderConfigReader_getDirectivity( 
    }

    else

    {

#ifdef FIX_730_DPID_NOT_SET_CORRECTLY

#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY

        last_specified_id = id[0];



        /* set unpspecified Directivity Patterns ID to last specified ID */
@@ -2893,7 +2893,7 @@ ivas_error RenderConfigReader_getDirectivity( 
                if ( id[n] == pRenderConfigReader->pDP[m].id )

                {

                    idExists = true;

#ifdef FIX_730_DPID_NOT_SET_CORRECTLY

#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY

                    mvr2r( pRenderConfigReader->pDP[m].pDirectivity, directivity + ( n * 3 ), 3 );

#else

                    mvr2r( pRenderConfigReader->pDP[id[n]].pDirectivity, directivity + ( n * 3 ), 3 );