aboutsummaryrefslogtreecommitdiff
path: root/audio/lame/files
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2009-08-18 08:10:09 +0000
committerMartin Matuska <mm@FreeBSD.org>2009-08-18 08:10:09 +0000
commitfaac77dc5667562b463bb97b8fae5e9b26217d75 (patch)
treef9f6d1310f737a3cf47ae1af5ce4a1bff43a1f03 /audio/lame/files
parent3ffb5989c90dc42714d08f1b46c0607316b2d681 (diff)
downloadports-faac77dc5667562b463bb97b8fae5e9b26217d75.tar.gz
ports-faac77dc5667562b463bb97b8fae5e9b26217d75.zip
- Upstream patch for FFMPEG issue 803
- Bump PORTREVISION PR: ports/137907 Approved by: netchild (maintainer)
Notes
Notes: svn path=/head/; revision=239841
Diffstat (limited to 'audio/lame/files')
-rw-r--r--audio/lame/files/patch-libmp3lame-lame.c72
1 files changed, 72 insertions, 0 deletions
diff --git a/audio/lame/files/patch-libmp3lame-lame.c b/audio/lame/files/patch-libmp3lame-lame.c
new file mode 100644
index 000000000000..ceedbc6378c1
--- /dev/null
+++ b/audio/lame/files/patch-libmp3lame-lame.c
@@ -0,0 +1,72 @@
+--- libmp3lame/lame.c.orig 2008-08-05 19:26:02.000000000 +0200
++++ libmp3lame/lame.c 2009-08-17 21:25:17.749630168 +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,22 @@
+ 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)