Commit eb7694e6 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_613_DIRAC_NULL_PTR_USAN

parent c9de58b8

lib_com/ivas_dirac_com.c

+0 −14
Original line number Diff line number Diff line
@@ -111,20 +111,13 @@ ivas_error ivas_dirac_config( 
        if ( ( (Encoder_Struct *) st_ivas )->hSpar != NULL )

        {

            hFbMdft = ( (Encoder_Struct *) st_ivas )->hSpar->hFbMixer;

#ifdef FIX_613_DIRAC_NULL_PTR_USAN

            dirac_to_spar_md_bands = ( (Encoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;

#endif

        }

        else

        {

            hFbMdft = NULL;

#ifdef FIX_613_DIRAC_NULL_PTR_USAN

            dirac_to_spar_md_bands = NULL;

#endif

        }

#ifndef FIX_613_DIRAC_NULL_PTR_USAN

        dirac_to_spar_md_bands = ( (Encoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;

#endif

    }

    else

    {
@@ -139,21 +132,14 @@ ivas_error ivas_dirac_config( 
        if ( ( (Decoder_Struct *) st_ivas )->hSpar != NULL )

        {

            hFbMdft = ( (Decoder_Struct *) st_ivas )->hSpar->hFbMixer;

#ifdef FIX_613_DIRAC_NULL_PTR_USAN

            dirac_to_spar_md_bands = ( (Decoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;

#endif

        }

        else

        {

            hFbMdft = NULL;

#ifdef FIX_613_DIRAC_NULL_PTR_USAN

            dirac_to_spar_md_bands = NULL;

#endif

        }

        ( (Decoder_Struct *) st_ivas )->hDirAC->hFbMdft = hFbMdft;

#ifndef FIX_613_DIRAC_NULL_PTR_USAN

        dirac_to_spar_md_bands = ( (Decoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;

#endif

    }



#ifdef SBA_AND_OBJECTS

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 






#define FIX_613_DIRAC_NULL_PTR_USAN                     /* Nokia: Issue #613: USAN in DirAC decoder setup */

#define FIX_647_SILENT_W_PARAMBIN                       /* Nokia: Issue #647: Fix silent W SH inputs in parametric binauralizer */



#define FIX_672_NOKIA_TODO                              /* Nokia: Issue #672: Resolve Nokia TODOs */