cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

encoding and decoding now works fine on alpha

Browse Source 
Submitted by:	Christian Weisgerber <naddy@mips.inka.de> (give me the patch) and Matt Zimmerman <mdz@debian.org> (make the patch)
This commit is contained in:
Ying-Chieh Liao 2001-05-20 14:07:31 +00:00
parent dd56df5272
commit 54c68f8ad3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=42812
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/flac/Makefile
View File

@ -20,8 +20,6 @@ BUILD_DEPENDS+= xmms-config:${PORTSDIR}/audio/xmms
LIB_DEPENDS+= xmms.1:${PORTSDIR}/audio/xmms
.endif
ONLY_FOR_ARCHS= i386
USE_LIBTOOL= yes
USE_AUTOMAKE= yes
USE_AUTOCONF= yes

37
audio/flac/files/patch-src::libFLAC::fixed.c Normal file
View File

@ -0,0 +1,37 @@
--- src/libFLAC/fixed.c.orig Sun Apr 1 07:35:25 2001
+++ src/libFLAC/fixed.c Sun May 20 13:37:20 2001
@@ -81,11 +81,11 @@ unsigned FLAC__fixed_compute_best_predic
residual_bits_per_sample[3] = (real)((data_len > 0) ? log(M_LN2 * (real)(int64)total_error_3 / (real) data_len) / M_LN2 : 0.0);
residual_bits_per_sample[4] = (real)((data_len > 0) ? log(M_LN2 * (real)(int64)total_error_4 / (real) data_len) / M_LN2 : 0.0);
#else
- residual_bits_per_sample[0] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_0 / (real) data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[1] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_1 / (real) data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[2] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_2 / (real) data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[3] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_3 / (real) data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[4] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_4 / (real) data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[0] = (real)((data_len > 0 && total_error_0 > 0) ? log(M_LN2 * (real)total_error_0 / (real) data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[1] = (real)((data_len > 0 && total_error_1 > 0) ? log(M_LN2 * (real)total_error_1 / (real) data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[2] = (real)((data_len > 0 && total_error_2 > 0) ? log(M_LN2 * (real)total_error_2 / (real) data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[3] = (real)((data_len > 0 && total_error_3 > 0) ? log(M_LN2 * (real)total_error_3 / (real) data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[4] = (real)((data_len > 0 && total_error_4 > 0) ? log(M_LN2 * (real)total_error_4 / (real) data_len) / M_LN2 : 0.0);
#endif
return order;
@@ -152,7 +152,7 @@ unsigned FLAC__fixed_compute_best_predic
void FLAC__fixed_compute_residual(const int32 data[], unsigned data_len, unsigned order, int32 residual[])
{
- unsigned i;
+ int i;
switch(order) {
case 0:
@@ -190,7 +190,7 @@ void FLAC__fixed_compute_residual(const
void FLAC__fixed_restore_signal(const int32 residual[], unsigned data_len, unsigned order, int32 data[])
{
- unsigned i;
+ int i;
switch(order) {
case 0: