Commit a39314cf authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into 103-Digest-room-acoustics-parameters-for-Parametric-Binaural-Renderer

parents 214a3f59 bac64da0

apps/decoder.c

+12 −0
Original line number Diff line number Diff line
@@ -105,7 +105,9 @@ typedef struct 
    char *renderConfigFilename;



#ifdef DEBUGGING

#ifndef REMOVE_FORCE_SUBFRAME_BIN

    bool forceSubframeBinauralization;

#endif

    IVAS_DEC_FORCED_REND_MODE forcedRendMode;

#ifdef DEBUG_FOA_AGC

    FILE *agcBitstream; /* temporary */
@@ -271,10 +273,14 @@ int main( 
     * Configure the decoder

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



#ifdef REMOVE_FORCE_SUBFRAME_BIN

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation ) ) != IVAS_ERR_OK )

#else

#ifdef DEBUGGING

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.forceSubframeBinauralization ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation ) ) != IVAS_ERR_OK )

#endif

#endif

    {

        fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -667,7 +673,9 @@ static bool parseCmdlIVAS_dec( 
    float ftmp;



    arg->forcedRendMode = IVAS_DEC_FORCE_REND_UNFORCED;

#ifndef REMOVE_FORCE_SUBFRAME_BIN

    arg->forceSubframeBinauralization = false;

#endif

#ifdef DEBUG_FOA_AGC

    arg->agcBitstream = NULL;

#endif
@@ -819,11 +827,13 @@ static bool parseCmdlIVAS_dec( 
                i++;

            }

        }

#ifndef REMOVE_FORCE_SUBFRAME_BIN

        else if ( strcmp( argv_to_upper, "-FORCE_SUBFRAME_BIN" ) == 0 ) /* Force binauralization to subframe (5 ms) resolution */

        {

            arg->forceSubframeBinauralization = true;

            i++;

        }

#endif

#ifdef DEBUG_MODE_INFO

#ifdef DEBUG_MODE_INFO_TWEAK

        /*-----------------------------------------------------------------*
@@ -1073,8 +1083,10 @@ static void usage_dec( void ) 
    fprintf( stdout, "-T File             : Head rotation specified by external trajectory File\n" );

    fprintf( stdout, "-hrtf File          : HRTF filter File used in BINAURAL output configuration\n" );

#ifdef DEBUGGING

#ifndef REMOVE_FORCE_SUBFRAME_BIN

    fprintf( stdout, "-force_subframe_bin : Forces parametric binauralizer code to use 5 ms time resolution even when\n" );

    fprintf( stdout, "                      output time resolution is larger.\n" );

#endif

    fprintf( stdout, "-FEC X              : Insert frame erasures, X = 0-10 is the percentage\n" );

    fprintf( stdout, "                      of erased frames, or X may be the name of binary file or \n" );

    fprintf( stdout, "                      file with G192 headers indicating GOOD FRAME or BAD FRAME\n" );

lib_com/ivas_masa_com.c

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ void ivas_masa_set_coding_config( 
    return;

}





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

 * masa_sample_rate_band_correction()

 *

lib_com/ivas_mc_com.c

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ MC_MODE ivas_mc_mode_select( 
    return mc_mode;

}





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

 * ivas_mc_setup_get_num_channels()

 *
@@ -154,6 +155,7 @@ int16_t ivas_mc_ls_setup_get_num_channels( 
    return nchan;

}





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

 * ivas_mc_map_output_config_to_mc_ls_setup()

 *
@@ -193,6 +195,7 @@ MC_LS_SETUP ivas_mc_map_output_config_to_mc_ls_setup( 
    return mc_ls_setup;

}





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

 * ivas_mc_map_ls_setup_to_output_config

 *

lib_com/ivas_mc_param_com.c

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ void ivas_param_mc_metadata_close( 
{

    uint16_t i;





    /* adaptive ICC mapping */

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

    {
@@ -422,6 +421,7 @@ static int16_t ivas_param_mc_get_num_param_bands( 
    return num_parameter_bands;

}





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

 * Local functions

 *------------------------------------------------------------------------*/
@@ -438,7 +438,6 @@ static void ivas_param_mc_set_coding_scheme( 
    HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC /* i/o: Parametric MC metadata handle    */

)

{



    /* quantizer and coding tables */

    switch ( mc_ls_setup )

    {
@@ -520,5 +519,6 @@ static void ivas_param_mc_set_coding_scheme( 
    }



    hMetadataPMC->num_parameter_bands = ivas_param_mc_get_num_param_bands( mc_ls_setup, ivas_total_brate );



    return;

}

lib_com/ivas_mcmasa_com.c

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ void ivas_mcmasa_setNumTransportChannels( 
    return;

}





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

 * ivas_mcmasa_set_separate_channel_mode()

 *