Author: titmuss
Date: Thu Oct 30 04:05:08 2008
New Revision: 3236
URL: http://svn.slimdevices.com?rev=3236&root=Jive&view=rev
Log:
Bug: N/A
Description:
Porting fix for bug 9046 from ip3k firmware r4698.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c?rev=3236&root=Jive&r1=3235&r2=3236&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c Thu Oct
30 04:05:08 2008
@@ -260,8 +260,6 @@
int i, offset = 0;
pcm = &self->synth.pcm;
-
- self->sample_rate = self->frame.header.samplerate;
if (!decode_output_can_write(pcm->length * 2 * sizeof(sample_t),
self->sample_rate)) {
self->state = MAD_STATE_PCM_READY;
@@ -281,8 +279,16 @@
xing_parse(self);
self->encoder_delay *= pcm->channels;
+
+ self->sample_rate = self->frame.header.samplerate;
}
else {
+ /* Bug 9046, don't allow sample rate to change mid stream */
+ if (self->sample_rate != self->frame.header.samplerate) {
+ DEBUG_TRACE("Sample rate changed from %d to %d,
discarding PCM", self->sample_rate, self->frame.header.samplerate);
+ return;
+ }
+
buf = self->output_buffer;
left = pcm->samples[0];
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
