[Fix] LAME: Apply <https://sourceforge.net/p/lame/svn/6438/> from LAME SVN trunk to fix <https://sourceforge.net/p/lame/bugs/496/>.

manxorist · manxorist · commit 8863db18ff1c · 2026-02-21T15:30:14.000Z
[Fix] LAME: Apply <https://sourceforge.net/p/lame/svn/6444/> from LAME SVN trunk to fix <https://sourceforge.net/p/lame/bugs/500/>. [Fix] LAME: Apply <https://sourceforge.net/p/lame/svn/6445/> from LAME SVN trunk to fix <https://sourceforge.net/p/lame/bugs/501/>. git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@24983 56274372-70c3-4bfc-bfc3-4c3a0b034d27
diff --git a/include/lame/OpenMPT.txt b/include/lame/OpenMPT.txt
@@ -1,6 +1,12 @@
 lame library version 3.100.
 The following changes have been made:
  *  Obviously, unnecessary folders and files have been removed.
+ *  <https://sourceforge.net/p/lame/svn/6438/> has been applied to fix
+    <https://sourceforge.net/p/lame/bugs/496/>.
+ *  <https://sourceforge.net/p/lame/svn/6444/> has been applied to fix
+    <https://sourceforge.net/p/lame/bugs/500/>.
+ *  <https://sourceforge.net/p/lame/svn/6445/> has been applied to fix
+    <https://sourceforge.net/p/lame/bugs/501/>.
  *  negative-shift warning in VbrTag.c has been fixed.
  *  function prototype mismatch has been fixed for on_pe() and
     L3psycho_anal_vbr().
diff --git a/include/lame/libmp3lame/lame.c b/include/lame/libmp3lame/lame.c
@@ -4,7 +4,7 @@
  *
  *      Copyright (c) 1999-2000 Mark Taylor
  *      Copyright (c) 2000-2005 Takehiro Tominaga
- *      Copyright (c) 2000-2017 Robert Hegemann
+ *      Copyright (c) 2000-2019 Robert Hegemann
  *      Copyright (c) 2000-2005 Gabriel Bouvigne
  *      Copyright (c) 2000-2004 Alexander Leidinger
  *
@@ -2082,6 +2082,29 @@ lame_init_bitstream(lame_global_flags * gfp)
     return -3;
 }
 
+static int
+calc_mp3buffer_size_remaining( int mp3buffer_size, int mp3count)
+{
+    /* if user specifed buffer size = 0, dont check size */
+    if (mp3buffer_size == 0)
+        return INT_MAX;
+    else if (mp3buffer_size > 0 && mp3count >= 0 ) {
+        int const mp3buffer_size_remaining = mp3buffer_size - mp3count;
+        if (mp3buffer_size_remaining > 0) {
+            return mp3buffer_size_remaining;
+        }
+        assert(mp3buffer_size_remaining >= 0);
+        /* we reached the end of the output buffer, set to -1
+           because we have to distinguish this case from the case above,
+           where the caller did not specify any buffer size
+         */
+        return -1;
+    }
+    else {
+        /* values are invalid, block writing into output buffer */
+        return -1;
+    }
+}
 
 /*****************************************************************/
 /* flush internal PCM sample buffers, then mp3 buffers           */
