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

Merge branch 'philips/contribution-38-control-metadata-reverb' to... 

Merge branch 'philips/contribution-38-control-metadata-reverb' to 'philips/contribution-38-control-metadata-reverb-acoustic-environment-payload'
parents 2e820810 c26f8af8

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ complexity-ism-in-binaural-out: 
    - *complexity-measurements-setup

    - in_format=ISM

    - out_format=BINAURAL

    - bash ci/complexity_measurements/getWmops.sh "ISM1 ISM2 ISM3 ISM4" "$out_format"

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format"

    - *complexity-measurements-prepare-artifacts



complexity-sba-hoa3-in-hoa3-out:

apps/decoder.c

+10 −2
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ int main( 
        }



#ifdef CONTROL_METADATA_REVERB

        if ( RenderConfigReader_read( renderConfigReader ) != IVAS_ERR_OK )

        if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )

#else

        if ( RenderConfigReader_read( renderConfigReader, &renderConfig ) != IVAS_ERR_OK )

#endif
@@ -516,7 +516,15 @@ int main( 
        }



#ifdef CONTROL_METADATA_REVERB

        if ( RenderConfigReader_getAcousticEnvironment( renderConfigReader, ACOUSTIC_ENVIRONMENT_ID, &renderConfig.room_acoustics ) != IVAS_ERR_OK )

        if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, ACOUSTIC_ENVIRONMENT_ID, &renderConfig.room_acoustics ) ) == IVAS_ERR_OK )

        {

            if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "Invalid reverberation configuration parameters\n\n" );

                goto cleanup;

            }

        }

        else if ( error != IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING )

        {

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

            goto cleanup;

apps/renderer.c

+10 −2
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ int main( 
        }



#ifdef CONTROL_METADATA_REVERB

        if ( RenderConfigReader_read( renderConfigReader ) != IVAS_ERR_OK )

        if ( RenderConfigReader_read( renderConfigReader, args.renderConfigFilePath, &renderConfig ) != IVAS_ERR_OK )

#else

        if ( RenderConfigReader_read( renderConfigReader, &renderConfig ) != IVAS_ERR_OK )

#endif
@@ -742,7 +742,15 @@ int main( 
        }



#ifdef CONTROL_METADATA_REVERB

        if ( RenderConfigReader_getAcousticEnvironment( renderConfigReader, ACOUSTIC_ENVIRONMENT_ID, &renderConfig.room_acoustics ) != IVAS_ERR_OK )

        if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, ACOUSTIC_ENVIRONMENT_ID, &renderConfig.room_acoustics ) ) == IVAS_ERR_OK )

        {

            if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "Invalid reverberation configuration parameters\n\n" );

                exit( -1 );

            }

        }

        else if ( error != IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING )

        {

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

            exit( -1 );

lib_com/cnst.h

+6 −1
Original line number Diff line number Diff line
@@ -1434,7 +1434,12 @@ typedef enum _DCTTYPE 
#define CHEAP_NORM_SIZE                     161



#define CNA_MAX_BRATE                       ACELP_13k20



#ifdef FIX_I414_OOA_CNA

#define CNA_INIT_NBANDS                     6

#else

#define MAX_CNA_NBANDS                      12

#endif



#define GAIN_Q_OFFSET_EVS 60.f

#define GAIN_Q_OFFSET_IVAS 45.f

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ 
#define FIX_398_MASA_DIRECTION_ALIGNMENT                /* Nokia: Issue 398: in 2dir MASA, dynamically adjust directions to be consistent */

#define REND_DEBUGGING_REVISION                         /* VA: encapsulate rendering debugging options with DEBUGGING */

#define FIX_419_ISM_MD_FIX                              /* VA: Issue 419: fix the upper value limitation for parameter angle1_diff_cnt */

#define FIX_I414_OOA_CNA                                /* VA: Issue 414: Fixing out-of-array write operation in stereo CNA */





#define SNS_MSVQ                                        /* FhG: contribution 33 - MSVQ for SNS parameters at stereo mid bitrates */