1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
|
$NetBSD: patch-ai,v 1.1 2007/01/13 15:35:52 wiz Exp $
--- ogg123/flac_format.c.orig 2005-06-03 10:15:09.000000000 +0000
+++ ogg123/flac_format.c
@@ -25,13 +25,23 @@
#include "audio.h"
#include "format.h"
#include "i18n.h"
+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
+#define NEED_EASYFLAC 1
+#endif
+#if NEED_EASYFLAC
#include "easyflac.h"
+#else
+#include <FLAC/stream_decoder.h>
+#endif
#include "vorbis_comments.h"
-#define DEFAULT_FLAC_FRAME_SIZE 4608
-
typedef struct {
+#if NEED_EASYFLAC
EasyFLAC__StreamDecoder *decoder;
+#else
+ FLAC__StreamDecoder *decoder;
+ int is_oggflac;
+#endif
short channels;
int rate;
int bits_per_sample;
@@ -67,10 +77,18 @@ format_t oggflac_format;
/* Private functions declarations */
-FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
-FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+#if NEED_EASYFLAC
+static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
+static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
+static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
+static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+#else
+static FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
+static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
+static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
+static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+static FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data);
+#endif
void resize_buffer(flac_private_t *flac, int newchannels, int newsamples);
/*void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);*/
@@ -155,6 +173,7 @@ decoder_t* flac_init (data_source_t *sou
private->buf_start = 0;
/* Setup FLAC decoder */
+#if NEED_EASYFLAC
if (oggflac_can_decode(source)) {
decoder->format = &oggflac_format;
private->decoder = EasyFLAC__stream_decoder_new(1);
@@ -172,13 +191,39 @@ decoder_t* flac_init (data_source_t *sou
EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO);
EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
EasyFLAC__init(private->decoder);
+#else
+ if (oggflac_can_decode(source)) {
+ private->is_oggflac = 1;
+ decoder->format = &oggflac_format;
+ } else {
+ private->is_oggflac = 0;
+ decoder->format = &flac_format;
+ }
+ private->decoder = FLAC__stream_decoder_new();
+
+ FLAC__stream_decoder_set_md5_checking(private->decoder, false);
+ FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO);
+ FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ if(private->is_oggflac)
+ FLAC__stream_decoder_init_ogg_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder);
+ else
+ FLAC__stream_decoder_init_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder);
+#endif
/* Callback will set the total samples and sample rate */
+#if NEED_EASYFLAC
EasyFLAC__process_until_end_of_metadata(private->decoder);
+#else
+ FLAC__stream_decoder_process_until_end_of_metadata(private->decoder);
+#endif
/* Callback will set the number of channels and resize the
audio buffer */
+#if NEED_EASYFLAC
EasyFLAC__process_single(private->decoder);
+#else
+ FLAC__stream_decoder_process_single(private->decoder);
+#endif
/* FLAC API returns signed samples on all streams */
decoder->actual_fmt.signed_sample = 1;
@@ -241,11 +286,19 @@ int flac_read (decoder_t *decoder, void
realsamples += copy;
}
else if (!priv->eos) {
+#if NEED_EASYFLAC
ret = EasyFLAC__process_single(priv->decoder);
if (!ret ||
EasyFLAC__get_state(priv->decoder)
== FLAC__STREAM_DECODER_END_OF_STREAM)
priv->eos = 1; /* Bail out! */
+#else
+ ret = FLAC__stream_decoder_process_single(priv->decoder);
+ if (!ret ||
+ FLAC__stream_decoder_get_state(priv->decoder)
+ == FLAC__STREAM_DECODER_END_OF_STREAM)
+ priv->eos = 1; /* Bail out! */
+#endif
} else
break;
}
@@ -311,8 +364,13 @@ void flac_cleanup (decoder_t *decoder)
free(priv->buf[i]);
free(priv->buf);
+#if NEED_EASYFLAC
EasyFLAC__finish(priv->decoder);
EasyFLAC__stream_decoder_delete(priv->decoder);
+#else
+ FLAC__stream_decoder_finish(priv->decoder);
+ FLAC__stream_decoder_delete(priv->decoder);
+#endif
free(decoder->private);
free(decoder);
@@ -342,7 +400,11 @@ format_t oggflac_format = {
+#if NEED_EASYFLAC
FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
+#else
+FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
+#endif
{
decoder_t *e_decoder = client_data;
flac_private_t *priv = e_decoder->private;
@@ -363,7 +425,11 @@ FLAC__StreamDecoderReadStatus easyflac_r
}
+#if NEED_EASYFLAC
FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+#else
+FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+#endif
{
decoder_t *e_decoder = client_data;
flac_private_t *priv = e_decoder->private;
@@ -389,7 +455,11 @@ FLAC__StreamDecoderWriteStatus easyflac_
}
+#if NEED_EASYFLAC
void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+#else
+void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+#endif
{
decoder_t *e_decoder = client_data;
flac_private_t *priv = e_decoder->private;
@@ -409,12 +479,24 @@ void easyflac_metadata_callback(const Ea
}
+#if NEED_EASYFLAC
void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+#else
+void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+#endif
{
}
+#if !NEED_EASYFLAC
+FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data)
+{
+ // can't get this info from the data source, so we'll let the read callback handle it
+ return false;
+}
+#endif
+
void resize_buffer(flac_private_t *flac, int newchannels, int newsamples)
{
@@ -457,7 +539,11 @@ void print_flac_stream_info (decoder_t *
+#if NEED_EASYFLAC
if (EasyFLAC__is_oggflac(priv->decoder))
+#else
+ if (priv->is_oggflac)
+#endif
cb->printf_metadata(decoder->callback_arg, 2,
_("Ogg FLAC stream: %d bits, %d channel, %ld Hz"),
priv->bits_per_sample,
|
