yep, FLI support

Originally committed as revision 2519 to svn://svn.ffmpeg.org/ffmpeg/trunk

Changelog

@@ -2,11 +2,14 @@ version <next>:
 - DV encoder, DV muxer
 - Microsoft RLE video decoder
 - Microsoft Video-1 decoder
+- Apple Graphics (SMC) decoder
 - Apple Video (RPZA) decoder
 - Cinepak decoder
 - Sega FILM (CPK) file demuxer
-- Westwood multimedia support (VQA/AUD file demuxer, audio decoder)
+- Westwood multimedia support (VQA & AUD files)
 - Id Quake II CIN playback support
+- 8BPS video decoder
+- FLIC playback support
 
 version 0.4.8:
 

doc/ffmpeg-doc.texi

@@ -613,6 +613,7 @@ library:
 @item Raw MJPEG @tab X  @tab  X 
 @item Raw MPEG video @tab X  @tab  X 
 @item Raw PCM8/16 bits, mulaw/Alaw@tab X  @tab  X 
+@item Raw CRI ADX audio @tab X  @tab  X 
 @item SUN AU format @tab X  @tab  X 
 @item NUT @tab X @tab X @tab NUT Open Container Format
 @item Quicktime        @tab X @tab  X 
@@ -635,6 +636,8 @@ library:
 @tab Multimedia formats used in Westwood Studios games
 @item Id Cinematic (.cin) @tab    @tab X
 @tab Used in Quake II
+@item FLIC format      @tab    @tab X
+@tab .fli/.flc files
 @end multitable
 
 @code{X} means that the encoding (resp. decoding) is supported.
@@ -695,6 +698,7 @@ following image formats are supported:
 @item Id RoQ                 @tab     @tab  X @tab used in Quake III, Jedi Knight 2, other computer games
 @item Xan/WC3                @tab     @tab  X @tab used in Wing Commander III .MVE files
 @item Interplay Video        @tab     @tab  X @tab used in Interplay .MVE files
+@item Apple Graphics         @tab     @tab  X @tab fourcc: 'smc '
 @item Apple Video            @tab     @tab  X @tab fourcc: rpza
 @item Cinepak                @tab     @tab  X
 @item Microsoft RLE          @tab     @tab  X
@@ -702,6 +706,7 @@ following image formats are supported:
 @item Westwood VQA           @tab     @tab  X
 @item Id Cinematic Video     @tab     @tab  X @tab used in Quake II
 @item Planar RGB             @tab     @tab  X @tab fourcc: 8BPS
+@item FLIC video             @tab     @tab  X
 @end multitable
 
 @code{X} means that the encoding (resp. decoding) is supported.
@@ -731,7 +736,10 @@ solutions.
 @item Duck DK4 IMA ADPCM     @tab      @tab X
 @tab used in some Sega Saturn console games
 @item Westwood Studios IMA ADPCM @tab      @tab X
-@tab used in Westwood Studios games likes Command and Conquer
+@tab used in Westwood Studios games like Command and Conquer
+@item CD-ROM XA ADPCM        @tab      @tab X
+@item CRI ADX ADPCM          @tab X    @tab X
+@tab used in Sega Dreamcast games
 @item RA144                  @tab      @tab X
 @tab Real 14400 bit/s codec
 @item RA288                  @tab      @tab X

libavcodec/Makefile

@@ -19,7 +19,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \
       vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o \
       roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \
       msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \
-      smc.o parser.o
+      smc.o parser.o flicvideo.o
 
 ifeq ($(AMR_NB),yes)
 ifeq ($(AMR_NB_FIXED),yes)

libavcodec/allcodecs.c

@@ -137,6 +137,7 @@ void avcodec_register_all(void)
     register_avcodec(&idcin_decoder);
     register_avcodec(&eightbps_decoder);
     register_avcodec(&smc_decoder);
+    register_avcodec(&flic_decoder);
 #ifdef CONFIG_AC3
     register_avcodec(&ac3_decoder);
 #endif

libavcodec/avcodec.h

