#define MM_PALETTE_SIZE (MM_PALETTE_COUNT*3)
typedef struct {
- AVPaletteControl palette_control;
unsigned int audio_pts, video_pts;
} MmDemuxContext;
AVFormatParameters *ap)
{
MmDemuxContext *mm = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVStream *st;
unsigned int type, length;
st->codec->codec_tag = 0; /* no fourcc */
st->codec->width = width;
st->codec->height = height;
- st->codec->palctrl = &mm->palette_control;
av_set_pts_info(st, 64, 1, frame_rate);
/* audio stream */
av_set_pts_info(st, 64, 1, 8000); /* 8000 hz */
}
- mm->palette_control.palette_changed = 0;
mm->audio_pts = 0;
mm->video_pts = 0;
return 0;
AVPacket *pkt)
{
MmDemuxContext *mm = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
unsigned char preamble[MM_PREAMBLE_SIZE];
- unsigned char pal[MM_PALETTE_SIZE];
unsigned int type, length;
- int i;
while(1) {
if (get_buffer(pb, preamble, MM_PREAMBLE_SIZE) != MM_PREAMBLE_SIZE) {
- return AVERROR_IO;
+ return AVERROR(EIO);
}
type = AV_RL16(&preamble[0]);
switch(type) {
case MM_TYPE_PALETTE :
- url_fseek(pb, 4, SEEK_CUR); /* unknown data */
- if (get_buffer(pb, pal, MM_PALETTE_SIZE) != MM_PALETTE_SIZE)
- return AVERROR_IO;
- url_fseek(pb, length - (4 + MM_PALETTE_SIZE), SEEK_CUR);
-
- for (i=0; i<MM_PALETTE_COUNT; i++) {
- int r = pal[i*3 + 0];
- int g = pal[i*3 + 1];
- int b = pal[i*3 + 2];
- mm->palette_control.palette[i] = (r << 16) | (g << 8) | (b);
- /* repeat palette, where each components is multiplied by four */
- mm->palette_control.palette[i+128] = (r << 18) | (g << 10) | (b<<2);
- }
- mm->palette_control.palette_changed = 1;
- break;
-
case MM_TYPE_INTER :
case MM_TYPE_INTRA :
case MM_TYPE_INTRA_HH :
return AVERROR(ENOMEM);
memcpy(pkt->data, preamble, MM_PREAMBLE_SIZE);
if (get_buffer(pb, pkt->data + MM_PREAMBLE_SIZE, length) != length)
- return AVERROR_IO;
+ return AVERROR(EIO);
pkt->size = length + MM_PREAMBLE_SIZE;
pkt->stream_index = 0;
- pkt->pts = mm->video_pts++;
+ pkt->pts = mm->video_pts;
+ if (type!=MM_TYPE_PALETTE)
+ mm->video_pts++;
return 0;
case MM_TYPE_AUDIO :
- if (av_get_packet(&s->pb, pkt, length)<0)
+ if (av_get_packet(s->pb, pkt, length)<0)
return AVERROR(ENOMEM);
pkt->size = length;
pkt->stream_index = 1;
AVInputFormat mm_demuxer = {
"mm",
- "American Laser Games MM format",
+ NULL_IF_CONFIG_SMALL("American Laser Games MM format"),
sizeof(MmDemuxContext),
mm_probe,
mm_read_header,