Author: ayoung
Date: Wed Feb 24 09:07:00 2010
New Revision: 8567
URL: http://svn.slimdevices.com/jive?rev=8567&view=rev
Log:
bug 12421: ALAC native codec
Fix off-by-one error in MP4 sample handling.
Make ALAC init flag more robust.
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alac.c
7.5/trunk/squeezeplay/src/squeezeplay/src/audio/mp4.c
Modified: 7.5/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alac.c
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alac.c?rev=8567&r1=8566&r2=8567&view=diff
==============================================================================
--- 7.5/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alac.c
(original)
+++ 7.5/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alac.c Wed
Feb 24 09:07:00 2010
@@ -55,8 +55,6 @@
}
if (!self->init) {
- self->init = TRUE;
-
if (!mp4_open(&self->mp4)) {
current_decoder_state |= DECODE_STATE_UNDERRUN;
return FALSE;
@@ -76,6 +74,7 @@
self->alacdec.extradata_size = conf_size - 28;
alac_decode_init(&self->alacdec);
+ self->init = TRUE;
}
avpkt.data = (void *)mp4_read(&self->mp4, 0, &len, &streaming);
Modified: 7.5/trunk/squeezeplay/src/squeezeplay/src/audio/mp4.c
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/src/audio/mp4.c?rev=8567&r1=8566&r2=8567&view=diff
==============================================================================
--- 7.5/trunk/squeezeplay/src/squeezeplay/src/audio/mp4.c (original)
+++ 7.5/trunk/squeezeplay/src/squeezeplay/src/audio/mp4.c Wed Feb 24 09:07:00
2010
@@ -600,7 +600,7 @@
static inline void packet_size(struct mp4_track *track, size_t *pos, size_t
*len)
{
- if (track->sample_count < track->sample_num) {
+ if (track->sample_count <= track->sample_num) {
*pos = 0;
*len = 0;
return;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
