[arch-commits] Commit in lame/repos (extra-x86_64 extra-x86_64/03_lame-ffmpeg.diff)

[Ionut Biru]

    Date: Friday, February 5, 2010 @ 20:21:51
  Author: ibiru
Revision: 67295

Merged revisions 67293 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/lame/trunk

........
  r67293 | ibiru | 2010-02-06 03:20:30 +0200 (Sat, 06 Feb 2010) | 1 line
  
  commit patch
........

Added:
  lame/repos/extra-x86_64/03_lame-ffmpeg.diff
    (from rev 67293, lame/trunk/03_lame-ffmpeg.diff)
Modified:
  lame/repos/extra-x86_64/	(properties)

---------------------+
 03_lame-ffmpeg.diff |   72 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)


Property changes on: lame/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /lame/trunk:1-67289
   + /lame/trunk:1-67294

Copied: lame/repos/extra-x86_64/03_lame-ffmpeg.diff (from rev 67293, lame/trunk/03_lame-ffmpeg.diff)
===================================================================
--- extra-x86_64/03_lame-ffmpeg.diff	                        (rev 0)
+++ extra-x86_64/03_lame-ffmpeg.diff	2010-02-06 01:21:51 UTC (rev 67295)
@@ -0,0 +1,72 @@
+--- lame-3.98.2.orig/libmp3lame/lame.c	2009-07-07 10:52:01.000000000 +0200
++++ lame-3.98.2/libmp3lame/lame.c	2009-07-07 10:52:03.000000000 +0200
+@@ -1602,6 +1602,13 @@
+         /* update mfbuf[] counters */
+         gfc->mf_size += n_out;
+         assert(gfc->mf_size <= MFSIZE);
++
++        /* lame_encode_flush may have set gfc->mf_sample_to_encode to 0
++         * so we have to reinitialize it here when that happened.
++         */
++        if (gfc->mf_samples_to_encode < 1) {
++            gfc->mf_samples_to_encode = ENCDELAY + POSTDELAY;
++        }
+         gfc->mf_samples_to_encode += n_out;
+ 
+ 
+@@ -1931,6 +1938,10 @@
+     int     frames_left;
+     int     samples_to_encode = gfc->mf_samples_to_encode;
+ 
++    /* Was flush already called? */
++    if (gfc->mf_samples_to_encode < 1) {
++        return 0;
++    }
+     memset(buffer, 0, sizeof(buffer));
+     mp3count = 0;
+     
+@@ -1942,7 +1953,9 @@
+     end_padding += pad_out_samples;
+ 
+     frames_left = (samples_to_encode + pad_out_samples) / gfp->framesize;
+-    while (frames_left > 0) {
++
++    /* send in a frame of 0 padding until all internal sample buffers are flushed */
++    while (frames_left > 0 && imp3 >= 0) {
+         int frame_num = gfp->frameNum;
+ 
+         mp3buffer_size_remaining = mp3buffer_size - mp3count;
+@@ -1951,22 +1964,23 @@
+         if (mp3buffer_size == 0)
+             mp3buffer_size_remaining = 0;
+ 
+-        /* send in a frame of 0 padding until all internal sample buffers
+-         * are flushed
+-         */
+         imp3 = lame_encode_buffer(gfp, buffer[0], buffer[1], 32,
+                                   mp3buffer, mp3buffer_size_remaining);
+         
+-        if (frame_num != gfp->frameNum) {
+-            --frames_left;
+-        }
+-        if (imp3 < 0) {
+-            /* some type of fatal error */
+-            return imp3;
+-        }
+         mp3buffer += imp3;
+         mp3count += imp3;
++        frames_left -= (frame_num != gfp->frameNum) ? 1 : 0;
+     }
++    /* Set gfc->mf_samples_to_encode to 0, so we may detect
++     * and break loops calling it more than once in a row.
++     */
++    gfc->mf_samples_to_encode = 0;
++
++    if (imp3 < 0) {
++        /* some type of fatal error */
++        return imp3;
++    }
++
+     mp3buffer_size_remaining = mp3buffer_size - mp3count;
+     /* if user specifed buffer size = 0, dont check size */
+     if (mp3buffer_size == 0)