* FLI/FLC Animation File Demuxer
* Copyright (c) 2003 The ffmpeg Project
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
#define FLIC_FILE_MAGIC_1 0xAF11
#define FLIC_FILE_MAGIC_2 0xAF12
+#define FLIC_FILE_MAGIC_3 0xAF44 /* Flic Type for Extended FLX Format which
+ originated in Dave's Targa Animator (DTA) */
#define FLIC_CHUNK_MAGIC_1 0xF1FA
#define FLIC_CHUNK_MAGIC_2 0xF5FA
#define FLIC_MC_PTS_INC 6000 /* pts increment for Magic Carpet game FLIs */
{
int magic_number;
- if (p->buf_size < 6)
- return 0;
-
- magic_number = LE_16(&p->buf[4]);
+ magic_number = AV_RL16(&p->buf[4]);
if ((magic_number != FLIC_FILE_MAGIC_1) &&
- (magic_number != FLIC_FILE_MAGIC_2))
+ (magic_number != FLIC_FILE_MAGIC_2) &&
+ (magic_number != FLIC_FILE_MAGIC_3))
return 0;
return AVPROBE_SCORE_MAX;
static int flic_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{
- FlicDemuxContext *flic = (FlicDemuxContext *)s->priv_data;
+ FlicDemuxContext *flic = s->priv_data;
ByteIOContext *pb = &s->pb;
unsigned char header[FLIC_HEADER_SIZE];
AVStream *st;
if (get_buffer(pb, header, FLIC_HEADER_SIZE) != FLIC_HEADER_SIZE)
return AVERROR_IO;
- magic_number = LE_16(&header[4]);
- speed = LE_32(&header[0x10]);
+ magic_number = AV_RL16(&header[4]);
+ speed = AV_RL32(&header[0x10]);
/* initialize the decoder streams */
st = av_new_stream(s, 0);
if (!st)
return AVERROR_NOMEM;
flic->video_stream_index = st->index;
- st->codec.codec_type = CODEC_TYPE_VIDEO;
- st->codec.codec_id = CODEC_ID_FLIC;
- st->codec.codec_tag = 0; /* no fourcc */
- st->codec.width = LE_16(&header[0x08]);
- st->codec.height = LE_16(&header[0x0A]);
+ st->codec->codec_type = CODEC_TYPE_VIDEO;
+ st->codec->codec_id = CODEC_ID_FLIC;
+ st->codec->codec_tag = 0; /* no fourcc */
+ st->codec->width = AV_RL16(&header[0x08]);
+ st->codec->height = AV_RL16(&header[0x0A]);
- if (!st->codec.width || !st->codec.height)
+ if (!st->codec->width || !st->codec->height)
return AVERROR_INVALIDDATA;
/* send over the whole 128-byte FLIC header */
- st->codec.extradata_size = FLIC_HEADER_SIZE;
- st->codec.extradata = av_malloc(FLIC_HEADER_SIZE);
- memcpy(st->codec.extradata, header, FLIC_HEADER_SIZE);
+ st->codec->extradata_size = FLIC_HEADER_SIZE;
+ st->codec->extradata = av_malloc(FLIC_HEADER_SIZE);
+ memcpy(st->codec->extradata, header, FLIC_HEADER_SIZE);
av_set_pts_info(st, 33, 1, 90000);
/* Time to figure out the framerate: If there is a FLIC chunk magic
* number at offset 0x10, assume this is from the Bullfrog game,
* Magic Carpet. */
- if (LE_16(&header[0x10]) == FLIC_CHUNK_MAGIC_1) {
+ if (AV_RL16(&header[0x10]) == FLIC_CHUNK_MAGIC_1) {
flic->frame_pts_inc = FLIC_MC_PTS_INC;
url_fseek(pb, 12, SEEK_SET);
/* send over abbreviated FLIC header chunk */
- av_free(st->codec.extradata);
- st->codec.extradata_size = 12;
- st->codec.extradata = av_malloc(12);
- memcpy(st->codec.extradata, header, 12);
+ av_free(st->codec->extradata);
+ st->codec->extradata_size = 12;
+ st->codec->extradata = av_malloc(12);
+ memcpy(st->codec->extradata, header, 12);
} else if (magic_number == FLIC_FILE_MAGIC_1) {
/*
* therefore, the frame pts increment = n * 1285.7
*/
flic->frame_pts_inc = speed * 1285.7;
- } else if (magic_number == FLIC_FILE_MAGIC_2) {
+ } else if ((magic_number == FLIC_FILE_MAGIC_2) ||
+ (magic_number == FLIC_FILE_MAGIC_3)) {
/*
* in this case, the speed (n) is number of milliseconds between frames:
*
* therefore, the frame pts increment = n * 90
*/
flic->frame_pts_inc = speed * 90;
- } else
+ } else {
+ av_log(s, AV_LOG_INFO, "Invalid or unsupported magic chunk in file\n");
return AVERROR_INVALIDDATA;
+ }
if (flic->frame_pts_inc == 0)
flic->frame_pts_inc = FLIC_DEFAULT_PTS_INC;
static int flic_read_packet(AVFormatContext *s,
AVPacket *pkt)
{
- FlicDemuxContext *flic = (FlicDemuxContext *)s->priv_data;
+ FlicDemuxContext *flic = s->priv_data;
ByteIOContext *pb = &s->pb;
int packet_read = 0;
unsigned int size;
break;
}
- size = LE_32(&preamble[0]);
- magic = LE_16(&preamble[4]);
+ size = AV_RL32(&preamble[0]);
+ magic = AV_RL16(&preamble[4]);
if (((magic == FLIC_CHUNK_MAGIC_1) || (magic == FLIC_CHUNK_MAGIC_2)) && size > FLIC_PREAMBLE_SIZE) {
if (av_new_packet(pkt, size)) {
}
pkt->stream_index = flic->video_stream_index;
pkt->pts = flic->pts;
- pkt->pos = url_ftell(pb);
+ pkt->pos = url_ftell(pb);
memcpy(pkt->data, preamble, FLIC_PREAMBLE_SIZE);
- ret = get_buffer(pb, pkt->data + FLIC_PREAMBLE_SIZE,
+ ret = get_buffer(pb, pkt->data + FLIC_PREAMBLE_SIZE,
size - FLIC_PREAMBLE_SIZE);
if (ret != size - FLIC_PREAMBLE_SIZE) {
av_free_packet(pkt);
static int flic_read_close(AVFormatContext *s)
{
-// FlicDemuxContext *flic = (FlicDemuxContext *)s->priv_data;
+// FlicDemuxContext *flic = s->priv_data;
return 0;
}
-static AVInputFormat flic_iformat = {
+AVInputFormat flic_demuxer = {
"flic",
- "FLI/FLC animation format",
+ "FLI/FLC/FLX animation format",
sizeof(FlicDemuxContext),
flic_probe,
flic_read_header,
flic_read_packet,
flic_read_close,
};
-
-int flic_init(void)
-{
- av_register_input_format(&flic_iformat);
- return 0;
-}
projects / ffmpeg / blobdiff