Commit 55a760d3 authored by norvell's avatar norvell
Browse files

Remove obsolete initial fix FIX_I74_BW_LIMITATION

parent 7df47684

lib_com/options.h

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


#define DIRAC_DRCT_GAIN_TUNING                          /* issue 64: tuning of DirAC energy-compensation gains */



/*#define FIX_I74_BW_LIMITATION*/                       /* issue 74: Propagate bitrate induced BW limitation to hEncoderConfig. Ensures BE between explicit BW limitation using "-max_band <BW>" and BW limited by bitrate */

#define FIX_I74_BW_LIMITATION_ALT                       /* issue 74: Propagate bitrate induced BW limitation to hEncoderConfig. Ensures BE between explicit BW limitation using "-max_band <BW>" and BW limited by bitrate; alternative fix */

#define FIX_I74_CLEANING                                /* issue 74: remove redundant function call in ivas_cpe_enc() */

lib_enc/lib_enc.c

+0 −13
Original line number Diff line number Diff line
@@ -1580,26 +1580,16 @@ static ivas_error printConfigInfo_enc( 
            if ( hEncoderConfig->ivas_total_brate < ACELP_9k60 )

            {

                fprintf( stdout, "Switching to WB.\n" );

#ifdef FIX_I74_BW_LIMITATION

                hEncoderConfig->max_bwidth = WB;

#endif

            }

            else

            {

                fprintf( stdout, "Switching to SWB.\n" );

#ifdef FIX_I74_BW_LIMITATION

                hEncoderConfig->max_bwidth = SWB;

#endif



            }

        }



        if ( hEncoderConfig->max_bwidth == SWB && hEncoderConfig->ivas_total_brate < ACELP_9k60 )

        {

            fprintf( stdout, "\nSWB coding not supported below %.2f kbps. Switching to WB.", ACELP_9k60 / 1000.f );

#ifdef FIX_I74_BW_LIMITATION

            hEncoderConfig->max_bwidth = WB;

#endif

        }



        /* in case of 8kHz input sampling or "-max_band NB", require the total bitrate to be below 24.40 kbps */
@@ -1614,9 +1604,6 @@ static ivas_error printConfigInfo_enc( 
        if ( hEncoderConfig->max_bwidth == FB && hEncoderConfig->ivas_total_brate < MIN_BRATE_FB_STEREO )

        {

            fprintf( stdout, "\nFB coding not supported below %.2f kbps. Switching to SWB.\n", MIN_BRATE_FB_STEREO / 1000.f );

#ifdef FIX_I74_BW_LIMITATION

            hEncoderConfig->max_bwidth = SWB;

#endif

        }

    }