Author: titmuss
Date: Tue Jan 6 04:03:13 2009
New Revision: 3688
URL: http://svn.slimdevices.com?rev=3688&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3687): titmuss | 2009-01-06 12:01:11 +0000
Bug: 10542
Description:
Fix from Josh Coalson for libFLAC to solve audio playback problems.
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac-1.2.1/
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac-1.2.1/bitreader.patch
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac_1.2.1.bb
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jan 6 04:03:13 2009
@@ -3,7 +3,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3682
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3687
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac-1.2.1/bitreader.patch
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac-1.2.1/bitreader.patch?rev=3688&root=Jive&view=auto
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac-1.2.1/bitreader.patch
(added)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac-1.2.1/bitreader.patch
Tue Jan 6 04:03:13 2009
@@ -1,0 +1,55 @@
+--- ../flac-1.1.4/src/libFLAC/bitreader.c Mon Feb 12 18:10:27 2007
++++ flac-1.1.4/src/libFLAC/bitreader.c Mon Jan 5 17:35:42 2009
+@@ -732,11 +732,11 @@
+ * this is a repeat of the above logic adjusted for the fact we
+ * don't have a whole word. note though if the client is
feeding
+ * us data a byte at a time (unlikely), br->consumed_bits may
not
+ * be zero.
+ */
+- if(br->bytes) {
++ if(br->bytes*8 > br->consumed_bits) {
+ const unsigned end = br->bytes * 8;
+ brword b = (br->buffer[br->consumed_words] &
(FLAC__WORD_ALL_ONES << (FLAC__BITS_PER_WORD-end))) << br->consumed_bits;
+ if(b) {
+ #if 0 /* too slow, but this is the idea: */
+ for(i = 0; !(b & FLAC__WORD_TOP_BIT_ONE); i++)
+@@ -750,11 +750,11 @@
+ FLAC__ASSERT(br->consumed_bits <
FLAC__BITS_PER_WORD);
+ return true;
+ }
+ else {
+ *val += end - br->consumed_bits;
+- br->consumed_bits += end;
++ br->consumed_bits = end;
+ FLAC__ASSERT(br->consumed_bits <
FLAC__BITS_PER_WORD);
+ /* didn't find stop bit yet, have to keep
going... */
+ }
+ }
+ if(!bitreader_read_from_client_(br))
+@@ -854,11 +854,11 @@
+ * this is a repeat of the above logic adjusted for the
fact we
+ * don't have a whole word. note though if the client
is feeding
+ * us data a byte at a time (unlikely),
br->consumed_bits may not
+ * be zero.
+ */
+- if(br->bytes) {
++ if(br->bytes*8 > cbits) {
+ const unsigned end = br->bytes * 8;
+ brword b = (br->buffer[cwords] &
(FLAC__WORD_ALL_ONES << (FLAC__BITS_PER_WORD-end))) << cbits;
+ if(b) {
+ #if 0 /* too slow, but this is the idea: */
+ for(i = 0; !(b &
FLAC__WORD_TOP_BIT_ONE); i++)
+@@ -873,11 +873,11 @@
+ FLAC__ASSERT(cbits <
FLAC__BITS_PER_WORD);
+ goto break1;
+ }
+ else {
+ uval += end - cbits;
+- cbits += end;
++ cbits = end;
+ FLAC__ASSERT(cbits <
FLAC__BITS_PER_WORD);
+ /* didn't find stop bit yet, have to
keep going... */
+ }
+ }
+ /* flush registers and read;
bitreader_read_from_client_() does
+
Modified: 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac_1.2.1.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac_1.2.1.bb?rev=3688&root=Jive&r1=3687&r2=3688&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac_1.2.1.bb
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/flac/flac_1.2.1.bb Tue Jan
6 04:03:13 2009
@@ -2,9 +2,10 @@
SECTION = "libs"
LICENSE = "Xiph"
-PR = "r2"
+PR = "r3"
-SRC_URI="${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz"
+SRC_URI="${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
+ file://bitreader.patch;patch=1"
S = "${WORKDIR}/flac-${PV}"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
