Author: agrundman
Date: Fri May 21 07:23:39 2010
New Revision: 8796
URL: http://svn.slimdevices.com/jive?rev=8796&view=rev
Log:
Remove debugging line
Modified:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac-1.2.1/arm-asm.patch
Modified:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac-1.2.1/arm-asm.patch
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac-1.2.1/arm-asm.patch?rev=8796&r1=8795&r2=8796&view=diff
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac-1.2.1/arm-asm.patch
(original)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac-1.2.1/arm-asm.patch
Fri May 21 07:23:39 2010
@@ -2470,18 +2470,17 @@
SUBDIRS = $(ARCH_SUBDIRS) include .
diff -urN flac-1.2.1/src/libFLAC/stream_decoder.c
flac-1.2.1-patched/src/libFLAC/stream_decoder.c
--- flac-1.2.1/src/libFLAC/stream_decoder.c 2007-09-13 11:38:05.000000000
-0400
-+++ flac-1.2.1-patched/src/libFLAC/stream_decoder.c 2010-05-21
09:59:56.902161775 -0400
-@@ -442,6 +442,9 @@
++++ flac-1.2.1-patched/src/libFLAC/stream_decoder.c 2010-05-21
10:23:06.792160699 -0400
+@@ -442,6 +442,8 @@
decoder->private_->local_lpc_restore_signal_16bit =
FLAC__lpc_restore_signal_asm_ppc_altivec_16;
decoder->private_->local_lpc_restore_signal_16bit_order8 =
FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8;
}
+#elif defined FLAC__CPU_ARM
+ FLAC__ASSERT(decoder->private_->cpuinfo.type ==
FLAC__CPUINFO_TYPE_ARM);
-+ fprintf(stderr, "ARM ASM in use\n");
#endif
}
#endif
-@@ -2590,7 +2593,11 @@
+@@ -2590,7 +2592,11 @@
/* decode the subframe */
if(do_full_decode) {
memcpy(decoder->private_->output[channel], subframe->warmup,
sizeof(FLAC__int32) * order);
@@ -2493,7 +2492,7 @@
}
return true;
-@@ -2673,6 +2680,9 @@
+@@ -2673,6 +2679,9 @@
if( (FLAC__uint64)order * ((((FLAC__uint64)1)<<bps)-1) *
((1<<subframe->qlp_coeff_precision)-1) < (((FLAC__uint64)-1) << 32) )
*/
if(bps + subframe->qlp_coeff_precision +
FLAC__bitmath_ilog2(order) <= 32)
@@ -2503,7 +2502,7 @@
if(bps <= 16 && subframe->qlp_coeff_precision <= 16) {
if(order <= 8)
decoder->private_->local_lpc_restore_signal_16bit_order8(decoder->private_->residual[channel],
decoder->private_->frame.header.blocksize-order, subframe->qlp_coeff, order,
subframe->quantization_level, decoder->private_->output[channel]+order);
-@@ -2681,8 +2691,13 @@
+@@ -2681,8 +2690,13 @@
}
else
decoder->private_->local_lpc_restore_signal(decoder->private_->residual[channel],
decoder->private_->frame.header.blocksize-order, subframe->qlp_coeff, order,
subframe->quantization_level, decoder->private_->output[channel]+order);
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
