head 1.17; access; symbols pkgsrc-2013Q2:1.17.0.8 pkgsrc-2013Q2-base:1.17 pkgsrc-2012Q4:1.17.0.6 pkgsrc-2012Q4-base:1.17 pkgsrc-2011Q4:1.17.0.4 pkgsrc-2011Q4-base:1.17 pkgsrc-2011Q2:1.17.0.2 pkgsrc-2011Q2-base:1.17 pkgsrc-2009Q4:1.16.0.2 pkgsrc-2009Q4-base:1.16 pkgsrc-2008Q4:1.15.0.2 pkgsrc-2008Q4-base:1.15 pkgsrc-2008Q3:1.14.0.18 pkgsrc-2008Q3-base:1.14 cube-native-xorg:1.14.0.16 cube-native-xorg-base:1.14 pkgsrc-2008Q2:1.14.0.14 pkgsrc-2008Q2-base:1.14 cwrapper:1.14.0.12 pkgsrc-2008Q1:1.14.0.10 pkgsrc-2008Q1-base:1.14 pkgsrc-2007Q4:1.14.0.8 pkgsrc-2007Q4-base:1.14 pkgsrc-2007Q3:1.14.0.6 pkgsrc-2007Q3-base:1.14 pkgsrc-2007Q2:1.14.0.4 pkgsrc-2007Q2-base:1.14 pkgsrc-2007Q1:1.14.0.2 pkgsrc-2007Q1-base:1.14 pkgsrc-2006Q4:1.13.0.2 pkgsrc-2006Q4-base:1.13 pkgsrc-2006Q3:1.12.0.20 pkgsrc-2006Q3-base:1.12 pkgsrc-2006Q2:1.12.0.18 pkgsrc-2006Q2-base:1.12 pkgsrc-2006Q1:1.12.0.16 pkgsrc-2006Q1-base:1.12 pkgsrc-2005Q4:1.12.0.14 pkgsrc-2005Q4-base:1.12 pkgsrc-2005Q3:1.12.0.12 pkgsrc-2005Q3-base:1.12 pkgsrc-2005Q2:1.12.0.10 pkgsrc-2005Q2-base:1.12 pkgsrc-2005Q1:1.12.0.8 pkgsrc-2005Q1-base:1.12 pkgsrc-2004Q4:1.12.0.6 pkgsrc-2004Q4-base:1.12 pkgsrc-2004Q3:1.12.0.4 pkgsrc-2004Q3-base:1.12 pkgsrc-2004Q2:1.12.0.2 pkgsrc-2004Q2-base:1.12 pkgsrc-2004Q1:1.11.0.2 pkgsrc-2004Q1-base:1.11 pkgsrc-2003Q4:1.10.0.4 pkgsrc-2003Q4-base:1.10 netbsd-1-6-1:1.10.0.2 netbsd-1-6-1-base:1.10 netbsd-1-6:1.9.0.8 netbsd-1-6-RELEASE-base:1.9 pkgviews:1.9.0.4 pkgviews-base:1.9 buildlink2:1.9.0.2 buildlink2-base:1.9 netbsd-1-5-PATCH003:1.9 netbsd-1-5-PATCH001:1.6 netbsd-1-4-PATCH002:1.4 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.17 date 2010.03.15.10.08.30; author wiz; state dead; branches; next 1.16; 1.16 date 2010.01.05.23.02.12; author tron; state Exp; branches; next 1.15; 1.15 date 2008.10.09.14.45.33; author wiz; state dead; branches; next 1.14; 1.14 date 2007.01.29.23.05.51; author dmcmahill; state Exp; branches; next 1.13; 1.13 date 2006.10.23.07.26.56; author wiz; state dead; branches; next 1.12; 1.12 date 2004.04.14.09.13.20; author adam; state Exp; branches; next 1.11; 1.11 date 2004.01.20.15.46.12; author adam; state Exp; branches; next 1.10; 1.10 date 2002.12.19.00.53.48; author wiz; state Exp; branches; next 1.9; 1.9 date 2002.01.07.16.38.32; author wiz; state Exp; branches; next 1.8; 1.8 date 2001.09.15.06.58.55; author simonb; state Exp; branches; next 1.7; 1.7 date 2001.07.31.14.23.01; author drochner; state Exp; branches; next 1.6; 1.6 date 2000.11.15.13.52.59; author wiz; state Exp; branches; next 1.5; 1.5 date 2000.07.04.21.08.26; author pooka; state dead; branches; next 1.4; 1.4 date 2000.02.08.16.54.43; author garbled; state Exp; branches; next 1.3; 1.3 date 99.09.30.16.41.07; author explorer; state dead; branches; next 1.2; 1.2 date 99.08.10.11.16.59; author agc; state Exp; branches; next 1.1; 1.1 date 99.08.08.03.12.09; author hubertf; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.08.08.03.12.09; author hubertf; state Exp; branches; next ; desc @@ 1.17 log @Update to 3.98.3: LAME 3.98.3 February 27 2010 * Rogério Brito: o Update the debian packaging for the new release. * Robert Hegemann o The ignore-tag-errors switch had no effect when embedding album art, fixed. o Library API change: lame_decode functions are now obsolete but still present, please use hip_decode instead. The reason for this change is: lame_decode functions use a single global variable within the library to store decoder setup, hip_decode functions don't. The encoder now uses hip_decode internally and it is now possible to use clipdetect feature while reencoding mp3 to mp3. o Workaround for FFMPEG bug, which uses to call lame_encode_flush more than once in a loop. o Windows: program icon and version info added (when building with VC9) o Fix for Bugtracker item [ 2688413 ] lib name problem in Microsoft Visual Studio 6 o Fix for Bugtracker items [ 2051870, 2423650, 2928684 ] several small documentation issues o Fix for Bugtracker item [ 2723518 ] resampling in 3.98 and 3.99alpha o Fix for Bugtracker item [ 2891879 ] Because of Windows API change, there was a problem with the prority switch. o Fix for Bugtracker item [ 2893101 ] Access Violation in BladeMP3EncDLL if UNICODE was defined. o Fix for Bugtracker item [ 2887359 ] Wrong length in ID3v2 tag when num_samples isn't set o Fix for Bugtracker item [ 2872590 ] LameTAG: "Music length" missmatch in LAME 3.98 o Fix for Bugtracker item [ 2824296 ] wrong enc_padding value in LAME 3.99a and 3.98.3 (from CVS) o Revisiting the FhG decoder problem (FhG V1.5 build 50, ships with MS Windows): enabling the new-drain-code seems to solve that issue better, than restricting the buffer size (see below: 3.98 beta 1, May 16 2007). o Patch submitted by Bernhard Doebler, tracker item [ 2807676 ] Error when building Lame with NASM support o Patch submitted by Mancuso Raffaele, tracker item [ 2406420 ] compile lame_enc.dll under cygwin @ text @$NetBSD: patch-aa,v 1.16 2010/01/05 23:02:12 tron Exp $ Fix compatibility problem with "ffmpeg": http://lame.cvs.sourceforge.net/viewvc/lame/lame/libmp3lame/lame.c?revision=1.323.2.5&view=markup http://lame.cvs.sourceforge.net/viewvc/lame/lame/libmp3lame/lame.c?revision=1.323.2.6&view=markup --- libmp3lame/lame.c.orig 2008-08-05 18:26:02.000000000 +0100 +++ libmp3lame/lame.c 2010-01-05 17:41:57.000000000 +0000 @@@@ -1472,6 +1472,27 @@@@ } +static int +calcNeeded(lame_global_flags* gfp) +{ + int mf_needed; + /* some sanity checks */ +#if ENCDELAY < MDCTDELAY +# error ENCDELAY is less than MDCTDELAY, see encoder.h +#endif +#if FFTOFFSET > BLKSIZE +# error FFTOFFSET is greater than BLKSIZE, see encoder.h +#endif + + mf_needed = BLKSIZE + gfp->framesize - FFTOFFSET; /* amount needed for FFT */ + /*mf_needed = Max(mf_needed, 286 + 576 * (1 + gfc->mode_gr)); */ + mf_needed = Max(mf_needed, 512 + gfp->framesize - 32); + + assert(MFSIZE >= mf_needed); + + return mf_needed; +} + /* * THE MAIN LAME ENCODING INTERFACE * mt 3/00 @@@@ -1555,20 +1576,7 @@@@ } } - - /* some sanity checks */ -#if ENCDELAY < MDCTDELAY -# error ENCDELAY is less than MDCTDELAY, see encoder.h -#endif -#if FFTOFFSET > BLKSIZE -# error FFTOFFSET is greater than BLKSIZE, see encoder.h -#endif - - mf_needed = BLKSIZE + gfp->framesize - FFTOFFSET; /* amount needed for FFT */ - /*mf_needed = Max(mf_needed, 286 + 576 * (1 + gfc->mode_gr)); */ - mf_needed = Max(mf_needed, 512 + gfp->framesize - 32); - - assert(MFSIZE >= mf_needed); + mf_needed = calcNeeded(gfp); mfbuf[0] = gfc->mfbuf[0]; mfbuf[1] = gfc->mfbuf[1]; @@@@ -1602,6 +1610,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; @@@@ -1926,24 +1941,36 @@@@ /* we always add POSTDELAY=288 padding to make sure granule with real * data can be complety decoded (because of 50% overlap with next granule */ - int end_padding = POSTDELAY; - int pad_out_samples; + int end_padding; int frames_left; - int samples_to_encode = gfc->mf_samples_to_encode; + int samples_to_encode = gfc->mf_samples_to_encode - POSTDELAY; + int mf_needed = calcNeeded(gfp); + /* Was flush already called? */ + if (gfc->mf_samples_to_encode < 1) { + return 0; + } memset(buffer, 0, sizeof(buffer)); mp3count = 0; - + if (gfp->in_samplerate != gfp->out_samplerate) { /* delay due to resampling; needs to be fixed, if resampling code gets changed */ samples_to_encode += 16.*gfp->out_samplerate/gfp->in_samplerate; } - pad_out_samples = gfp->framesize - (samples_to_encode % gfp->framesize); - end_padding += pad_out_samples; + end_padding = gfp->framesize - (samples_to_encode % gfp->framesize); + gfp->encoder_padding = end_padding; + + frames_left = (samples_to_encode + end_padding) / gfp->framesize; - 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 bunch = mf_needed-gfc->mf_size; int frame_num = gfp->frameNum; + + bunch *= gfp->in_samplerate; + bunch /= gfp->out_samplerate; + if (bunch > 1152) bunch = 1152; + if (bunch < 1) bunch = 1; mp3buffer_size_remaining = mp3buffer_size - mp3count; @@@@ -1951,22 +1978,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, + imp3 = lame_encode_buffer(gfp, buffer[0], buffer[1], bunch, 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) @@@@ -1997,7 +2025,6 @@@@ } mp3count += imp3; } - gfp->encoder_padding = end_padding; #if 0 { int const ed = gfp->encoder_delay; @@@@ -2011,6 +2038,8 @@@@ MSGF(gfc, "encoder padding=%d\n", ep); MSGF(gfc, "sample count=%d (%g)\n", ns, gfp->in_samplerate*duration); MSGF(gfc, "duration=%g sec\n", duration); + MSGF(gfc, "mf_size=%d\n",gfc->mf_size); + MSGF(gfc, "mf_samples_to_encode=%d\n",gfc->mf_samples_to_encode); } #endif return mp3count; @ 1.16 log @Add patch from the "lame" CVS repository to fix API incompatiblity with the "ffmpeg" package. "ffmpeg" can now generate ".flv" files with audio again. Bump package revision. Extra testing by Matthias Drochner, approved by Alistair Crooks. @ text @d1 1 a1 1 $NetBSD$ @ 1.15 log @Update to 3.98.2: LAME 3.98.1 September 21 2008 * Rogerio Brito: * More fixes for the abx tool for Unix systems: * Plugged a memory leak. * Fixed an endianness problem: users of big-endian machines can now do abx tests. * Fixed history's HTML doctype * Fixed history so that it finally validates at W3's validator * Fixed compilation of frontend mp3rtp.c. Thanks to Kris Karas. Bugtracker item [ 2015432 ] mp3rtp missing uint16_t in lame 3.98 * Robert Hegemann: * Fix for Bugtracker item [ 2031704 ] --id3v1-only didnt work in 3.98-final * Fix for Bugtracker item [ 2022035 ] encoder_padding value and resampling * Fix for Bugtracker item [ 2029282 ] Frequency filtering API broken in 3.98 * Fix for Bugtracker item [ 2039648 ] potential memory leak in parse_args() function in parse.c * Fix for some tagging issues: * Made search for ID3v1 genres more sloppy, abbrevations may match more often as some simple typos. Examples: * --tg "Alt. Rock" matches genre "Alternate Rock" * --tg "acapela" matches genre "A Cappella" * New switch --pad-id3v2-size "n": adds ID3v2 tag with n padding bytes. LAME 3.98 July 4 2008 * Anton Sergunov: * Frontend DirectShow: enabling LAME dshow filter to connect to "File Writer Filter". * Rogerio Brito: * Updates to the Debian Packaging * Fixes to the abx tool for Unix systems (so that more people can evaluate LAME's compression against the original files) * Alexander Leidinger: * explicitely link the math lib to the lame lib * add switch to disable the use of the compaq optimized math lib LAME 3.98 beta 8 April 13 2008 * Robert Hegemann: * LAME now accepts a floating point value in the range [0,...,10[ as VBR quality setting, like -V5.678 * Found and fixed some suspicious code in additive masking calculation for VBR-NEW * bug-fix:experimental code was defaulted by accident for VBR-NEW * fix for some endianess problem on big-endian machines LAME 3.98 beta 7 April 6 2008 * Robert Hegemann: * libmp3lame API: allow frontends to separately retrieve LAME/Xing and ID3 data, because the old library automatism makes it impossible to make fully buffered encodes. * libmp3lame API: added some experimental unicode ID3 tagging code. * frontends: write itself final ID3 tags and LAME/Xing header frame * lame_enc.dll: writes itself final LAME/Xing header frame * Latest changes to the new VBR psymodel: * uses a different spreading function * bug-fix for out-of-bounds array access (program stack corruption possible) LAME 3.98 beta 6 December 16 2007 * Robert Hegemann: * Feature request [ 1811483 ] WAVE_FORMAT_EXTENSIBLE support (PCM) * Fix for some rare scalefactor selection issue the newer vbr code had at low compression levels * Fix for Bugtracker item[ 1813496 ] AIFF parsing bug * Latest changes to the new VBR code: * it now has its own psy model, a derivation from NSPSY. * some more tuning has been done for this new psy model. Many thanks to Horst Albrecht and Myles Thaiss. * the "out-of-bits" strategy is reworked * It was possible, that the "interchannel masking effects feature" was used by the dual-channel-mode for bi-lingual encodings too. It was meant to work on stereo L/R channels only. LAME 3.98 beta 5 August 12 2007 * Jonathan Stott: * Bug tracker items: [ 1590693 ] ID3v2 tag not writing, [ 1636267 ] ID3v2 tags overwritten If the output file is opened 'write-only', then LAME can't update the LAME tag. In this case LAME silently overwrote the first bytes of the file and an optional ID3v2 tag disappeared. Now an error message will be printed and no data is written in this case. * Robert Hegemann: * Fix for Bugtracker item [ 1719593 ] Track numbers > 255 not allowed even with --id3v2-only * Fix for Bugtracker item [ 1742623 ] fail(lame --mp3input -m m -b 128 --resample 8 *.mp3 **.mp3) The problem here was, the input files are MPEG-1 Layer2 files named as MP3s. Even if you leave out the --mp3input switch LAME tried to decode the input files as Layer3 files because of the file name extension and because it found some valid looking Layer3 synchronization header. The fixed LAME version does not assume the file name extension is always correct and treats the files depending on the first found MPEG sync word. The files in question are now correctly detected as Layer2 files and transcoding does succeed. * Fix for Bugtracker item [ 1445175 ] Input being stdin fails in Windows on WAV files The problem here was, seeking on pipes shows some different behaviour depending on C-Library implementations. The workaround tries to detect it's working on a pipe and doing some reading instead of seeking in that case. * Fixing some memory leak in the 'lame_enc.dll'. * Fix for Bugtracker items [ 1160757, 1160741 ] --little-endian / --big-endian not working These switches where originally intended to be used together with Libsndfile only. * Fix for Bugtracker item [ 1746336 ] Incorrect Bitrate with ABR und --resample, LAME 3.98b4 Some earlier bug-fix had some typo. As a result, when adding a '--resample 123' switch, the average bitrate rised upto maximum bitrate. LAME 3.98 beta 4 June 23 2007 * Dennis Lambe Jr: Added support for total track count (id3v2) in the frontend * Nyaochi: * Ability to set user-defined ID3v2.3 frame * Ability to include albumArt in ID3v2.3 tag * Robert Hegemann: * Bugfix: the "play length in ms", which is stored in the ID3v2 tag TLEN, was not correctly computed. Some hardware and software players were confused by this garbage data. * Out of bits strategy for the newer VBR code overhauled * LAME API: the ID3 tag functions do not store the pointers passed anymore, they do make deep copies of strings passed as parameters. * Changes in LAME frontend switches regarding ID3 tags: --tg "MyGenre" will route unknown ID3v1 genres to "Other" for ID3v1 tags and will be stored as plain text "MyGenre" for ID3v2 tags. Genres given by known ID3v1 numbers will be stored as its corresponding text in ID3v2 tags. --tn "02/02" will store the track number specified as plain text as-is for ID3v2 tags. LAME 3.98 beta 3 May 22 2007 * Robert Hegemann: * Fixes regarding max number of bits limitation LAME 3.98 beta 2 May 20 2007 * Robert Hegemann: * Bug tracker item: [ 1693461 ]; Fixed memory leaks in ACM codec * Fixed encoding of non-standard sampling rates in CBR * Improved VBR strategy when running out of bits LAME 3.98 beta 1 May 16 2007 * Alexander Leidinger: * Add TLEN (ID3v2) support (Submitted by: Linus Walleij). * Add number of total tracks per album (ID3v2) support (Submitted by: Kyle VanderBeek). * Some seatbelts for overflowing arrays in the ID3v2 support. * Update the RPM spec (Submitted by: Kyle VanderBeek). * Fix some mem-leaks in the error case. * Update to newer autotools versions. * Update to use a recent libsndfile (submitted by libsndfile author). * Intrinsics support enabled for gcc * Robert Hegemann: * The newer VBR code is now LAME's default VBR routine * Fixed: in case of not enough bits the new vbr code incorrectly used old vbr routine * Improved ATH adjustment in low volume cases * Fixed (PSY model): mapping from convolution bands to partition bands was broken since we replaced tables by own calculation several years ago * Fixed (PSY model): loss of fraction in equal loudness weighting * Fixed (PSY model): in NSPSY highpass filter, out of bounds access in fircoef * Known problem samples for the new VBR code: many of them are at an acceptable quality level now; with a big 'Thank You' to Francis Niechcial * Modified VBR strategy to handle out of bits cases * Restricted bitreservoir size for 320 kbps frames to the size used for sideinfo, because of decoding problems with FhG decoders installed on almost every Windows system * LAME aborts on unsupported input files or unrecognized parameter options passed more often now * Bug tracker item: [ 1596306 ] "fatal error during initialization"; an invalid MPEG samplerate was returned by optimum_samplefreq function * Bug tracker item: [ 1585942 ] lame not --silent when TERM not set; in case LAME was build with TERMCAP defined and no TERM environment is defined, now we do not issue an error message and silently fallback to the default behaviour as if LAME was compiled without TERMCAP defined. * Bug tracker item: [ 1711980 ] LAME writes invalid Xing header when ID3 tags exist; LAME was sometimes writing an invalid Xing/Info header * Feature request: [ 1588283 ] Flushing output stream in lame.exe; 'flush' option added * Added FFTSSE and FFT3DNOW assembler code from Lame4 branch * Changes in lame frontend switches: -k removed, add lowpass and highpass switches if you need to change them; --short/noshort/allshort - degraded into DEVELOPER ONLY switches normal users shouldn't use them; -X -Z degraded to DEVELOPER ONLY switches, -X is too tough to communicate to end users and -Z isn't used actualy * Fixed some console printing problems * Windows: ACM code now uses LAME library API only, all references to private include files are removed * Windows: DirectShow code now uses LAME library API only, all references to private include files are removed * Windows: disabled code that resets processor affinity, because this doesn't belong to LAME, but seems to work around some problems the parent process has (in most cases EAC) * John33: * Fixed mp2 and mp3 decoding: For mp3 and mp2 decoding, this now yields the same output as foobar2000 but the error checking remains unchanged * Gabriel Bouvigne: * VC8 project files * Added support for x64 under VC8 * Restricted MPEG 2.5 to 64kbps frames * Takehiro Tominaga: * SSE version of FFT @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.14 2007/01/29 23:05:51 dmcmahill Exp $ d3 1 a3 1 name space collision with a #define in /usr/include/term.h on solaris-2.9 d5 92 a96 17 --- frontend/brhist.c.orig 2006-09-24 09:53:31.000000000 -0400 +++ frontend/brhist.c @@@@ -429,7 +429,7 @@@@ stats_line(double *stat) void brhist_disp(const lame_global_flags * gf) { - int i, lines = 0; + int i, mylines = 0; int br_hist[BRHIST_WIDTH]; /* how often a frame size was used */ int br_sm_hist[BRHIST_WIDTH][4]; /* how often a special frame size/stereo mode commbination was used */ int st_mode[4]; @@@@ -456,13 +456,13 @@@@ brhist_disp(const lame_global_flags * gf if (most_often < br_hist[i]) most_often = br_hist[i]; if (br_hist[i]) - ++lines; + ++mylines; d98 20 d119 50 a168 5 for (i = 0; i < BRHIST_WIDTH; i++) { int show = br_hist[i]; #ifdef RH_HIST - show = show && (lines > 1); + show = show && (mylines > 1); d170 1 a170 2 if (show || (i >= brhist.vbr_bitrate_min_index @ 1.14 log @fix a namespace problem on solaris @ text @d1 1 a1 1 $NetBSD$ @ 1.13 log @Not needed any longer. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.12 2004/04/14 09:13:20 adam Exp $ d3 29 a31 11 --- configure.orig 2004-04-11 14:47:52.000000000 +0000 +++ configure @@@@ -26427,7 +26427,7 @@@@ if test "${ac_cv_lib_ffm_cos+set}" = set echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lffm $LIBS" +LIBS="-lffm -lm $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @ 1.12 log @Changes 3.96: * quality improvments * several bugs fixes, including some fatal ones @ text @d1 1 a1 1 $NetBSD$ @ 1.11 log @Changes 3.95.1: * improved presets * fixed issues in VBR header * more robust decoding * several fixes in psychoacoustic model * removed Vorbis support * 10% faster on PowerPC @ text @d3 1 a3 1 --- configure.orig 2004-01-12 13:02:51.000000000 +0000 d5 1 a5 1 @@@@ -26116,7 +26116,7 @@@@ if test "${ac_cv_lib_ffm_cos+set}" = set @ 1.10 log @Update to 3.93.1, from Juan RP in pkg/19388. Changes: LAME 3.93.1 December 1 2002 * Gabriel Bouvigne: * preset medium added to the dll interface * fix for abr/cbr presets * fix -q0 switch * Alexander Leidinger: fix link problem on systems where socket() resides in libsocket LAME 3.93 November 16 2002 * Takehiro Tominaga: * bit allocation for pre-echo control improved for single channel encodings * substep noise shaping * optimizations by changing data structure * noise shaping model 2 fix * nspsytune FIR filter clean up * fix small psymodel bugs(DC current estimation, preecho detection of non-VBR mode, and nspsymode initialization) * portability fixes for Tru64 UNIX * Albert Faber: some fixes in the DLL * Simon Blandford: fixes for channel scaling in mono mode * Dominique Duvivier: some optimizations and a faster log10 function * Mark Taylor: * some tag related fixes in the direct show filter and in the ACM codec * fixed a mono encoding bug found by Justin Schoeman * calc_noise bug fix * other fixes * Alexander Leidinger: * update to autoconf 2.53, rewrite some configure tests * Akos Maroy: determine gcc version even with gcc 3.1 * Andrew Bachmann: compile shared libs on BeOS (and perhaps other arches) * ultrasparc switches for gcc 3.1 * fixes for SunOS 4.x * fixes for 64bit arches * CFLAGS fix for IRIX * don't override CFLAGS if exptopt isn't requested * Robert Hegeman: * some fixes * some fixes for VBR * Gabriel Bouvigne: * --noasm switch. Might help Cyrix/Via users * presets and alt-presets merged @ text @d3 1 a3 1 --- configure.orig Sun Dec 1 17:16:10 2002 d5 1 a5 1 @@@@ -10867,7 +10867,7 @@@@ if test "${ac_cv_lib_ffm_cos+set}" = set d13 1 a13 1 #include "confdefs.h" @ 1.9 log @Update to 3.91. Changes since 3.89: * Darin Morrison: Bugfix for --alt-preset (for content with low volume, clean vocals), only important for the "fast standard" preset * Alexander Leidinger:
&6 d8 1 a8 1 ac_save_LIBS="$LIBS" d10 3 a12 3 +LIBS="-lffm -lm $LIBS" cat > conftest.$ac_ext <&6 fi +# we don't want to use ncurses, curses are good enough +if false; then echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 echo "configure:4332: checking for initscr in -lncurses" >&5 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` @@@@ -4366,6 +4368,7 @@@@ else echo "$ac_t""no" 1>&6 fi +fi echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6 @@@@ -4415,7 +4418,7 @@@@ d12 1 a12 1 #line 4421 "configure" a13 9 @@@@ -4443,7 +4446,7 @@@@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - USE_LIBM="-lffm" + USE_LIBM="-lffm -lm" else echo "$ac_t""no" 1>&6 fi @ 1.7 log @update to 3.89 pkgsrc related changes: -use default install, so we get the library installed too (needed eg. as audacity plugin) -this version knows about libffm (on alpha), removed corresponding patches (untested) changelog: LAME 3.89alpha July 5 2001 John Stewart: long filename support for Win9x/NT. Takehiro Tominaga: LAME can calculate the CRC of VBR header, so now "lame -pv" works fine. Robert Hegemann: Improvements of the new VBR code. Robert Hegemann: New VBR code is now defaulted. The VBR speed is now on par with CBR. We will use the old VBR code in the release. Gabriel Bouvigne: Change of the maximum frame size limit. LAME should now be more friendly with hardware players. Gabriel Bouvigne: Size of VBR is now more balanced according to the -V value. Alexander Leidinger: Finished the implementation of the set/get functions. John Dahlstrom: LAME now handles 24bits input Mark Taylor: bugs in lame --decode causing truncation of mp3 file fixed Mark Taylor: preliminary --nogap support "Final" API completed: shared library safe! This API is frozen and should be backwords compatiable with future versions of libmp3lame.so, but we will continue to add new functionality. LAME 3.88beta March 25 2001 A lot of work that was never added to the History! Frank Klemm and Gabriel Bouvigne: New ATH formula. Big improvement for high bitrate encodings. Takehiro Tominaga: Temporal masking Gabriel Bouvigne/Mark Taylor: auto adjustment of ATH Robert Hegemann: Better outer_loop stopping criterion. Enabled with -q2 or better. Robert Hegemann/Naoki Shibata: slow/carefull noise shaping. -q3..9: amplify all distorted bands. -q2: amplify distorted bands within 50%. -q1-0: amplify only most distorted band at each iteration. Takehiro Tominaga: Interframe, shortblock temporal masking. Takehiro Tominaga: LAME restructured into a shared library and front end application. Slight changes to the API. More changes are coming to turn LAME into a true shared library (right now you have to recompile if you upgrade the library :-( Naoki Shibata: improvements to psychoacoustics (--nspsytune) BUG in long block pre echo control fixed (some out of range array access in M/S psychoacoustics) Ralf Kempkens: Visual Basic Script for lame, suggested to put it on your Windows Desktop and you can drag'n'drop Waves to encode on it. Alexander Stumpf: improved lame.bat for 4Dos users Mark Taylor: Several bugs fixed in the resampling code. Frank Klemm, Robert Hegemann: added assembler code for CPU feature detection on runtime (MMX, 3DNow, SIMD) Takehiro Tominaga: 3DNow FFT code. Florian Bome, Alexander Leidinger: more work on configure stuff Alexander Leidinger: automake/libtool generated Makefiles and TONS of other work. Alexander Leidinger: Much work towards shared library style API. Anonymous: New more efficient RTP code. Mark Taylor: psycho-acoustic data now computed for all scalefactor bands (up to 24khz) Mark Taylor, Takehiro Tominaga: All ISO table data replaced by formulas - should improve MPEG2.5 results for which we never had correct table data. @ text @d3 2 a4 2 --- configure.orig Sun Jul 1 22:19:07 2001 +++ configure Tue Jul 31 12:43:26 2001 d22 18 @ 1.6 log @Update lame to 3.87; retire lame-gui package, use LAME_USE_GTK variable instead; install more documentation. Lame isn't any longer a patch against the ISO source, but stand-alone. Other changes: MP3 decoding support, ID3V2 support, vorbis support (not compiled in right now), MPEG2.5 support; lots of bugfixes and speedups (for details, see installed history.html). @ text @d3 3 a5 15 --- configure.orig Mon Sep 25 23:23:23 2000 +++ configure @@@@ -970,8 +970,9 @@@@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -CONFIG_LIBS= -CONFIG_OPTS= +# pass CFLAGS and LIBS (else they get ignored) +CONFIG_LIBS="$LIBS" +CONFIG_OPTS="$CFLAGS" CONFIG_LDFLAGS= @@@@ -1055,6 +1056,8 @@@@ d12 1 a12 1 echo "configure:1060: checking for initscr in -lncurses" >&5 d14 1 a14 1 @@@@ -1094,6 +1097,7 @@@@ d20 1 a21 11 echo "configure:1100: checking for cos in -lm" >&5 @@@@ -1681,7 +1685,8 @@@@ fi echo "$ac_t""$CONFIG_BRHIST" 1>&6 -CONFIG_LIBS="$HAVE_LIBM $CONFIG_LIBS" +# take care that -lm appears after -lffm (for alpha) +CONFIG_LIBS="$CONFIG_LIBS $HAVE_LIBM" @ 1.5 log @Upgrade lame and lame-gui to 3.70. Full list of changes available at http://www.sulaco.org/mp3/history.html, but highlights include: - Faster Huffman encoding routines - faster pow() code. - faster FFT routines - new scalefac data structure - improves performance! - Fitlers based on polyphase filterbank. should be slightly better since the responce is independent of the blocktype, and they are slightly faster. + many bugfixes @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2000/02/08 16:54:43 garbled Exp $ d3 41 a43 12 --- loopold.c.orig Sat Jan 29 16:55:41 2000 +++ loopold.c Sat Jan 29 16:51:49 2000 @@@@ -596,6 +596,9 @@@@ } over[ch] = 0; + over_noise[ch]=0; + tot_noise[ch]=0; + max_noise[ch]=-999; xr_s[ch] = (D192_3 *) xr[ch]; ix_s[ch] = (I192_3 *) ix[ch]; } @ 1.4 log @Add patch from Joachim Kuebart to make lame work on alpha. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @upgrade lame to 3.31beta, and add support for the gui (disabled, used by lame-gui pkg) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 1999/08/10 11:16:59 agc Exp $ d3 4 a6 26 Adjust for gcc, and don't use Sun compiler on Solaris. --- Makefile.orig Tue Aug 10 11:59:27 1999 +++ Makefile Tue Aug 10 12:04:40 1999 @@@@ -13,7 +13,7 @@@@ # defaults: PGM = lame CC = gcc -CC_OPTS = -O +CC_OPTS = -O3 GTK = GTKLIBS = SNDLIB = @@@@ -98,10 +98,10 @@@@ ########################################################################## # SunOS ########################################################################## -ifeq ($(UNAME),SunOS) - CC = cc - MAKEDEP = -xM -endif +#ifeq ($(UNAME),SunOS) +# CC = cc +# MAKEDEP = -xM +#endif d8 7 a14 1 ########################################################################## @ 1.2 log @Add PATCH_SITES so that the patch can be fetched. Make this package work on Solaris, and regen patch-sum file. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 1999/08/08 03:12:09 hubertf Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 4 a6 2 --- Makefile.orig Sun Aug 8 04:49:36 1999 +++ Makefile Sun Aug 8 04:49:53 1999 d16 15 @ 1.1.1.1 log @mp3 encoder @ text @@