summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2021-03-02 19:20:39 -0500
committerWilliam Wilgus <wilgus.william@gmail.com>2021-03-02 19:20:39 -0500
commit2252bde144262cd37557a96182cf6b94116608d6 (patch)
treeafc96250ebdcac7b1a49835a3732e0e925c3ab82
parenta01721948883d45bc73577a6c8185a5a630ef237 (diff)
downloadrockbox-2252bde144262cd37557a96182cf6b94116608d6.tar.gz
rockbox-2252bde144262cd37557a96182cf6b94116608d6.zip
Nudge flac towards upstream FS#13266 -- Fix Yellow
unused variables Change-Id: I69e1435941da6207c75d0f3cb862dee296a5cc1a
-rw-r--r--lib/rbcodec/codecs/libffmpegFLAC/decoder.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rbcodec/codecs/libffmpegFLAC/decoder.c b/lib/rbcodec/codecs/libffmpegFLAC/decoder.c
index 107315c2f7..b3cd79b6c5 100644
--- a/lib/rbcodec/codecs/libffmpegFLAC/decoder.c
+++ b/lib/rbcodec/codecs/libffmpegFLAC/decoder.c
@@ -230,6 +230,7 @@ static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_orde
230 return 0; 230 return 0;
231} 231}
232 232
233#if !defined(CPU_COLDFIRE)
233static void flac_lpc_32_c(int32_t *decoded, int coeffs[], 234static void flac_lpc_32_c(int32_t *decoded, int coeffs[],
234 int pred_order, int qlevel, int len) ICODE_ATTR_FLAC; 235 int pred_order, int qlevel, int len) ICODE_ATTR_FLAC;
235static void flac_lpc_32_c(int32_t *decoded, int coeffs[], 236static void flac_lpc_32_c(int32_t *decoded, int coeffs[],
@@ -273,6 +274,7 @@ static void lpc_analyze_remodulate(int32_t *decoded, int coeffs[],
273 decoded[j] += p >> qlevel; 274 decoded[j] += p >> qlevel;
274 } 275 }
275} 276}
277#endif
276 278
277static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order, int bps) ICODE_ATTR_FLAC; 279static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order, int bps) ICODE_ATTR_FLAC;
278static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order, int bps) 280static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order, int bps)
@@ -310,11 +312,11 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order,
310 312
311 if ((s->bps + coeff_prec + av_log2(pred_order)) <= 32) { 313 if ((s->bps + coeff_prec + av_log2(pred_order)) <= 32) {
312 #if defined(CPU_COLDFIRE) 314 #if defined(CPU_COLDFIRE)
313 (void)sum; 315 (void)sum, j;
314 lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order, 316 lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order,
315 decoded + pred_order, coeffs); 317 decoded + pred_order, coeffs);
316 #elif defined(CPU_ARM) 318 #elif defined(CPU_ARM)
317 (void)sum; 319 (void)sum, j;
318 lpc_decode_arm(s->blocksize - pred_order, qlevel, pred_order, 320 lpc_decode_arm(s->blocksize - pred_order, qlevel, pred_order,
319 decoded + pred_order, coeffs); 321 decoded + pred_order, coeffs);
320 #else 322 #else
@@ -328,11 +330,9 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order,
328 #endif 330 #endif
329 } else { 331 } else {
330 #if defined(CPU_COLDFIRE) 332 #if defined(CPU_COLDFIRE)
331 (void)j;
332 lpc_decode_emac_wide(s->blocksize - pred_order, qlevel, pred_order, 333 lpc_decode_emac_wide(s->blocksize - pred_order, qlevel, pred_order,
333 decoded + pred_order, coeffs); 334 decoded + pred_order, coeffs);
334 #else 335 #else
335
336 flac_lpc_32_c(decoded, coeffs, pred_order, qlevel, s->blocksize); 336 flac_lpc_32_c(decoded, coeffs, pred_order, qlevel, s->blocksize);
337 337
338 if (bps <= 16) 338 if (bps <= 16)