Mercurial > libavformat.hg
diff iff.c @ 3285:ccfd981fe0fa libavformat
IFF stereo support
Patch by Jai Menon ( realityman gmx net )
author | superdump |
---|---|
date | Fri, 09 May 2008 11:25:27 +0000 |
parents | a437fb5ca080 |
children | 7a0230981402 |
line wrap: on
line diff
--- 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;