@@ -86,6 +86,7 @@ enum CodecID {
     CODEC_ID_IDCIN,
     CODEC_ID_8BPS,
     CODEC_ID_SMC,
+    CODEC_ID_FLIC,
 
     /* various pcm "codecs" */
     CODEC_ID_PCM_S16LE,
@@ -1574,6 +1575,7 @@ extern AVCodec vqa_decoder;
 extern AVCodec idcin_decoder;
 extern AVCodec eightbps_decoder;
 extern AVCodec smc_decoder;
+extern AVCodec flic_decoder;
 extern AVCodec ra_144_decoder;
 extern AVCodec ra_288_decoder;
 extern AVCodec roq_dpcm_decoder;

libavformat/Makefile

@@ -15,7 +15,7 @@ PPOBJS=
 OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o raw.o rm.o \
       avienc.o avidec.o wav.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \
       yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \
-      nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o
+      nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o
 
 ifeq ($(CONFIG_RISKY),yes)
 OBJS+= asf.o

libavformat/allformats.c

@@ -69,6 +69,7 @@ void av_register_all(void)
     westwood_init();
     film_init();
     idcin_init();
+    flic_init();
 
 #if defined(AMR_NB) || defined(AMR_NB_FIXED) || defined(AMR_WB)
     amr_init();

libavformat/avformat.h

@@ -479,6 +479,9 @@ int film_init(void);
 /* idcin.c */
 int idcin_init(void);
 
+/* flic.c */
+int flic_init(void);
+
 #include "rtp.h"
 
 #include "rtsp.h"

libavformat/flic.c

+/*
+ * FLI/FLC Animation File Demuxer
+ * Copyright (c) 2003 The ffmpeg Project
+ *
+ * This library 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.
+ *
+ * This library 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
+ */
+
+/**
+ * @file flic.c
+ * FLI/FLC file demuxer
+ * by Mike Melanson (melanson@pcisys.net)
+ * for more information on the .fli/.flc file format and all of its many
+ * variations, visit:
+ *   http://www.compuphase.com/flic.htm
+ *
+ * This demuxer handles standard 0xAF11- and 0xAF12-type FLIs. It also
+ * handles special FLIs from the PC game "Magic Carpet".
+ */
+
+#include "avformat.h"
+
+#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
+#define LE_32(x)  ((((uint8_t*)(x))[3] << 24) | \
+                   (((uint8_t*)(x))[2] << 16) | \
+                   (((uint8_t*)(x))[1] << 8) | \
+                    ((uint8_t*)(x))[0])
+
+#define FLIC_FILE_MAGIC_1 0xAF11
+#define FLIC_FILE_MAGIC_2 0xAF12
+#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 */
+#define FLIC_DEFAULT_PTS_INC 6000  /* for FLIs that have 0 speed */
+
+#define FLIC_HEADER_SIZE 128
+#define FLIC_PREAMBLE_SIZE 6
+
+typedef struct FlicDemuxContext {
+    int frame_pts_inc;
+    int64_t pts;
+    int video_stream_index;
+} FlicDemuxContext;
+
+static int flic_probe(AVProbeData *p)
+{
+    int magic_number;
+
+    if (p->buf_size < 6)
+        return 0;
+
+    magic_number = LE_16(&p->buf[4]);
+    if ((magic_number != FLIC_FILE_MAGIC_1) &&
+        (magic_number != FLIC_FILE_MAGIC_2))
+        return 0;
+
+    return AVPROBE_SCORE_MAX;
+}
+
+static int flic_read_header(AVFormatContext *s,
+                            AVFormatParameters *ap)
+{
+    FlicDemuxContext *flic = (FlicDemuxContext *)s->priv_data;
+    ByteIOContext *pb = &s->pb;
+    unsigned char header[FLIC_HEADER_SIZE];
+    AVStream *st;
+    int speed;
+    int magic_number;
+
+    flic->pts = 0;
+
+    /* load the whole header and pull out the width and height */
+    if (get_buffer(pb, header, FLIC_HEADER_SIZE) != FLIC_HEADER_SIZE)
+        return -EIO;
+
+    magic_number = LE_16(&header[4]);
+    speed = LE_32(&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]);
+
+    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);
+
+    /* set the pts reference (1 pts = 1/90000) */
+    s->pts_num = 1;
+    s->pts_den = 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) {
+
+        flic->frame_pts_inc = FLIC_MC_PTS_INC;
+
+        /* rewind the stream since the first chunk is at offset 12 */
+        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);
+
+    } else if (magic_number == FLIC_FILE_MAGIC_1) {
+        /*
+         * in this case, the speed (n) is number of 1/70s ticks between frames:
+         *
+         *    pts        n * frame #
+         *  --------  =  -----------  => pts = n * (90000/70) * frame #
+         *   90000           70
+         *
+         *  therefore, the frame pts increment = n * 1285.7
+         */
+        flic->frame_pts_inc = speed * 1285.7;
+    } else if (magic_number == FLIC_FILE_MAGIC_2) {
+        /*
+         * in this case, the speed (n) is number of milliseconds between frames:
+         *
+         *    pts        n * frame #
+         *  --------  =  -----------  => pts = n * 90 * frame #
+         *   90000          1000
+         *
+         *  therefore, the frame pts increment = n * 90
+         */
+        flic->frame_pts_inc = speed * 90;
+    } else
+        return AVERROR_INVALIDDATA;
+
+    if (flic->frame_pts_inc == 0)
+        flic->frame_pts_inc = FLIC_DEFAULT_PTS_INC;
+
+    return 0;
+}
+
+static int flic_read_packet(AVFormatContext *s,
+                            AVPacket *pkt)
+{
+    FlicDemuxContext *flic = (FlicDemuxContext *)s->priv_data;
+    ByteIOContext *pb = &s->pb;
+    int packet_read = 0;
+    unsigned int size;
+    int magic;
+    int ret = 0;
+    unsigned char preamble[FLIC_PREAMBLE_SIZE];
+
+    while (!packet_read) {
+
+        if ((ret = get_buffer(pb, preamble, FLIC_PREAMBLE_SIZE)) !=
+            FLIC_PREAMBLE_SIZE) {
+            ret = -EIO;
+            break;
+        }
+
+        size = LE_32(&preamble[0]);
+        magic = LE_16(&preamble[4]);
+
+        if ((magic == FLIC_CHUNK_MAGIC_1) || (magic == FLIC_CHUNK_MAGIC_2)) {
+            if (av_new_packet(pkt, size)) {
+                ret = -EIO;
+                break;
+            }
+            pkt->stream_index = flic->video_stream_index;
+            pkt->pts = flic->pts;
+            memcpy(pkt->data, preamble, 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);
+                ret = -EIO;
+            }
+            flic->pts += flic->frame_pts_inc;
+            packet_read = 1;
+        } else {
+            /* not interested in this chunk */
+            url_fseek(pb, size - 6, SEEK_CUR);
+        }
+    }
+
+    return ret;
+}
+
+static int flic_read_close(AVFormatContext *s)
+{
+//    FlicDemuxContext *flic = (FlicDemuxContext *)s->priv_data;
+
+    return 0;
+}
+
+static AVInputFormat flic_iformat = {
+    "flic",
+    "FLI/FLC 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;
+}