diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs/libFLAC/file_decoder.c | 20 | ||||
-rw-r--r-- | apps/codecs/libFLAC/seekable_stream_decoder.c | 27 | ||||
-rw-r--r-- | apps/codecs/libFLAC/stream_decoder.c | 31 |
3 files changed, 48 insertions, 30 deletions
diff --git a/apps/codecs/libFLAC/file_decoder.c b/apps/codecs/libFLAC/file_decoder.c index f0a3ea170e..213e76e8a5 100644 --- a/apps/codecs/libFLAC/file_decoder.c +++ b/apps/codecs/libFLAC/file_decoder.c | |||
@@ -100,6 +100,8 @@ FLAC_API const char * const FLAC__FileDecoderStateString[] = { | |||
100 | * Class constructor/destructor | 100 | * Class constructor/destructor |
101 | * | 101 | * |
102 | ***********************************************************************/ | 102 | ***********************************************************************/ |
103 | FLAC_FileDecoderProtected _fdprotected; | ||
104 | FLAC_FileDecoderPrivate _fdprivate; | ||
103 | 105 | ||
104 | FLAC_API FLAC__FileDecoder *FLAC__file_decoder_new() | 106 | FLAC_API FLAC__FileDecoder *FLAC__file_decoder_new() |
105 | { | 107 | { |
@@ -112,24 +114,26 @@ FLAC_API FLAC__FileDecoder *FLAC__file_decoder_new() | |||
112 | return 0; | 114 | return 0; |
113 | } | 115 | } |
114 | 116 | ||
115 | decoder->protected_ = (FLAC__FileDecoderProtected*)calloc(1, sizeof(FLAC__FileDecoderProtected)); | 117 | decoder->protected = &_fdprotected; |
118 | /*decoder->protected_ = (FLAC__FileDecoderProtected*)calloc(1, sizeof(FLAC__FileDecoderProtected)); | ||
116 | if(decoder->protected_ == 0) { | 119 | if(decoder->protected_ == 0) { |
117 | free(decoder); | 120 | free(decoder); |
118 | return 0; | 121 | return 0; |
119 | } | 122 | }*/ |
120 | 123 | ||
121 | decoder->private_ = (FLAC__FileDecoderPrivate*)calloc(1, sizeof(FLAC__FileDecoderPrivate)); | 124 | decoder->private_ = &_fdprivate; |
125 | /*decoder->private_ = (FLAC__FileDecoderPrivate*)calloc(1, sizeof(FLAC__FileDecoderPrivate)); | ||
122 | if(decoder->private_ == 0) { | 126 | if(decoder->private_ == 0) { |
123 | free(decoder->protected_); | 127 | free(decoder->protected_); |
124 | free(decoder); | 128 | free(decoder); |
125 | return 0; | 129 | return 0; |
126 | } | 130 | }*/ |
127 | 131 | ||
128 | decoder->private_->seekable_stream_decoder = FLAC__seekable_stream_decoder_new(); | 132 | decoder->private_->seekable_stream_decoder = FLAC__seekable_stream_decoder_new(); |
129 | if(0 == decoder->private_->seekable_stream_decoder) { | 133 | if(0 == decoder->private_->seekable_stream_decoder) { |
130 | free(decoder->private_); | 134 | /*free(decoder->private_); |
131 | free(decoder->protected_); | 135 | free(decoder->protected_); |
132 | free(decoder); | 136 | free(decoder);*/ |
133 | return 0; | 137 | return 0; |
134 | } | 138 | } |
135 | 139 | ||
@@ -153,9 +157,9 @@ FLAC_API void FLAC__file_decoder_delete(FLAC__FileDecoder *decoder) | |||
153 | 157 | ||
154 | FLAC__seekable_stream_decoder_delete(decoder->private_->seekable_stream_decoder); | 158 | FLAC__seekable_stream_decoder_delete(decoder->private_->seekable_stream_decoder); |
155 | 159 | ||
156 | free(decoder->private_); | 160 | /*free(decoder->private_); |
157 | free(decoder->protected_); | 161 | free(decoder->protected_); |
158 | free(decoder); | 162 | free(decoder);*/ |
159 | } | 163 | } |
160 | 164 | ||
161 | /*********************************************************************** | 165 | /*********************************************************************** |
diff --git a/apps/codecs/libFLAC/seekable_stream_decoder.c b/apps/codecs/libFLAC/seekable_stream_decoder.c index 7aa215bed5..5af0af0d03 100644 --- a/apps/codecs/libFLAC/seekable_stream_decoder.c +++ b/apps/codecs/libFLAC/seekable_stream_decoder.c | |||
@@ -135,35 +135,42 @@ FLAC_API const char * const FLAC__SeekableStreamDecoderLengthStatusString[] = { | |||
135 | * | 135 | * |
136 | ***********************************************************************/ | 136 | ***********************************************************************/ |
137 | 137 | ||
138 | FLAC__SeekableStreamDecoder _ssd; | ||
139 | FLAC__SeekableStreamDecoderProtected _ssdprotected IDATA_ATTR; | ||
140 | FLAC__SeekableStreamDecoderPrivate _ssdprivate IDATA_ATTR; | ||
141 | |||
138 | FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new(void) | 142 | FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new(void) |
139 | { | 143 | { |
140 | FLAC__SeekableStreamDecoder *decoder; | 144 | FLAC__SeekableStreamDecoder *decoder; |
141 | 145 | ||
142 | FLAC__ASSERT(sizeof(int) >= 4); /* we want to die right away if this is not true */ | 146 | FLAC__ASSERT(sizeof(int) >= 4); /* we want to die right away if this is not true */ |
143 | 147 | ||
144 | decoder = (FLAC__SeekableStreamDecoder*)calloc(1, sizeof(FLAC__SeekableStreamDecoder)); | 148 | decoder = &_ssd; |
149 | /*decoder = (FLAC__SeekableStreamDecoder*)calloc(1, sizeof(FLAC__SeekableStreamDecoder)); | ||
145 | if(decoder == 0) { | 150 | if(decoder == 0) { |
146 | return 0; | 151 | return 0; |
147 | } | 152 | }*/ |
148 | 153 | ||
149 | decoder->protected_ = (FLAC__SeekableStreamDecoderProtected*)calloc(1, sizeof(FLAC__SeekableStreamDecoderProtected)); | 154 | decoder->protected_ = &_ssdprotected; |
155 | /*decoder->protected_ = (FLAC__SeekableStreamDecoderProtected*)calloc(1, sizeof(FLAC__SeekableStreamDecoderProtected)); | ||
150 | if(decoder->protected_ == 0) { | 156 | if(decoder->protected_ == 0) { |
151 | free(decoder); | 157 | free(decoder); |
152 | return 0; | 158 | return 0; |
153 | } | 159 | }*/ |
154 | 160 | ||
155 | decoder->private_ = (FLAC__SeekableStreamDecoderPrivate*)calloc(1, sizeof(FLAC__SeekableStreamDecoderPrivate)); | 161 | decoder->private_ = &_ssdprivate; |
162 | /*decoder->private_ = (FLAC__SeekableStreamDecoderPrivate*)calloc(1, sizeof(FLAC__SeekableStreamDecoderPrivate)); | ||
156 | if(decoder->private_ == 0) { | 163 | if(decoder->private_ == 0) { |
157 | free(decoder->protected_); | 164 | free(decoder->protected_); |
158 | free(decoder); | 165 | free(decoder); |
159 | return 0; | 166 | return 0; |
160 | } | 167 | }*/ |
161 | 168 | ||
162 | decoder->private_->stream_decoder = FLAC__stream_decoder_new(); | 169 | decoder->private_->stream_decoder = FLAC__stream_decoder_new(); |
163 | if(0 == decoder->private_->stream_decoder) { | 170 | if(0 == decoder->private_->stream_decoder) { |
164 | free(decoder->private_); | 171 | /*free(decoder->private_); |
165 | free(decoder->protected_); | 172 | free(decoder->protected_); |
166 | free(decoder); | 173 | free(decoder);*/ |
167 | return 0; | 174 | return 0; |
168 | } | 175 | } |
169 | 176 | ||
@@ -185,9 +192,9 @@ FLAC_API void FLAC__seekable_stream_decoder_delete(FLAC__SeekableStreamDecoder * | |||
185 | 192 | ||
186 | FLAC__stream_decoder_delete(decoder->private_->stream_decoder); | 193 | FLAC__stream_decoder_delete(decoder->private_->stream_decoder); |
187 | 194 | ||
188 | free(decoder->private_); | 195 | /*free(decoder->private_); |
189 | free(decoder->protected_); | 196 | free(decoder->protected_); |
190 | free(decoder); | 197 | free(decoder);*/ |
191 | } | 198 | } |
192 | 199 | ||
193 | /*********************************************************************** | 200 | /*********************************************************************** |
diff --git a/apps/codecs/libFLAC/stream_decoder.c b/apps/codecs/libFLAC/stream_decoder.c index ac398d0150..6f6b221527 100644 --- a/apps/codecs/libFLAC/stream_decoder.c +++ b/apps/codecs/libFLAC/stream_decoder.c | |||
@@ -184,6 +184,10 @@ FLAC_API const char * const FLAC__StreamDecoderErrorStatusString[] = { | |||
184 | * Class constructor/destructor | 184 | * Class constructor/destructor |
185 | * | 185 | * |
186 | ***********************************************************************/ | 186 | ***********************************************************************/ |
187 | FLAC__StreamDecoder _sd; | ||
188 | FLAC__StreamDecoderPrivate _sdprivate IDATA_ATTR; | ||
189 | FLAC__StreamDecoderProtected _sdprotected IDATA_ATTR; | ||
190 | |||
187 | FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void) | 191 | FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void) |
188 | { | 192 | { |
189 | FLAC__StreamDecoder *decoder; | 193 | FLAC__StreamDecoder *decoder; |
@@ -191,38 +195,41 @@ FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void) | |||
191 | 195 | ||
192 | FLAC__ASSERT(sizeof(int) >= 4); /* we want to die right away if this is not true */ | 196 | FLAC__ASSERT(sizeof(int) >= 4); /* we want to die right away if this is not true */ |
193 | 197 | ||
194 | decoder = (FLAC__StreamDecoder*)calloc(1, sizeof(FLAC__StreamDecoder)); | 198 | decoder = &_sd; |
199 | /*decoder = (FLAC__StreamDecoder*)calloc(1, sizeof(FLAC__StreamDecoder)); | ||
195 | if(decoder == 0) { | 200 | if(decoder == 0) { |
196 | return 0; | 201 | return 0; |
197 | } | 202 | }*/ |
198 | 203 | ||
199 | decoder->protected_ = (FLAC__StreamDecoderProtected*)calloc(1, sizeof(FLAC__StreamDecoderProtected)); | 204 | decoder->protected_ = &_sdprotected; |
205 | /*decoder->protected_ = (FLAC__StreamDecoderProtected*)calloc(1, sizeof(FLAC__StreamDecoderProtected)); | ||
200 | if(decoder->protected_ == 0) { | 206 | if(decoder->protected_ == 0) { |
201 | free(decoder); | 207 | free(decoder); |
202 | return 0; | 208 | return 0; |
203 | } | 209 | }*/ |
204 | 210 | ||
205 | decoder->private_ = (FLAC__StreamDecoderPrivate*)calloc(1, sizeof(FLAC__StreamDecoderPrivate)); | 211 | decoder->private_ = &_sdprivate; |
212 | /*decoder->private_ = (FLAC__StreamDecoderPrivate*)calloc(1, sizeof(FLAC__StreamDecoderPrivate)); | ||
206 | if(decoder->private_ == 0) { | 213 | if(decoder->private_ == 0) { |
207 | free(decoder->protected_); | 214 | free(decoder->protected_); |
208 | free(decoder); | 215 | free(decoder); |
209 | return 0; | 216 | return 0; |
210 | } | 217 | }*/ |
211 | 218 | ||
212 | decoder->private_->input = FLAC__bitbuffer_new(); | 219 | decoder->private_->input = FLAC__bitbuffer_new(); |
213 | if(decoder->private_->input == 0) { | 220 | if(decoder->private_->input == 0) { |
214 | free(decoder->private_); | 221 | /*free(decoder->private_); |
215 | free(decoder->protected_); | 222 | free(decoder->protected_); |
216 | free(decoder); | 223 | free(decoder);*/ |
217 | return 0; | 224 | return 0; |
218 | } | 225 | } |
219 | 226 | ||
220 | decoder->private_->metadata_filter_ids_capacity = 16; | 227 | decoder->private_->metadata_filter_ids_capacity = 16; |
221 | if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)malloc((FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8) * decoder->private_->metadata_filter_ids_capacity))) { | 228 | if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)malloc((FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8) * decoder->private_->metadata_filter_ids_capacity))) { |
222 | FLAC__bitbuffer_delete(decoder->private_->input); | 229 | FLAC__bitbuffer_delete(decoder->private_->input); |
223 | free(decoder->private_); | 230 | /*free(decoder->private_); |
224 | free(decoder->protected_); | 231 | free(decoder->protected_); |
225 | free(decoder); | 232 | free(decoder);*/ |
226 | return 0; | 233 | return 0; |
227 | } | 234 | } |
228 | 235 | ||
@@ -264,9 +271,9 @@ FLAC_API void FLAC__stream_decoder_delete(FLAC__StreamDecoder *decoder) | |||
264 | for(i = 0; i < FLAC__MAX_CHANNELS; i++) | 271 | for(i = 0; i < FLAC__MAX_CHANNELS; i++) |
265 | FLAC__format_entropy_coding_method_partitioned_rice_contents_clear(&decoder->private_->partitioned_rice_contents[i]); | 272 | FLAC__format_entropy_coding_method_partitioned_rice_contents_clear(&decoder->private_->partitioned_rice_contents[i]); |
266 | 273 | ||
267 | free(decoder->private_); | 274 | /*free(decoder->private_); |
268 | free(decoder->protected_); | 275 | free(decoder->protected_); |
269 | free(decoder); | 276 | free(decoder);*/ |
270 | } | 277 | } |
271 | 278 | ||
272 | /*********************************************************************** | 279 | /*********************************************************************** |