Commit 611ec212 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'remotes/origin/Nokia/contribution-omasa-combined-format' into VoiceAge/contribution-omasa-combined-format_updt
parents 902c4f33 7bba4f3a

lib_com/ivas_prot.h

+8 −0
Original line number Diff line number Diff line
@@ -4860,6 +4860,10 @@ ivas_error vbap_init_data( 
    const float *speaker_node_azi_deg,                          /* i  : vector of speaker node azimuths (positive left)          */

    const float *speaker_node_ele_deg,                          /* i  : vector of speaker node elevations (positive up)          */

    const int16_t num_speaker_nodes                             /* i  : number of speaker nodes in the set                       */

#ifdef OMASA_UPDATES

    ,

    const int16_t support_object_mode                           /* i  : init VBAP also for object panning mode                   */

#endif

);



void vbap_free_data(
@@ -4871,6 +4875,10 @@ void vbap_determine_gains( 
    float *gains,                                               /* o  : gain vector for speaker nodes for given direction        */

    const int16_t azi_deg,                                      /* i  : azimuth in degrees for panning direction (positive left) */

    const int16_t ele_deg                                       /* i  : elevation in degrees for panning direction (positive up) */

#ifdef OMASA_UPDATES

    ,

    const int16_t use_object_mode                               /* i  : select between object mode panning and spatial mode panning */

#endif

);



void v_sort_ind(

lib_dec/ivas_core_dec.c

100755 → 100644
+1 −1

File changed.File mode changed from 100755 to 100644.

Contains only whitespace changes.

lib_dec/ivas_dirac_dec.c

+8 −2
Original line number Diff line number Diff line
@@ -609,11 +609,17 @@ ivas_error ivas_dirac_dec_config( 
        {

            vbap_free_data( &( st_ivas->hVBAPdata ) );

        }



#ifdef OMASA_UPDATES

        if ( ( error = vbap_init_data( &( st_ivas->hVBAPdata ), ls_azimuth, ls_elevation, nchan_out_woLFE, st_ivas->ivas_format == MASA_ISM_FORMAT ? 1 : 0 ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#else

        if ( ( error = vbap_init_data( &( st_ivas->hVBAPdata ), ls_azimuth, ls_elevation, nchan_out_woLFE ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#endif

    }

    else if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_MONO )

    {

lib_dec/ivas_dirac_output_synthesis_dec.c

+17 −0
Original line number Diff line number Diff line
@@ -1738,11 +1738,19 @@ void ivas_dirac_dec_compute_directional_responses( 
                    {

                        if ( hMasaIsm->ism_is_edited[dir] )

                        {

#ifdef OMASA_UPDATES

                            vbap_determine_gains( hVBAPdata, direct_response_temp, hMasaIsm->azimuth_ism_edited[dir], hMasaIsm->elevation_ism_edited[dir], 1 );

#else

                            vbap_determine_gains( hVBAPdata, direct_response_temp, hMasaIsm->azimuth_ism_edited[dir], hMasaIsm->elevation_ism_edited[dir] );

#endif

                        }

                        else

                        {

#ifdef OMASA_UPDATES

                            vbap_determine_gains( hVBAPdata, direct_response_temp, hMasaIsm->azimuth_ism[dir], hMasaIsm->elevation_ism[dir], 1 );

#else

                            vbap_determine_gains( hVBAPdata, direct_response_temp, hMasaIsm->azimuth_ism[dir], hMasaIsm->elevation_ism[dir] );

#endif

                        }



                        for ( l = 0; l < num_channels_dir; l++ )
@@ -2259,12 +2267,21 @@ static void spreadCoherencePanningVbap( 
        return;

    }



#ifdef OMASA_UPDATES

    vbap_determine_gains( hVBAPdata, direct_response, azimuth, elevation, 0 );

#else

    vbap_determine_gains( hVBAPdata, direct_response, azimuth, elevation );

#endif



    if ( spreadCoh > 0.f )

    {

#ifdef OMASA_UPDATES

        vbap_determine_gains( hVBAPdata, direct_response_left, azimuth + 30, elevation, 0 );

        vbap_determine_gains( hVBAPdata, direct_response_right, azimuth - 30, elevation, 0 );

#else

        vbap_determine_gains( hVBAPdata, direct_response_left, azimuth + 30, elevation );

        vbap_determine_gains( hVBAPdata, direct_response_right, azimuth - 30, elevation );

#endif



        if ( spreadCoh < 0.5f )

        {

lib_dec/ivas_init_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1357,7 +1357,11 @@ ivas_error ivas_init_decoder( 
                }

                else

                {

#ifdef OMASA_UPDATES

                    vbap_determine_gains( st_ivas->hVBAPdata, st_ivas->hLsSetupCustom->separate_ch_gains, 0, 0, 0 );

#else

                    vbap_determine_gains( st_ivas->hVBAPdata, st_ivas->hLsSetupCustom->separate_ch_gains, 0, 0 );

#endif

                }

            }