Loading lib_com/ivas_spar_com_fx.c +22 −0 Original line number Diff line number Diff line Loading @@ -4257,10 +4257,19 @@ void ivas_get_spar_md_from_dirac_enc_fx( { Word32 norm_fx; Word16 norm_q; #ifdef NONBE_FIX_1748_SPAR_DIV_OPT Word16 num_ch_order; #else Word16 num_ch_order, hoa2_ch_order; #endif num_ch_order = ivas_sba_get_nchan_fx( order, 0 ); #ifndef NONBE_FIX_1748_SPAR_DIV_OPT hoa2_ch_order = ivas_sba_get_nchan_fx( SBA_HOA2_ORDER, 0 ); #else assert( order == 1 ); #endif FOR( ch = 0; ch < num_ch_order; ch++ ) { Loading Loading @@ -4327,6 +4336,8 @@ void ivas_get_spar_md_from_dirac_enc_fx( } } #ifndef NONBE_FIX_1748_SPAR_DIV_OPT /*normalize 2nd order*/ norm_fx = 0; move32(); Loading Loading @@ -4426,6 +4437,7 @@ void ivas_get_spar_md_from_dirac_enc_fx( move32(); } } #endif } } Loading Loading @@ -4815,10 +4827,18 @@ void ivas_get_spar_md_from_dirac_fx( { Word32 norm_fx; Word16 norm_q; #ifdef NONBE_FIX_1748_SPAR_DIV_OPT Word16 num_ch_order; #else Word16 num_ch_order, hoa2_ch_order; #endif num_ch_order = ivas_sba_get_nchan_fx( order, 0 ); #ifndef NONBE_FIX_1748_SPAR_DIV_OPT hoa2_ch_order = ivas_sba_get_nchan_fx( SBA_HOA2_ORDER, 0 ); #else assert( order == 1 ); #endif FOR( ch = 0; ch < num_ch_order; ch++ ) { Loading Loading @@ -4885,6 +4905,7 @@ void ivas_get_spar_md_from_dirac_fx( } } #ifndef NONBE_FIX_1748_SPAR_DIV_OPT /*normalize 2nd order*/ norm_fx = 0; move32(); Loading Loading @@ -4984,6 +5005,7 @@ void ivas_get_spar_md_from_dirac_fx( move32(); } } #endif } } Loading lib_com/options.h +2 −0 Original line number Diff line number Diff line Loading @@ -119,4 +119,6 @@ #define NONBE_FIX_864_JBM_RENDER_FRAMESIZE /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */ #define NONBE_FIX_1748_SPAR_DIV_OPT /*Dlb: issue 1748: SPAR common div optimizations*/ #endif Loading
lib_com/ivas_spar_com_fx.c +22 −0 Original line number Diff line number Diff line Loading @@ -4257,10 +4257,19 @@ void ivas_get_spar_md_from_dirac_enc_fx( { Word32 norm_fx; Word16 norm_q; #ifdef NONBE_FIX_1748_SPAR_DIV_OPT Word16 num_ch_order; #else Word16 num_ch_order, hoa2_ch_order; #endif num_ch_order = ivas_sba_get_nchan_fx( order, 0 ); #ifndef NONBE_FIX_1748_SPAR_DIV_OPT hoa2_ch_order = ivas_sba_get_nchan_fx( SBA_HOA2_ORDER, 0 ); #else assert( order == 1 ); #endif FOR( ch = 0; ch < num_ch_order; ch++ ) { Loading Loading @@ -4327,6 +4336,8 @@ void ivas_get_spar_md_from_dirac_enc_fx( } } #ifndef NONBE_FIX_1748_SPAR_DIV_OPT /*normalize 2nd order*/ norm_fx = 0; move32(); Loading Loading @@ -4426,6 +4437,7 @@ void ivas_get_spar_md_from_dirac_enc_fx( move32(); } } #endif } } Loading Loading @@ -4815,10 +4827,18 @@ void ivas_get_spar_md_from_dirac_fx( { Word32 norm_fx; Word16 norm_q; #ifdef NONBE_FIX_1748_SPAR_DIV_OPT Word16 num_ch_order; #else Word16 num_ch_order, hoa2_ch_order; #endif num_ch_order = ivas_sba_get_nchan_fx( order, 0 ); #ifndef NONBE_FIX_1748_SPAR_DIV_OPT hoa2_ch_order = ivas_sba_get_nchan_fx( SBA_HOA2_ORDER, 0 ); #else assert( order == 1 ); #endif FOR( ch = 0; ch < num_ch_order; ch++ ) { Loading Loading @@ -4885,6 +4905,7 @@ void ivas_get_spar_md_from_dirac_fx( } } #ifndef NONBE_FIX_1748_SPAR_DIV_OPT /*normalize 2nd order*/ norm_fx = 0; move32(); Loading Loading @@ -4984,6 +5005,7 @@ void ivas_get_spar_md_from_dirac_fx( move32(); } } #endif } } Loading
lib_com/options.h +2 −0 Original line number Diff line number Diff line Loading @@ -119,4 +119,6 @@ #define NONBE_FIX_864_JBM_RENDER_FRAMESIZE /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */ #define NONBE_FIX_1748_SPAR_DIV_OPT /*Dlb: issue 1748: SPAR common div optimizations*/ #endif