Loading lib_com/core_com_config_fx.c +75 −14 Original line number Diff line number Diff line Loading @@ -182,20 +182,6 @@ Word16 getTcxonly_fx( const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) Q0*/ const Word16 is_ism_format /* i : flag indicating ISM format Q0*/ ) #else /*-------------------------------------------------------------------* * getTcxonly_ivas() * * *-------------------------------------------------------------------*/ Word16 getTcxonly_ivas_fx( const Word16 element_mode, /* i : IVAS element mode Q0*/ const Word32 total_brate, /* i : total bitrate Q0*/ const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) Q0*/ const Word16 is_ism_format /* i : flag indicating ISM format Q0*/ ) #endif /* FIX_2385_GETTCXONLY */ { Word16 tcxonly = 0; move16(); Loading Loading @@ -250,6 +236,81 @@ Word16 getTcxonly_ivas_fx( return tcxonly; /*Q0*/ } #else /*-------------------------------------------------------------------* * getTcxonly_ivas() * * *-------------------------------------------------------------------*/ Word16 getTcxonly_ivas_fx( const Word16 element_mode, /* i : IVAS element mode Q0*/ const Word32 total_brate, /* i : total bitrate Q0*/ const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) Q0*/ const Word16 is_ism_format /* i : flag indicating ISM format Q0*/ ) Word16 tcxonly = 0; move16(); Word32 temp_flag; if ( MCT_flag ) { temp_flag = IVAS_32k; move32(); } else { temp_flag = IVAS_48k; move32(); } SWITCH( element_mode ) { case EVS_MONO: if ( GT_32( total_brate, ACELP_32k ) ) { tcxonly = 1; move16(); } BREAK; case IVAS_SCE: if ( is_ism_format ) { if ( GT_32( total_brate, MAX_ACELP_BRATE_ISM ) ) { tcxonly = 1; move16(); } } else { if ( GT_32( total_brate, MAX_ACELP_BRATE ) ) { tcxonly = 1; move16(); } } BREAK; case IVAS_CPE_DFT: case IVAS_CPE_TD: if ( GT_32( total_brate, MAX_ACELP_BRATE ) ) { tcxonly = 1; move16(); } BREAK; case IVAS_CPE_MDCT: if ( GE_32( total_brate, temp_flag ) ) { tcxonly = 1; move16(); } BREAK; } return tcxonly; /*Q0*/ } #endif /* FIX_2385_GETTCXONLY */ #ifndef FIX_2385_GETTCXONLY Word16 getTcxonly( Loading Loading
lib_com/core_com_config_fx.c +75 −14 Original line number Diff line number Diff line Loading @@ -182,20 +182,6 @@ Word16 getTcxonly_fx( const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) Q0*/ const Word16 is_ism_format /* i : flag indicating ISM format Q0*/ ) #else /*-------------------------------------------------------------------* * getTcxonly_ivas() * * *-------------------------------------------------------------------*/ Word16 getTcxonly_ivas_fx( const Word16 element_mode, /* i : IVAS element mode Q0*/ const Word32 total_brate, /* i : total bitrate Q0*/ const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) Q0*/ const Word16 is_ism_format /* i : flag indicating ISM format Q0*/ ) #endif /* FIX_2385_GETTCXONLY */ { Word16 tcxonly = 0; move16(); Loading Loading @@ -250,6 +236,81 @@ Word16 getTcxonly_ivas_fx( return tcxonly; /*Q0*/ } #else /*-------------------------------------------------------------------* * getTcxonly_ivas() * * *-------------------------------------------------------------------*/ Word16 getTcxonly_ivas_fx( const Word16 element_mode, /* i : IVAS element mode Q0*/ const Word32 total_brate, /* i : total bitrate Q0*/ const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) Q0*/ const Word16 is_ism_format /* i : flag indicating ISM format Q0*/ ) Word16 tcxonly = 0; move16(); Word32 temp_flag; if ( MCT_flag ) { temp_flag = IVAS_32k; move32(); } else { temp_flag = IVAS_48k; move32(); } SWITCH( element_mode ) { case EVS_MONO: if ( GT_32( total_brate, ACELP_32k ) ) { tcxonly = 1; move16(); } BREAK; case IVAS_SCE: if ( is_ism_format ) { if ( GT_32( total_brate, MAX_ACELP_BRATE_ISM ) ) { tcxonly = 1; move16(); } } else { if ( GT_32( total_brate, MAX_ACELP_BRATE ) ) { tcxonly = 1; move16(); } } BREAK; case IVAS_CPE_DFT: case IVAS_CPE_TD: if ( GT_32( total_brate, MAX_ACELP_BRATE ) ) { tcxonly = 1; move16(); } BREAK; case IVAS_CPE_MDCT: if ( GE_32( total_brate, temp_flag ) ) { tcxonly = 1; move16(); } BREAK; } return tcxonly; /*Q0*/ } #endif /* FIX_2385_GETTCXONLY */ #ifndef FIX_2385_GETTCXONLY Word16 getTcxonly( Loading