Commit 5a369a8a authored by vaclav's avatar vaclav
Browse files

accept FIX_708_DPID_COMMAND_LINE

parent 1b01c0a3

apps/decoder.c

+4 −29
Original line number Diff line number Diff line
@@ -145,10 +145,9 @@ typedef struct 
#endif

#endif

    uint16_t acousticEnvironmentId;

#ifdef FIX_708_DPID_COMMAND_LINE

    int16_t Opt_dpid_on;

#endif

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];



} DecArguments;
@@ -434,13 +433,8 @@ int main( 
     * Configure the decoder

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



    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.enable5ms,

                                       arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain,

#ifdef FIX_708_DPID_COMMAND_LINE

                                       arg.Opt_dpid_on,

#endif

                                       arg.acousticEnvironmentId,

                                       arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.enable5ms, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation,

                                       arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain, arg.Opt_dpid_on, arg.acousticEnvironmentId, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;
@@ -1002,9 +996,7 @@ static bool parseCmdlIVAS_dec( 


    arg->renderConfigEnabled = false;

    arg->renderConfigFilename = NULL;

#ifdef FIX_708_DPID_COMMAND_LINE

    arg->Opt_dpid_on = 0;

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

    arg->outputMdFilename = NULL;
@@ -1031,11 +1023,7 @@ static bool parseCmdlIVAS_dec( 
    arg->acousticEnvironmentId = 65535;

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

    {

#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY

        arg->directivityPatternId[i] = 65535;

#else

        arg->directivityPatternId[i] = 0;

#endif

    }



    /*-----------------------------------------------------------------*
@@ -1424,17 +1412,13 @@ static bool parseCmdlIVAS_dec( 
        }

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

        {

#ifdef FIX_708_DPID_COMMAND_LINE

            int16_t id;

            int16_t id, tmp;



            arg->Opt_dpid_on = 1;

#endif

            ++i;

            int16_t tmp;

            tmp = 0;

            while ( is_number( argv[i + tmp] ) && tmp < IVAS_MAX_NUM_OBJECTS )

            {

#ifdef FIX_708_DPID_COMMAND_LINE

                id = (int16_t) atoi( argv[i + tmp] );



                if ( !is_digits_only( argv[i + tmp] ) || id < 0 )
@@ -1445,13 +1429,9 @@ static bool parseCmdlIVAS_dec( 
                }



                arg->directivityPatternId[tmp] = id;

#else

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

#endif

                ++tmp;

            }



#ifdef FIX_708_DPID_COMMAND_LINE

            if ( tmp == 0 )

            {

                if ( argc - i <= 4 || argv[i][0] == '-' )
@@ -1468,7 +1448,6 @@ static bool parseCmdlIVAS_dec( 
                    return false;

                }

            }

#endif



            i += tmp;

        }
@@ -1663,15 +1642,11 @@ static void usage_dec( void ) 
    fprintf( stdout, "-force R            : Force specific binaural rendering mode, R = (TDREND, CLDFBREND),\n" );

#endif

    fprintf( stdout, "-exof File          : External orientation File for external orientation trajectory\n" );

#ifdef FIX_708_DPID_COMMAND_LINE

    fprintf( stdout, "-dpid ID            : Directivity pattern ID(s) = [ID1, ID2, ID3, ID4]. Space-separated list of up\n" );

    fprintf( stdout, "                      to 4 numbers (unsigned integers) can be specified for BINAURAL and BINAURAL_ROOM_REVERB\n" );

    fprintf( stdout, "                      output configuration. ID1, ID2, ID3, ID4 specify the directivity pattern IDs used for\n" );

    fprintf( stdout, "                      ISMs 1,2,3 and 4 respectively. This options needs to be accompanied by a render_config file,\n" );

    fprintf( stdout, "                      otherwise a default directivity pattern is used.\n" );

#else

    fprintf( stdout, "-dpid ID            : Directivity pattern ID(s) (space-separated list of up to 4 numbers can be specified) for binaural output configuration\n" );

#endif

    fprintf( stdout, "-aeid ID            : Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output configuration\n" );

    fprintf( stdout, "-level level        : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );

    fprintf( stdout, "                      Currently, all values default to level 3 (full functionality).\n" );

apps/renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -384,11 +384,7 @@ static const CmdLnParser_Option cliOptions[] = { 
        .id = CmdLnOptionId_directivityPatternId,

        .match = "ism_directivity_pattern_id",

        .matchShort = "dpid",

#ifdef FIX_708_DPID_COMMAND_LINE

        .description = "Directivity pattern ID(s) = [ID1, ID2, ID3, ID4]. Space-separated list of up to 4 numbers (unsigned integers) can be specified for BINAURAL and BINAURAL_ROOM_REVERB output configuration.\nID1, ID2, ID3, ID4 specify the directivity pattern IDs used for ISMs 1,2,3 and 4 respectively.\nThis options needs to be accompanied by a render_config file, otherwise a default directivity pattern is used.",

#else

        .description = "Directivity pattern ID(s) (space-separated list of up to 4 numbers can be specified) for binaural output configuration",

#endif

    },

    {

        .id = CmdLnOptionId_acousticEnvironmentId,

lib_com/ivas_error.h

+0 −4
Original line number Diff line number Diff line
@@ -75,9 +75,7 @@ typedef enum 
    IVAS_ERR_INVALID_OUTPUT_FORMAT,

    IVAS_ERR_HEAD_ROTATION_NOT_SUPPORTED,

    IVAS_ERR_EXT_ORIENTATION_NOT_SUPPORTED,

#ifdef FIX_708_DPID_COMMAND_LINE

    IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,

#endif

    IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,

    IVAS_ERR_INVALID_HRTF,

    IVAS_ERR_INVALID_INPUT_FORMAT,
@@ -253,10 +251,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
#endif

        case IVAS_ERR_EXT_ORIENTATION_NOT_SUPPORTED:

            return "External orientation not supported";

#ifdef FIX_708_DPID_COMMAND_LINE

        case IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED:

            return "Directivity not supported";

#endif

        case IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED:

            return "Acoustic environment not supported";

        case IVAS_ERR_INVALID_HRTF:

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ 
#define FIX_712_713_SPLIT_REND_MASA_MC                 /*Dlb : Fix for issue 712 and 713*/

#endif



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

#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" */

lib_dec/ivas_init_dec.c

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

    }



#ifdef FIX_708_DPID_COMMAND_LINE

    if ( st_ivas->hDecoderConfig->Opt_dpid_on )

    {

        if ( !( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
@@ -3092,7 +3091,6 @@ static ivas_error doSanityChecks_IVAS( 
            return IVAS_ERROR( IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED, "Wrong set-up: Directivity is not supported in this output configuration." );

        }

    }

#endif



    if ( st_ivas->hDecoderConfig->Opt_aeid_on )

    {