Commit e68639e2 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_1215_FIX_JBM_MAX_SCALING

parent 406569eb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */

#define NONBE_1215_FIX_JBM_MAX_SCALING                  /* FhG: issue 1215: Fix assert hit in a specific VoIP decoder config. Caused by integer overflow in max scaling calculation. */

#define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */

#define NONBE_FIX_1262_OSBA_STEREO                      /* FhG: issue 1262: Fix missing scaling factor for OSBA stereo output */

#define NONBE_FIX_1189_GSC_IVAS_OMASA                   /* VA: Fix for issue 1189: Bitstream desynchornization due to reading/writing of the GSC_IVAS_mode parameter */

lib_dec/jbm_jb4sb.c

+0 −8
Original line number Diff line number Diff line
@@ -811,15 +811,11 @@ static void JB4_adaptActivePlayout( 
                           ( dropRateMax - dropRateMin ) / dropGapMax +

                       dropRateMin;

                *scale = ( 1000 - rate ) / 10;

#ifdef NONBE_1215_FIX_JBM_MAX_SCALING

                /* Limit max scaling to the duration of one frame. APA will not exceed this limit

                 * anyway due to the 50% limitation of APA_MIN_SCALE and APA_MAX_SCALE. Limiting

                 * the value to a sensible range here avoids integer overflows at later stages when

                 * converting maxScaling from milliseconds to samples. */

                *maxScaling = JB4_MIN( currPlayoutDelay - targetMax, 1000 / IVAS_NUM_FRAMES_PER_SEC );

#else

                *maxScaling = currPlayoutDelay - targetMax;

#endif

            }

        }

    }
@@ -835,15 +831,11 @@ static void JB4_adaptActivePlayout( 
             currPlayoutDelay < targetMaxStretch && currPlayoutDelay < (uint32_t) ( 110 + h->rfDelay / 4 ) )

        {

            *scale = 120;

#ifdef NONBE_1215_FIX_JBM_MAX_SCALING

            /* Limit max scaling to the duration of one frame. APA will not exceed this limit

             * anyway due to the 50% limitation of APA_MIN_SCALE and APA_MAX_SCALE. Limiting

             * the value to a sensible range here avoids integer overflows at later stages when

             * converting maxScaling from milliseconds to samples. */

            *maxScaling = JB4_MIN( targetMaxStretch - currPlayoutDelay, 1000 / IVAS_NUM_FRAMES_PER_SEC );

#else

            *maxScaling = targetMaxStretch - currPlayoutDelay;

#endif

        }

    }