@@ -2149,20 +2172,17 @@ lame_encode_flush(lame_global_flags * gfp, unsigned char *mp3buffer, int mp3buff
         if (bunch > 1152) bunch = 1152;
         if (bunch < 1) bunch = 1;
 
-        mp3buffer_size_remaining = mp3buffer_size - mp3count;
-
-        /* if user specifed buffer size = 0, dont check size */
-        if (mp3buffer_size == 0)
-            mp3buffer_size_remaining = 0;
+        mp3buffer_size_remaining = calc_mp3buffer_size_remaining(mp3buffer_size, mp3count);
 
         /* send in a frame of 0 padding until all internal sample buffers
          * are flushed
          */
         imp3 = lame_encode_buffer(gfp, buffer[0], buffer[1], bunch,
                                   mp3buffer, mp3buffer_size_remaining);
-
-        mp3buffer += imp3;
-        mp3count += imp3;
+        if (imp3 > 0) {
+            mp3buffer += imp3;
+            mp3count += imp3;
+        }
         {   /* even a single pcm sample can produce several frames!
              * for example: 1 Hz input file resampled to 8 kHz mpeg2.5
              */
@@ -2181,10 +2201,7 @@ lame_encode_flush(lame_global_flags * gfp, unsigned char *mp3buffer, int mp3buff
         return imp3;
     }
 
-    mp3buffer_size_remaining = mp3buffer_size - mp3count;
-    /* if user specifed buffer size = 0, dont check size */
-    if (mp3buffer_size == 0)
-        mp3buffer_size_remaining = INT_MAX;
+    mp3buffer_size_remaining = calc_mp3buffer_size_remaining(mp3buffer_size, mp3count);
 
     /* mp3 related stuff.  bit buffer might still contain some mp3 data */
     flush_bitstream(gfc);
diff --git a/include/lame/libmp3lame/quantize.c b/include/lame/libmp3lame/quantize.c
@@ -3,7 +3,7 @@
  *
  *      Copyright (c) 1999-2000 Mark Taylor
  *      Copyright (c) 1999-2003 Takehiro Tominaga
- *      Copyright (c) 2000-2011 Robert Hegemann
+ *      Copyright (c) 2000-2019 Robert Hegemann
  *      Copyright (c) 2001-2005 Gabriel Bouvigne
  *
  * This library is free software; you can redistribute it and/or
@@ -1768,21 +1768,23 @@ static void
 calc_target_bits(lame_internal_flags * gfc,
                  const FLOAT pe[2][2],
                  FLOAT const ms_ener_ratio[2],
-                 int targ_bits[2][2], int *analog_silence_bits, int *max_frame_bits)
+                 int targ_bits_out[2][2], int *analog_silence_bits_out,
+                 int *max_frame_bits_out)
 {
     SessionConfig_t const *const cfg = &gfc->cfg;
     EncResult_t *const eov = &gfc->ov_enc;
     III_side_info_t const *const l3_side = &gfc->l3_side;
     FLOAT   res_factor;
     int     gr, ch, totbits, mean_bits;
     int     framesize = 576 * cfg->mode_gr;
+    int     max_frame_bits=0, analog_silence_bits=0, targ_bits[2][2]={0};
 
     eov->bitrate_index = cfg->vbr_max_bitrate_index;
-    *max_frame_bits = ResvFrameBegin(gfc, &mean_bits);
+    max_frame_bits = ResvFrameBegin(gfc, &mean_bits);
 
     eov->bitrate_index = 1;
     mean_bits = getframebits(gfc) - cfg->sideinfo_len * 8;
-    *analog_silence_bits = mean_bits / (cfg->mode_gr * cfg->channels_out);
+    analog_silence_bits = mean_bits / (cfg->mode_gr * cfg->channels_out);
 
     mean_bits = cfg->vbr_avg_bitrate_kbps * framesize * 1000;
     if (gfc->sv_qnt.substep_shaping & 1)
@@ -1872,14 +1874,31 @@ calc_target_bits(lame_internal_flags * gfc,
 
     /*  repartion target bits if needed
      */
-    if (totbits > *max_frame_bits && totbits > 0) {
+    if (totbits > max_frame_bits && max_frame_bits > 0) {
+        int const act_totbits = totbits;
+        totbits = 0;
         for (gr = 0; gr < cfg->mode_gr; gr++) {
             for (ch = 0; ch < cfg->channels_out; ch++) {
-                targ_bits[gr][ch] *= *max_frame_bits;
-                targ_bits[gr][ch] /= totbits;
+                targ_bits[gr][ch] *= max_frame_bits;
+                targ_bits[gr][ch] /= act_totbits;
+                totbits += targ_bits[gr][ch];
             }
         }
     }
+    assert( totbits <= max_frame_bits );
+
+    /*  set output arguments
+     */
+    for (gr = 0; gr < cfg->mode_gr; gr++) {
+        for (ch = 0; ch < cfg->channels_out; ch++) {
+            int const gr_ch_bits = targ_bits[gr][ch];
+            targ_bits_out[gr][ch] = gr_ch_bits;
+            if (analog_silence_bits > gr_ch_bits)
+                analog_silence_bits = gr_ch_bits;
+        }
+    }
+    *analog_silence_bits_out = analog_silence_bits;
+    *max_frame_bits_out = max_frame_bits;
 }
 
 
@@ -1955,6 +1974,8 @@ ABR_iteration_loop(lame_internal_flags * gfc, const FLOAT pe[2][2],
                 (void) outer_loop(gfc, cod_info, l3_xmin, xrpow, ch, targ_bits[gr][ch]);
             }
             iteration_finish_one(gfc, gr, ch);
+            assert(cod_info->part2_3_length <= MAX_BITS_PER_CHANNEL);
+            assert(cod_info->part2_3_length <= targ_bits[gr][ch]);
         }               /* ch */
     }                   /* gr */
 
diff --git a/include/lame/libmp3lame/vector/xmm_quantize_sub.c b/include/lame/libmp3lame/vector/xmm_quantize_sub.c
@@ -60,11 +60,12 @@ static const FLOAT costab[TRI_SIZE * 2] = {
 
 
 SSE_FUNCTION void
-init_xrpow_core_sse(gr_info * const cod_info, FLOAT xrpow[576], int upper, FLOAT * sum)
+init_xrpow_core_sse(gr_info * const cod_info, FLOAT xrpow[576], int max_nz, FLOAT * sum)
 {
     int     i;
     float   tmp_max = 0;
     float   tmp_sum = 0;
+    int     upper = max_nz + 1;
     int     upper4 = (upper / 4) * 4;
     int     rest = upper-upper4;
 
@@ -74,8 +75,8 @@ init_xrpow_core_sse(gr_info * const cod_info, FLOAT xrpow[576], int upper, FLOAT
     vecfloat_union vec_sum;
     vecfloat_union vec_tmp;
 
-    _mm_prefetch((char *) cod_info->xr, _MM_HINT_T0);
-    _mm_prefetch((char *) xrpow, _MM_HINT_T0);
+    _mm_prefetch((char const *) cod_info->xr, _MM_HINT_T0);
+    _mm_prefetch((char const *) xrpow, _MM_HINT_T0);
 
     vec_xrpow_max._m128 = _mm_set_ps1(0);
     vec_sum._m128 = _mm_set_ps1(0);
@@ -206,7 +207,7 @@ fht_SSE2(FLOAT * fz, int n)
                 __m128 p, q, r;
 
                 q = _mm_setr_ps(fi[k1], fi[k3], gi[k1], gi[k3]); /* Q := {fi_k1,fi_k3,gi_k1,gi_k3}*/
-                p = _mm_mul_ps(_mm_set_ps1(s2), q);              /* P := s2 * Q */
+                p = _mm_mul_ps(v_s2, q);                         /* P := s2 * Q */
                 q = _mm_mul_ps(v_c2, q);                         /* Q := c2 * Q */
                 q = _mm_shuffle_ps(q, q, _MM_SHUFFLE(1,0,3,2));  /* Q := {-c2*gi_k1,-c2*gi_k3,c2*fi_k1,c2*fi_k3} */
                 p = _mm_add_ps(p, q);
