Commit 5959e930 authored by vaclav's avatar vaclav
Browse files

fix compilation switch names

parent 7b4bdcf6

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ void ivas_write_format( 
void ivas_write_format_sid(

    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */

    const int16_t element_mode,                                 /* i  : element bitrate                         */

#ifdef NONBE_FIX_1052_SBA_EXT

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

    BSTR_ENC_HANDLE hBstr,                                      /* i/o: encoder bitstream handle                */

    const int16_t sba_order,                                    /* i  : Ambisonic (SBA) order                   */

    const int16_t sba_planar                                    /* i  : SBA planar flag                         */

lib_enc/ivas_cpe_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ ivas_error ivas_cpe_enc( 


    if ( sts[0]->core_brate == SID_2k40 )

    {

#ifdef NONBE_FIX_1052_SBA_EXT

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

        ivas_write_format_sid( ivas_format, hCPE->element_mode, sts[0]->hBstr, hEncoderConfig->sba_order, hEncoderConfig->sba_planar );

#else

        ivas_write_format_sid( ivas_format, hCPE->element_mode, sts[0]->hBstr );

lib_enc/ivas_init_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ void ivas_write_format( 
void ivas_write_format_sid(

    const IVAS_FORMAT ivas_format, /* i  : IVAS format               */

    const int16_t element_mode,    /* i  : element bitrate           */

#ifdef NONBE_FIX_1052_SBA_EXT

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

    BSTR_ENC_HANDLE hBstr,   /* i/o: encoder bitstream handle  */

    const int16_t sba_order, /* i  : Ambisonic (SBA) order     */

    const int16_t sba_planar /* i  : SBA planar flag           */

lib_enc/ivas_ism_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ ivas_error ivas_ism_enc( 


    if ( sid_flag )

    {

#ifdef NONBE_FIX_1052_SBA_EXT

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

        ivas_write_format_sid( st_ivas->hEncoderConfig->ivas_format, IVAS_SCE, st->hBstr, -1, -1 );

#else

        ivas_write_format_sid( st_ivas->hEncoderConfig->ivas_format, IVAS_SCE, st->hBstr );

lib_enc/ivas_sce_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ ivas_error ivas_sce_enc( 


    if ( st->core_brate == SID_2k40 )

    {

#ifdef NONBE_FIX_1052_SBA_EXT

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

        ivas_write_format_sid( ivas_format, IVAS_SCE, st->hBstr, st_ivas->hEncoderConfig->sba_order, st_ivas->hEncoderConfig->sba_planar );

#else

        ivas_write_format_sid( ivas_format, IVAS_SCE, st->hBstr );