Commit 8e1b1a5c authored by vaclav's avatar vaclav
Browse files

formal improvements

parent b1f5fd5f

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -3130,6 +3130,7 @@ static ivas_error doSanityChecks_IVAS( 
        return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Error: Only 48kHz output sampling rate is supported for split rendering." );

    }

#endif



    if ( st_ivas->hDecoderConfig->Opt_Headrotation )

    {

        if ( !( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
@@ -3145,7 +3146,6 @@ static ivas_error doSanityChecks_IVAS( 
        }

    }





    if ( st_ivas->hDecoderConfig->Opt_ExternalOrientation )

    {

        if ( !( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

lib_dec/ivas_output_config.c

+10 −7
Original line number Diff line number Diff line
@@ -85,15 +85,15 @@ void ivas_renderer_select( 
        nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );

        if ( output_config == IVAS_AUDIO_CONFIG_HOA3 && st_ivas->hDecoderConfig->Opt_Headrotation && nchan_internal >= 2 )

        {

            st_ivas->hCombinedOrientationData->shd_rot_max_order = 0;



#ifdef NONBE_FIX_998_DIRAC_ROTATION

            st_ivas->hCombinedOrientationData->shd_rot_max_order = 1;

#else

            st_ivas->hCombinedOrientationData->shd_rot_max_order = 0;

#endif

        }

    }

#endif



#endif

    if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB

#ifdef SPLIT_REND_WITH_HEAD_ROT

         || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM
@@ -197,18 +197,21 @@ void ivas_renderer_select( 
            {



                nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );



#ifdef NONBE_FIX_998_DIRAC_ROTATION

                if ( nchan_internal == 4 || nchan_internal == 3 || nchan_internal == 2 )

#else

                if ( nchan_internal == 2 )

#endif

                {

                    st_ivas->hCombinedOrientationData->shd_rot_max_order = 1;

                }

#ifndef NONBE_FIX_998_DIRAC_ROTATION

                else if ( nchan_internal == 4 || nchan_internal == 3 )

                {

#ifdef NONBE_FIX_998_DIRAC_ROTATION

                    st_ivas->hCombinedOrientationData->shd_rot_max_order = 1;

#else

                    st_ivas->hCombinedOrientationData->shd_rot_max_order = 0;

#endif

                }

#endif

                else if ( nchan_internal == 6 || nchan_internal == 5 )

                {

                    st_ivas->hCombinedOrientationData->shd_rot_max_order = 2;