| author | dcarbery |
| Fri, 16 Feb 2007 08:31:35 +0000 | |
| changeset 9313 | 23996476220c |
| parent 8675 | f28cf9714bec |
| child 9748 | db4d8edd82de |
| permissions | -rw-r--r-- |
| 8667 | 1 |
--- flac-1.1.3/src/plugin_common/tags.c.orig 2006-11-30 15:58:34.067469000 +0000 |
2 |
+++ flac-1.1.3/src/plugin_common/tags.c 2006-11-30 16:00:10.958487000 +0000 |
|
3 |
@@ -29,7 +29,7 @@ |
|
| 5521 | 4 |
#include "FLAC/metadata.h" |
5 |
||
6 |
||
7 |
-static __inline unsigned local__wide_strlen(const FLAC__uint16 *s) |
|
8 |
+static inline unsigned local__wide_strlen(const FLAC__uint16 *s) |
|
9 |
{
|
|
10 |
unsigned n = 0; |
|
11 |
while(*s++) |
|
| 8667 | 12 |
@@ -43,7 +43,7 @@ |
13 |
* and a more clear explanation at the end of this section: |
|
14 |
* http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 |
|
15 |
*/ |
|
| 5521 | 16 |
-static __inline unsigned local__utf8len(const FLAC__byte *utf8) |
17 |
+static inline unsigned local__utf8len(const FLAC__byte *utf8) |
|
18 |
{
|
|
19 |
FLAC__ASSERT(0 != utf8); |
|
| 8667 | 20 |
if ((utf8[0] & 0x80) == 0) {
|
21 |
@@ -85,7 +85,7 @@ |
|
| 5521 | 22 |
} |
23 |
||
| 8667 | 24 |
|
| 5521 | 25 |
-static __inline unsigned local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2) |
26 |
+static inline unsigned local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2) |
|
27 |
{
|
|
28 |
const unsigned len = local__utf8len(utf8); |
|
29 |
||
| 8667 | 30 |
@@ -140,7 +140,7 @@ |
| 5521 | 31 |
return out; |
32 |
} |
|
33 |
||
34 |
-static __inline unsigned local__ucs2len(FLAC__uint16 ucs2) |
|
35 |
+static inline unsigned local__ucs2len(FLAC__uint16 ucs2) |
|
36 |
{
|
|
37 |
if (ucs2 < 0x0080) |
|
38 |
return 1; |
|
| 8667 | 39 |
@@ -150,7 +150,7 @@ |
| 5521 | 40 |
return 3; |
41 |
} |
|
42 |
||
43 |
-static __inline unsigned local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8) |
|
44 |
+static inline unsigned local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8) |
|
45 |
{
|
|
46 |
if (ucs2 < 0x080) {
|
|
47 |
utf8[0] = (FLAC__byte)ucs2; |
|
| 8667 | 48 |
+++ flac-1.1.3/src/share/replaygain_analysis/replaygain_analysis.c 2006-11-30 16:05:05.804777000 +0000 |
49 |
@@ -122,7 +122,14 @@ |
|
50 |
* sampleWindow calculation in ResetSampleFrequency(), and was causing |
|
51 |
* buffer overflows for 48kHz analysis, hence the +1. |
|
52 |
*/ |
|
|
5652
3e3261279d7f
* patches/flac-01-forte.diff: Update for changed source.
dc144907
parents:
5521
diff
changeset
|
53 |
+#ifndef __sun |
| 8667 | 54 |
#define MAX_SAMPLES_PER_WINDOW (size_t) (MAX_SAMP_FREQ * RMS_WINDOW_TIME + 1.) /* max. Samples per Time slice */ |
|
5652
3e3261279d7f
* patches/flac-01-forte.diff: Update for changed source.
dc144907
parents:
5521
diff
changeset
|
55 |
+#else |
| 8667 | 56 |
+ /* Different #define for Solaris Forte compiler because it |
57 |
+ doesn't like to multiply floats when declaring a variable. */ |
|
|
5652
3e3261279d7f
* patches/flac-01-forte.diff: Update for changed source.
dc144907
parents:
5521
diff
changeset
|
58 |
+#define MAX_SAMPLES_PER_WINDOW (size_t) (2401) |
|
3e3261279d7f
* patches/flac-01-forte.diff: Update for changed source.
dc144907
parents:
5521
diff
changeset
|
59 |
+#define UINT32_T_FORTE 12000.0 /* Used in Unit32_t code below. */ |
|
3e3261279d7f
* patches/flac-01-forte.diff: Update for changed source.
dc144907
parents:
5521
diff
changeset
|
60 |
+#endif |
| 8667 | 61 |
#define PINK_REF 64.82 /* 298640883795 */ /* calibration value */ |
62 |
||
63 |
static Float_t linprebuf [MAX_ORDER * 2]; |
|
64 |
@@ -142,8 +149,13 @@ |
|
65 |
static double lsum; |
|
66 |
static double rsum; |
|
67 |
static int freqindex; |
|
|
5652
3e3261279d7f
* patches/flac-01-forte.diff: Update for changed source.
dc144907
parents:
5521
diff
changeset
|
68 |
+#ifndef __sun |
| 8667 | 69 |
static Uint32_t A [(size_t)(STEPS_per_dB * MAX_dB)]; |
70 |
static Uint32_t B [(size_t)(STEPS_per_dB * MAX_dB)]; |
|
|
5652
3e3261279d7f
* patches/flac-01-forte.diff: Update for changed source.
dc144907
parents:
5521
diff
changeset
|
71 |
+#else |
| 8675 | 72 |
+static Uint32_t A [(size_t)(UINT32_T_FORTE)]; |
73 |
+static Uint32_t B [(size_t)(UINT32_T_FORTE)]; |
|
|
5652
3e3261279d7f
* patches/flac-01-forte.diff: Update for changed source.
dc144907
parents:
5521
diff
changeset
|
74 |
+#endif |
| 8667 | 75 |
|
76 |
/* for each filter: |
|
77 |
[0] 48 kHz, [1] 44.1 kHz, [2] 32 kHz, [3] 24 kHz, [4] 22050 Hz, [5] 16 kHz, [6] 12 kHz, [7] is 11025 Hz, [8] 8 kHz */ |
|
| 8675 | 78 |
--- flac-1.1.3/src/libFLAC/format.c.orig 2006-12-02 19:57:22.519801600 +0000 |
79 |
+++ flac-1.1.3/src/libFLAC/format.c 2006-12-02 19:57:40.139113400 +0000 |
|
80 |
@@ -294,7 +294,7 @@ |
|
81 |
* and a more clear explanation at the end of this section: |
|
82 |
* http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 |
|
83 |
*/ |
|
84 |
-static __inline unsigned utf8len_(const FLAC__byte *utf8) |
|
85 |
+static inline unsigned utf8len_(const FLAC__byte *utf8) |
|
86 |
{
|
|
87 |
FLAC__ASSERT(0 != utf8); |
|
88 |
if ((utf8[0] & 0x80) == 0) {
|
|
| 9313 | 89 |
--- flac-1.1.4/src/libFLAC/stream_encoder.c.orig 2007-02-16 07:50:55.650295000 +0000 |
90 |
+++ flac-1.1.4/src/libFLAC/stream_encoder.c 2007-02-16 07:51:52.170765000 +0000 |
|
91 |
@@ -4070,7 +4070,7 @@ |
|
92 |
} |
|
93 |
||
94 |
#ifdef EXACT_RICE_BITS_CALCULATION |
|
95 |
-static __inline unsigned count_rice_bits_in_partition_( |
|
96 |
+static inline unsigned count_rice_bits_in_partition_( |
|
97 |
const unsigned rice_parameter, |
|
98 |
const unsigned partition_samples, |
|
99 |
const FLAC__int32 *residual |
|
100 |
@@ -4085,7 +4085,7 @@ |
|
101 |
return partition_bits; |
|
102 |
} |
|
103 |
#else |
|
104 |
-static __inline unsigned count_rice_bits_in_partition_( |
|
105 |
+static inline unsigned count_rice_bits_in_partition_( |
|
106 |
const unsigned rice_parameter, |
|
107 |
const unsigned partition_samples, |
|
108 |
const FLAC__uint64 abs_residual_partition_sum |