#define PACKET_SIZE 1024
-typedef enum {COMP_NONE, COMP_FIB, COMP_EXP} svx8_compression_t;
+typedef enum {COMP_NONE, COMP_FIB, COMP_EXP} svx8_compression_type;
typedef struct {
uint32_t body_size;
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;
ByteIOContext *pb = s->pb;
AVStream *st;
uint32_t chunk_id, data_size;
- int padding, ret, done = 0;
+ int padding, done = 0;
st = av_new_stream(s, 0);
if (!st)
return -1;
}
- st->codec->bits_per_sample = 8;
- st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_sample;
- st->codec->block_align = st->codec->channels * st->codec->bits_per_sample;
+ st->codec->bits_per_coded_sample = 8;
+ st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample;
+ st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
return 0;
}
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;
AVInputFormat iff_demuxer = {
"IFF",
- "IFF format",
+ NULL_IF_CONFIG_SMALL("IFF format"),
sizeof(IffDemuxContext),
iff_probe,
iff_read_header,