Commit 29bf9c0b authored by kinuthia's avatar kinuthia
Browse files

rename switch to NONBE_FIX_730_DPID_NOT_SET_CORRECTLY in all files

parent 950c7022

apps/decoder.c

+2 −2
Original line number Diff line number Diff line
@@ -640,7 +640,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] );
@@ -1041,7 +1041,7 @@ static bool parseCmdlIVAS_dec( 
#endif

    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_util/render_config_reader.c

+6 −6
Original line number Diff line number Diff line
@@ -2619,7 +2619,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
@@ -2629,7 +2629,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 );
@@ -2640,7 +2640,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 )
@@ -2845,7 +2845,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;
@@ -2866,7 +2866,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 */
@@ -2897,7 +2897,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 );