Commit 6afb4bad authored by emerit's avatar emerit
Browse files

Merge branch 'main' into orange/no-diegetic-pan-with-radius

parents 3c6456b7 6f413198

apps/decoder.c

+44 −14
Original line number Diff line number Diff line
@@ -272,19 +272,50 @@ int main( 
    /*------------------------------------------------------------------------------------------*

     * Open reference rotation file

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



    if ( arg.enableReferenceRotation )

    {

        /* sanity check */

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

        {

            fprintf( stderr, "\nError: Reference rotation file cannot be used in this output configuration.\n\n" );

            goto cleanup;

        }



        /* sanity check */

        if ( arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF )

        {

            fprintf( stderr, "\nError: Reference rotation file can be used in '-otr ref' mode only.\n\n" );

            goto cleanup;

        }



        if ( ( error = HeadRotationFileReader_open( arg.refrotTrajFileName, &refRotReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Can't open reference rotation file %s \n\n", arg.refrotTrajFileName );

            goto cleanup;

        }

    }



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

     * Open reference vector trajectory file

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



    if ( arg.enableReferenceVectorTracking )

    {

        /* sanity check */

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

        {

            fprintf( stderr, "\nError: Reference vector trajectory file cannot be used in this output configuration.\n\n" );

            goto cleanup;

        }



        /* sanity check */

        if ( arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF_VEC && arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF_VEC_LEV )

        {

            fprintf( stderr, "\nError: Reference trajectory file can be used in '-otr ref_vec' or '-otr ref_vec_lev' mode only.\n\n" );

            goto cleanup;

        }



        if ( ( error = Vector3PairFileReader_open( arg.referenceVectorTrajFileName, &referenceVectorReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Can't open reference vector trajectory file %s \n\n", arg.referenceVectorTrajFileName );
@@ -882,9 +913,7 @@ static bool parseCmdlIVAS_dec( 
        }

#ifdef DEBUG_MODE_INFO

#ifdef DEBUG_MODE_INFO_TWEAK

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

         * Define additional subfolder for debug info output in ./res

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

        /* Define additional subfolder for debug info output in ./res */

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

        {

            extern char infoFolder[FILENAME_MAX];
@@ -1187,8 +1216,19 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      Format files, the magic word in the mime file is used to determine\n" );

    fprintf( stdout, "                      which of the two supported formats is in use.\n" );

    fprintf( stdout, "                      default bitstream file format is G.192\n" );

    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" );

    fprintf( stdout, "-T File             : Head rotation specified by external trajectory File\n" );

    fprintf( stdout, "-otr tracking_type  : Head orientation tracking type: 'none', 'ref', 'avg', 'ref_vec' \n" );

    fprintf( stdout, "                      or 'ref_vec_lev' (only for binaural rendering)\n" );

    fprintf( stdout, "-rf File            : Reference rotation specified by external trajectory file\n" );

    fprintf( stdout, "                      works only in combination with '-otr ref' mode \n" );

    fprintf( stdout, "-rvf File           : Reference vector specified by external trajectory file\n" );

    fprintf( stdout, "                      works only in combination with '-otr ref_vec' and 'ref_vec_lev' modes\n" );

    fprintf( stdout, "-render_config File : Renderer configuration File\n" );

    fprintf( stdout, "-no_diegetic_pan    : panning mono non-diegetic sound to stereo -1<= pan <=1,\n" );

    fprintf( stdout, "                      left or l or 1->left, right or r or -1->right, center or c or  0->middle\n" );

    fprintf( stdout, "-q                  : Quiet mode, no frame counter\n" );

    fprintf( stdout, "                      default is deactivated\n" );

#ifdef DEBUGGING

    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" );
@@ -1197,16 +1237,6 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      default is OFF, if this option is not used\n" );

    fprintf( stdout, "-force R            : Force specific binaural rendering mode, R = (TDREND, CLDFBREND),\n" );

#endif

    fprintf( stdout, "-otr tracking_type  : head orientation tracking type: 'none', 'ref' or 'avg'  (only for binaural rendering)\n" );

    fprintf( stdout, "-rf File            : Reference rotation specified by external trajectory file\n" );

    fprintf( stdout, "                      works only in combination with -otr ref mode\n" );

    fprintf( stdout, "-rvf File           : Reference vector specified by external trajectory file\n" );

    fprintf( stdout, "                      works only in combination with -otr ref_vec and ref_vec_lev modes\n" );

    fprintf( stdout, "-render_config file : Renderer configuration file\n" );

    fprintf( stdout, "-no_diegetic_pan    : panning mono no dietic sound to stereo -1<= pan <=1,\n" );

    fprintf( stdout, "                      left or l or 1->left, right or r or -1->right, center or c or  0->middle\n" );

    fprintf( stdout, "-q                  : Quiet mode, no frame counter\n" );

    fprintf( stdout, "                      default is deactivated\n" );

#ifdef DEBUG_MODE_INFO

#ifdef DEBUG_MODE_INFO_TWEAK

    fprintf( stdout, "-info <folder>      : specify subfolder name for debug output\n" );

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ 
#define DISABLE_ADAP_RES_COD_TMP                        /* temporary fix for IVAS-403, disables adaptive residual coding */

/*#define ITD_WINNER_GAIN_MODIFY */                     /* ITD optimization - WORK IN PROGRESS */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define FIX_103_RA_PARAMS_PARAM_BIN_REND                /* Issue 103: Digest room acoustics parameters for Parametric Binaural Renderer*/

/*#define SBA_HPF_TUNING_DEC*/



#define FIX_350_MASA_DELAY_COMP                         /* Nokia: Issue 350: MASA audio/meta delay compensation */

lib_dec/lib_dec.c

+19 −0
Original line number Diff line number Diff line
@@ -1997,6 +1997,25 @@ static ivas_error printConfigInfo_dec( 
        {

            fprintf( stdout, "Head rotation:          ON\n" );

        }



        if ( st_ivas->hDecoderConfig->orientation_tracking != IVAS_ORIENT_TRK_NONE )

        {

            switch ( st_ivas->hDecoderConfig->orientation_tracking )

            {

                case IVAS_ORIENT_TRK_AVG:

                    fprintf( stdout, "Orientation tracking:   AVG\n" );

                    break;

                case IVAS_ORIENT_TRK_REF:

                    fprintf( stdout, "Orientation tracking:   REF\n" );

                    break;

                case IVAS_ORIENT_TRK_REF_VEC:

                    fprintf( stdout, "Orientation tracking:   REF_VEC\n" );

                    break;

                case IVAS_ORIENT_TRK_REF_VEC_LEV:

                    fprintf( stdout, "Orientation tracking:   REF_VEC_LEV\n" );

                    break;

            }

        }

    }



    return IVAS_ERR_OK;

lib_rend/ivas_reverb.c

+23 −0
Original line number Diff line number Diff line
@@ -1894,6 +1894,28 @@ ivas_error ivas_binaural_reverb_open( 
        }

    }





#ifdef FIX_103_RA_PARAMS_PARAM_BIN_REND

    if ( ( roomAcoustics ) && ( roomAcoustics->override ) )

    {

        ivas_reverb_prepare_cldfb_params( roomAcoustics, hHrtfFastConv, output_config, roomAcoustics->use_brir, sampling_rate, t60, ene );

        ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, t60, ene );

        ivas_binaural_reverb_setPreDelay( hReverb, (int16_t) roundf( 48000.0f * roomAcoustics->acousticPreDelay / CLDFB_NO_CHANNELS_MAX ) );

    }

    else

    {

        if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

        {

            ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfFastConv->fastconvReverberationTimes, hHrtfFastConv->fastconvReverberationEneCorrections );

            ivas_binaural_reverb_setPreDelay( hReverb, 10 );

        }

        else

        {

            ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfParambin->parametricReverberationTimes, hHrtfParambin->parametricReverberationEneCorrections );

            ivas_binaural_reverb_setPreDelay( hReverb, 10 );

        }

    }

#else

    if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

    {

        if ( !roomAcoustics->override )
@@ -1914,6 +1936,7 @@ ivas_error ivas_binaural_reverb_open( 
        ivas_binaural_reverb_setPreDelay( hReverb, 10 );

    }



#endif

    return IVAS_ERR_OK;

}

readme.txt

+13 −7
Original line number Diff line number Diff line
@@ -255,20 +255,26 @@ Options: 
                      Format files, the magic word in the mime file is used to determine

                      which of the two supported formats is in use.

                      default bitstream file format is G.192

-T File             : Head rotation specified by external trajectory File

-hrtf File          : HRTF filter File used in ISm format and BINAURAL output configuration

-T File             : Head rotation specified by external trajectory File

-otr tracking_type  : Head orientation tracking type: 'none', 'ref', 'avg', 'ref_vec'

                      or 'ref_vec_lev' (only for binaural rendering)

-rf File            : Reference rotation specified by external trajectory file

                      works only in combination with '-otr ref' mode

-rvf File           : Reference vector specified by external trajectory file

                      works only in combination with '-otr ref_vec' and 'ref_vec_lev' modes

-render_config File : Renderer configuration option File

-no_diegetic_pan    : panning mono non-diegetic sound to stereo -1<= pan <=1,

                      left or l or 1->left, right or r or -1->right, center or c or  0->middle

-q                  : Quiet mode, no frame counter

                      default is deactivated

-FEC X              : Insert frame erasures, X = 0-10 is the percentage

                      of erased frames, or X may be the name of binary file or

                      file with G192 headers indicating GOOD FRAME or BAD FRAME

                      containing FEC pattern (short values of 0 (good) or 1 (bad))

                      default is OFF, if this option is not used

-force R            : Force specific binaural rendering mode, R = (TDREND, CLDFBREND),

-otr tracking_type  : head orientation tracking type: 'ref' or 'avg' (only for binaural rendering)

-render_config File : Renderer configuration option File

-no_diegetic_pan    : panning mono no dietic sound to stereo -1<= pan <=1,

                      left or l or 1->left, right or r or -1->right, center or c or  0->middle

-q                  : Quiet mode, no frame counter

                      default is deactivated

					  





                       MULTICHANNEL LOUDSPEAKER INPUT / OUTPUT CONFIGURATIONS