Commit fd7f266d authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_708_AEID_COMMAND_LINE

parent 334d6b2a

apps/decoder.c

+0 −12
Original line number Diff line number Diff line
@@ -439,9 +439,7 @@ int main( 
#ifdef FIX_708_DPID_COMMAND_LINE

                                       arg.Opt_dpid_on,

#endif

#ifdef FIX_708_AEID_COMMAND_LINE

                                       arg.acousticEnvironmentId,

#endif

                                       arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -658,11 +656,7 @@ int main( 
                    goto cleanup;

                }

            }

#ifdef FIX_708_AEID_COMMAND_LINE

            else

#else

            else if ( error != IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING )

#endif

            {

                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", arg.acousticEnvironmentId );

                goto cleanup;
@@ -1034,11 +1028,7 @@ static bool parseCmdlIVAS_dec( 
    arg->noBadFrameDelay = false;

#endif

#endif

#ifdef FIX_708_AEID_COMMAND_LINE

    arg->acousticEnvironmentId = 65535;

#else

    arg->acousticEnvironmentId = 0;

#endif

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

    {

#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
@@ -1417,7 +1407,6 @@ static bool parseCmdlIVAS_dec( 
        else if ( strcmp( argv_to_upper, "-AEID" ) == 0 )

        {

            ++i;

#ifdef FIX_708_AEID_COMMAND_LINE

            if ( argc - i <= 4 )

            {

                fprintf( stderr, "Error: Acoustic environment ID not specified!\n\n" );
@@ -1431,7 +1420,6 @@ static bool parseCmdlIVAS_dec( 
                usage_dec();

                return false;

            }

#endif

            arg->acousticEnvironmentId = (int16_t) atoi( argv[i++] );

        }

        else if ( strcmp( argv_to_upper, "-DPID" ) == 0 )

apps/renderer.c

+0 −6
Original line number Diff line number Diff line
@@ -2647,11 +2647,7 @@ static CmdlnArgs defaultArgs( 
#endif

    }



#ifdef FIX_708_AEID_COMMAND_LINE

    args.acousticEnvironmentId = 65535;

#else

    args.acousticEnvironmentId = 0;

#endif



    return args;

}
@@ -2819,13 +2815,11 @@ static void parseOption( 
            break;

        case CmdLnOptionId_acousticEnvironmentId:

            assert( numOptionValues == 1 );

#ifdef FIX_708_AEID_COMMAND_LINE

            if ( !is_digits_only( optionValues[0] ) )

            {

                fprintf( stderr, "Invalid acousting environment ID specified: %s\n", optionValues[0] );

                exit( -1 );

            }

#endif

            args->acousticEnvironmentId = (int16_t) strtol( optionValues[0], NULL, 10 );

            break;

        case CmdLnOptionId_syncMdDelay:

lib_com/ivas_error.h

+0 −4
Original line number Diff line number Diff line
@@ -81,9 +81,7 @@ typedef enum 
#ifdef FIX_708_DPID_COMMAND_LINE

    IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,

#endif

#ifdef FIX_708_AEID_COMMAND_LINE

    IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,

#endif

    IVAS_ERR_INVALID_HRTF,

    IVAS_ERR_INVALID_INPUT_FORMAT,

#ifdef FIX_747_ISM_TODOS
@@ -270,10 +268,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
        case IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED:

            return "Directivity not supported";

#endif

#ifdef FIX_708_AEID_COMMAND_LINE

        case IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED:

            return "Acoustic environment not supported";

#endif

        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

        case IVAS_ERR_INVALID_INPUT_FORMAT:

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,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_708_AEID_COMMAND_LINE                       /* VA: issue 708: improve AEID command-line robustness */

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

#define FIX_518_ISM_BRIR_EXTREND                        /* FhG: fix issue #518, cleanup ISM to BINAURAL_ROOM_IR rendering in the external renderer */

#define FIX_764_HARM_CODE                               /* VA: issue 764: introduce new function for the same code block at four different places */

lib_dec/ivas_init_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -3148,7 +3148,6 @@ static ivas_error doSanityChecks_IVAS( 
    }

#endif



#ifdef FIX_708_AEID_COMMAND_LINE

    if ( st_ivas->hDecoderConfig->Opt_aeid_on )

    {

        if ( output_config != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
@@ -3156,7 +3155,6 @@ static ivas_error doSanityChecks_IVAS( 
            return IVAS_ERROR( IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED, "Wrong set-up: Acoustic environment is not supported in this output configuration." );

        }

    }

#endif



    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

    {