# HG changeset patch # User superdump # Date 1210332327 0 # Node ID ccfd981fe0fa37fa2408f800d0fcf99eb1df1991 # Parent 7e3332b849261d6c06813d5313d1a30d3aafd9c9 IFF stereo support Patch by Jai Menon ( realityman gmx net ) diff -r 7e3332b84926 -r ccfd981fe0fa iff.c --- a/iff.c Fri May 09 09:30:43 2008 +0000 +++ b/iff.c Fri May 09 11:25:27 2008 +0000 @@ -60,6 +60,19 @@ uint32_t audio_frame_count; } IffDemuxContext; + +static void interleave_stereo(const uint8_t *src, uint8_t *dest, int size) +{ + uint8_t *end = dest + size; + size = size>>1; + + while(dest < end) { + *dest++ = *src; + *dest++ = *(src+size); + src++; + } +} + static int iff_probe(AVProbeData *p) { const uint8_t *d = p->buf; @@ -152,7 +165,20 @@ if(iff->sent_bytes > iff->body_size) return AVERROR(EIO); - ret = av_get_packet(pb, pkt, PACKET_SIZE); + + if(s->streams[0]->codec->channels == 2) { + uint8_t sample_buffer[PACKET_SIZE]; + + ret = get_buffer(pb, sample_buffer, PACKET_SIZE); + if(av_new_packet(pkt, PACKET_SIZE) < 0) { + av_log(s, AV_LOG_ERROR, "iff: cannot allocate packet \n"); + return AVERROR(ENOMEM); + } + interleave_stereo(sample_buffer, pkt->data, PACKET_SIZE); + } + else { + ret = av_get_packet(pb, pkt, PACKET_SIZE); + } if(iff->sent_bytes == 0) pkt->flags |= PKT_FLAG_KEY;