Commit fbd46975 authored by Jan Brouwer's avatar Jan Brouwer
Browse files

support both current and new binaural output configurations to ease merging... 

support both current and new binaural output configurations to ease merging into main; after merging the old configurations can then be removed
parent 1f75938c

apps/decoder.c

+18 −12
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <stdio.h>

#include <string.h>

#include <stdlib.h>

#include "options.h"

#include "lib_dec.h"

#include "cmdl_tools.h"

#include "audio_file_writer.h"
@@ -270,7 +271,8 @@ int main( 
    {

        /* sanity check */

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM &&

             arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )

#else

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )

#endif
@@ -296,7 +298,8 @@ int main( 
    {

        /* sanity check */

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM &&

             arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )

#else

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )

#endif
@@ -320,7 +323,8 @@ int main( 
    {

        /* sanity check */

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM &&

             arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )

#else

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )

#endif
@@ -351,7 +355,8 @@ int main( 
    {

        /* sanity check */

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM &&

             arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )

#else

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )

#endif
@@ -395,7 +400,8 @@ int main( 
    {

        /* sanity check */

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM &&

             arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )

#else

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )

#endif
@@ -526,7 +532,8 @@ int main( 


        /* sanity check */

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM &&

             arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )

#else

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL )

#endif
@@ -816,7 +823,7 @@ static IVAS_DEC_AUDIO_CONFIG cmdline2config( 
    {

        output_config = IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB;

    }

#else

#endif

    else if ( strcmp( argv_to_upper, "BINAURAL" ) == 0 )

    {

        output_config = IVAS_DEC_OUTPUT_BINAURAL;
@@ -825,7 +832,6 @@ static IVAS_DEC_AUDIO_CONFIG cmdline2config( 
    {

        output_config = IVAS_DEC_OUTPUT_BINAURAL_ROOM;

    }

#endif

    else

    {

        output_config = IVAS_DEC_OUTPUT_LS_CUSTOM;

apps/renderer.c

+4 −5
Original line number Diff line number Diff line
@@ -732,7 +732,8 @@ int main( 


        /* sanity check */

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_BRIR ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR_REVERB ) )

        if ( ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL ) &&

             ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_BRIR ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR_REVERB ) )

#else

        if ( ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL ) )

#endif
@@ -1594,7 +1595,7 @@ static IVAS_REND_AudioConfig parseAudioConfig( 
    {

        return IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR_REVERB;

    }

#else

#endif

    if ( strcmp( charBuf, "BINAURAL_ROOM" ) == 0 )

    {

        return IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM;
@@ -1603,7 +1604,6 @@ static IVAS_REND_AudioConfig parseAudioConfig( 
    {

        return IVAS_REND_AUDIO_CONFIG_BINAURAL;

    }

#endif



    return IVAS_REND_AUDIO_CONFIG_UNKNOWN;

}
@@ -2656,10 +2656,9 @@ static void printSupportedAudioConfigs() 
        "BINAURAL_HRIR (output only)",

        "BINAURAL_BRIR (output only)",

        "BINAURAL_HRIR_REVERB (output only)",

#else

#endif

        "BINAURAL (output only)",

        "BINAURAL_ROOM (output only)",

#endif

    };



    fprintf( stdout, "Supported audio formats:\n" );

lib_com/ivas_cnst.h

+1 −2
Original line number Diff line number Diff line
@@ -108,10 +108,9 @@ typedef enum 
    AUDIO_CONFIG_BINAURAL_HRIR,                 /* binaural with HRIR           */

    AUDIO_CONFIG_BINAURAL_BRIR,                 /* binaural with BRIR           */

    AUDIO_CONFIG_BINAURAL_HRIR_REVERB,          /* binaural with HRIR + reverb  */

#else

#endif

    AUDIO_CONFIG_BINAURAL,                      /* binaural with HRIR           */

    AUDIO_CONFIG_BINAURAL_ROOM,                 /* binaural with HRIR and BRIR  */

#endif

    AUDIO_CONFIG_ISM1,                          /* ISM1                         */

    AUDIO_CONFIG_ISM2,                          /* ISM2                         */

    AUDIO_CONFIG_ISM3,                          /* ISM3                         */

lib_dec/ivas_init_dec.c

+9 −5
Original line number Diff line number Diff line
@@ -651,7 +651,8 @@ ivas_error ivas_init_decoder_front( 
     *--------------------------------------------------------------------*/



#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

    if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_HRIR || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_BRIR || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB )

    if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM ||

         st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_HRIR || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_BRIR || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB )

#else

    if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM )

#endif
@@ -662,7 +663,9 @@ ivas_error ivas_init_decoder_front( 
        }



#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( ( error = ivas_render_config_init_from_rom( &st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_config ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_render_config_init_from_rom( &st_ivas->hRenderConfig,

            st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_BRIR || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB,

            st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_BRIR || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB ) ) != IVAS_ERR_OK )

#else

        if ( ( error = ivas_render_config_init_from_rom( &st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM ) ) != IVAS_ERR_OK )

#endif
@@ -2210,7 +2213,8 @@ static ivas_error doSanityChecks_IVAS( 
    if ( st_ivas->hDecoderConfig->Opt_Headrotation )

    {

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( !( output_config == AUDIO_CONFIG_BINAURAL_HRIR || output_config == AUDIO_CONFIG_BINAURAL_BRIR || output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB ) )

        if ( !( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM ||

                output_config == AUDIO_CONFIG_BINAURAL_HRIR || output_config == AUDIO_CONFIG_BINAURAL_BRIR || output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB) )

#else

        if ( !( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM ) )

#endif
@@ -2222,9 +2226,9 @@ static ivas_error doSanityChecks_IVAS( 
#ifdef DEBUGGING

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

#ifdef MC_PARAMUPMIX_MODE

    if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || output_config != AUDIO_CONFIG_BINAURAL_HRIR || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && ( st_ivas->mc_mode != MC_MODE_MCT && st_ivas->mc_mode != MC_MODE_PARAMUPMIX ) ) ) )

    if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || ( output_config != AUDIO_CONFIG_BINAURAL && output_config != AUDIO_CONFIG_BINAURAL_HRIR ) || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && ( st_ivas->mc_mode != MC_MODE_MCT && st_ivas->mc_mode != MC_MODE_PARAMUPMIX ) ) ) )

#else

    if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || output_config != AUDIO_CONFIG_BINAURAL_HRIR || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) )

    if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || ( output_config != AUDIO_CONFIG_BINAURAL && output_config != AUDIO_CONFIG_BINAURAL_HRIR ) || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) )

#endif

#else

#ifdef MC_PARAMUPMIX_MODE

lib_dec/ivas_ism_dec.c

+8 −4
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ static ivas_error ivas_ism_bitrate_switching( 
        ivas_param_ism_dec_close( &( st_ivas->hDirAC ), st_ivas->hDecoderConfig->output_config );



#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_HRIR )

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL ||

             st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_HRIR )

#else

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL )

#endif
@@ -222,7 +223,8 @@ static ivas_error ivas_ism_bitrate_switching( 
        }



#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_BRIR || st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB )

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM ||

             st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_BRIR || st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB )

#else

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM )

#endif
@@ -255,7 +257,8 @@ static ivas_error ivas_ism_bitrate_switching( 
        }



#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_HRIR )

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL ||

             st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_HRIR )

#else

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL )

#endif
@@ -296,7 +299,8 @@ static ivas_error ivas_ism_bitrate_switching( 
        }



#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_BRIR || st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB )

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM ||

             st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_BRIR || st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB )

#else

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM )

#endif