*/
/**
- * @file libavformat/anm.c
+ * @file
* Deluxe Paint Animation demuxer
*/
} Page;
typedef struct {
- unsigned int nb_pages; /** total pages in file */
- unsigned int nb_records; /** total records in file */
+ unsigned int nb_pages; /**< total pages in file */
+ unsigned int nb_records; /**< total records in file */
int page_table_offset;
-#define MAX_PAGES 256 /** Deluxe Paint hardcoded value */
- Page pt[MAX_PAGES]; /** page table */
- int page; /** current page (or AVERROR_xxx code) */
- int record; /** current record (with in page) */
+#define MAX_PAGES 256 /**< Deluxe Paint hardcoded value */
+ Page pt[MAX_PAGES]; /**< page table */
+ int page; /**< current page (or AVERROR_xxx code) */
+ int record; /**< current record (with in page) */
} AnmDemuxContext;
#define LPF_TAG MKTAG('L','P','F',' ')
AVFormatParameters *ap)
{
AnmDemuxContext *anm = s->priv_data;
- ByteIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
AVStream *st;
int i, ret;
- url_fskip(pb, 4); /* magic number */
- if (get_le16(pb) != MAX_PAGES) {
+ avio_skip(pb, 4); /* magic number */
+ if (avio_rl16(pb) != MAX_PAGES) {
av_log_ask_for_sample(s, "max_pages != " AV_STRINGIFY(MAX_PAGES) "\n");
return AVERROR_INVALIDDATA;
}
- anm->nb_pages = get_le16(pb);
- anm->nb_records = get_le32(pb);
- url_fskip(pb, 2); /* max records per page */
- anm->page_table_offset = get_le16(pb);
- if (get_le32(pb) != ANIM_TAG)
+ anm->nb_pages = avio_rl16(pb);
+ anm->nb_records = avio_rl32(pb);
+ avio_skip(pb, 2); /* max records per page */
+ anm->page_table_offset = avio_rl16(pb);
+ if (avio_rl32(pb) != ANIM_TAG)
return AVERROR_INVALIDDATA;
/* video stream */
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_ANM;
st->codec->codec_tag = 0; /* no fourcc */
- st->codec->width = get_le16(pb);
- st->codec->height = get_le16(pb);
- if (get_byte(pb) != 0)
+ st->codec->width = avio_rl16(pb);
+ st->codec->height = avio_rl16(pb);
+ if (avio_r8(pb) != 0)
goto invalid;
- url_fskip(pb, 1); /* frame rate multiplier info */
+ avio_skip(pb, 1); /* frame rate multiplier info */
/* ignore last delta record (used for looping) */
- if (get_byte(pb)) /* has_last_delta */
+ if (avio_r8(pb)) /* has_last_delta */
anm->nb_records = FFMAX(anm->nb_records - 1, 0);
- url_fskip(pb, 1); /* last_delta_valid */
+ avio_skip(pb, 1); /* last_delta_valid */
- if (get_byte(pb) != 0)
+ if (avio_r8(pb) != 0)
goto invalid;
- if (get_byte(pb) != 1)
+ if (avio_r8(pb) != 1)
goto invalid;
- url_fskip(pb, 1); /* other recs per frame */
+ avio_skip(pb, 1); /* other recs per frame */
- if (get_byte(pb) != 1)
+ if (avio_r8(pb) != 1)
goto invalid;
- url_fskip(pb, 32); /* record_types */
- st->nb_frames = get_le32(pb);
- av_set_pts_info(st, 64, 1, get_le16(pb));
- url_fskip(pb, 58);
+ avio_skip(pb, 32); /* record_types */
+ st->nb_frames = avio_rl32(pb);
+ av_set_pts_info(st, 64, 1, avio_rl16(pb));
+ avio_skip(pb, 58);
/* color cycling and palette data */
st->codec->extradata_size = 16*8 + 4*256;
ret = AVERROR(ENOMEM);
goto close_and_return;
}
- ret = get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
+ ret = avio_read(pb, st->codec->extradata, st->codec->extradata_size);
if (ret < 0)
goto close_and_return;
/* read page table */
- ret = url_fseek(pb, anm->page_table_offset, SEEK_SET);
+ ret = avio_seek(pb, anm->page_table_offset, SEEK_SET);
if (ret < 0)
goto close_and_return;
for (i = 0; i < MAX_PAGES; i++) {
Page *p = &anm->pt[i];
- p->base_record = get_le16(pb);
- p->nb_records = get_le16(pb);
- p->size = get_le16(pb);
+ p->base_record = avio_rl16(pb);
+ p->nb_records = avio_rl16(pb);
+ p->size = avio_rl16(pb);
}
/* find page of first frame */
AVPacket *pkt)
{
AnmDemuxContext *anm = s->priv_data;
- ByteIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
Page *p;
int tmp, record_size;
/* parse page header */
if (anm->record < 0) {
- url_fseek(pb, anm->page_table_offset + MAX_PAGES*6 + (anm->page<<16), SEEK_SET);
- url_fskip(pb, 8 + 2*p->nb_records);
+ avio_seek(pb, anm->page_table_offset + MAX_PAGES*6 + (anm->page<<16), SEEK_SET);
+ avio_skip(pb, 8 + 2*p->nb_records);
anm->record = 0;
}
}
/* fetch record size */
- tmp = url_ftell(pb);
- url_fseek(pb, anm->page_table_offset + MAX_PAGES*6 + (anm->page<<16) +
+ tmp = avio_tell(pb);
+ avio_seek(pb, anm->page_table_offset + MAX_PAGES*6 + (anm->page<<16) +
8 + anm->record * 2, SEEK_SET);
- record_size = get_le16(pb);
- url_fseek(pb, tmp, SEEK_SET);
+ record_size = avio_rl16(pb);
+ avio_seek(pb, tmp, SEEK_SET);
/* fetch record */
pkt->size = av_get_packet(s->pb, pkt, record_size);
return 0;
}
-AVInputFormat anm_demuxer = {
+AVInputFormat ff_anm_demuxer = {
"anm",
NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"),
sizeof(AnmDemuxContext),