Flash Screen Video decoder (fourcc:FSV1)

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5436 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

Changelog

@@ -47,6 +47,7 @@ version <next>
 - KMVC decoder
 - MPEG-2 intra vlc support
 - MPEG-2 4:2:2 encoder
+- Flash Screen Video decoder
 
 version 0.4.9-pre1:
 

doc/ffmpeg-doc.texi

@@ -762,6 +762,7 @@ following image formats are supported:
 @item Theora                 @tab     @tab  X @tab still experimental
 @item Intel Indeo 3          @tab     @tab  X
 @item FLV                    @tab  X  @tab  X @tab Sorenson H.263 used in Flash
+@item Flash Screen Video     @tab     @tab  X @tab fourcc: FSV1
 @item ATI VCR1               @tab     @tab  X @tab fourcc: VCR1
 @item ATI VCR2               @tab     @tab  X @tab fourcc: VCR2
 @item Cirrus Logic AccuPak   @tab     @tab  X @tab fourcc: CLJR

libavcodec/Makefile

@@ -233,6 +233,9 @@ endif
 ifeq ($(CONFIG_ZMBV_DECODER),yes)
 	OBJS+= zmbv.o
 endif
+ifeq ($(CONFIG_FLASHSV_DECODER),yes)
+	OBJS+= flashsv.o
+endif
 
 
 ifeq ($(AMR),yes)

libavcodec/allcodecs.c

@@ -529,6 +529,9 @@ void avcodec_register_all(void)
 #ifdef CONFIG_RAWVIDEO_DECODER
     register_avcodec(&rawvideo_decoder);
 #endif //CONFIG_RAWVIDEO_DECODER
+#ifdef CONFIG_FLASHSV_DECODER
+    register_avcodec(&flashsv_decoder);
+#endif //CONFIG_FLASHSV_DECODER
 #endif /* CONFIG_DECODERS */
 
 #if defined(AMR_NB) || defined(AMR_NB_FIXED)

libavcodec/avcodec.h

@@ -121,6 +121,7 @@ enum CodecID {
     CODEC_ID_SMACKVIDEO,
     CODEC_ID_NUV,
     CODEC_ID_KMVC,
+    CODEC_ID_FLASHSV,
 
     /* various pcm "codecs" */
     CODEC_ID_PCM_S16LE= 0x10000,
@@ -2210,6 +2211,7 @@ extern AVCodec avs_decoder;
 extern AVCodec smacker_decoder;
 extern AVCodec smackaud_decoder;
 extern AVCodec kmvc_decoder;
+extern AVCodec flashsv_decoder;
 
 /* pcm codecs */
 #define PCM_CODEC(id, name) \

libavcodec/flashsv.c

+/*
+ * Flash Screen Video decoder
+ * Copyright (C) 2004 Alex Beregszaszi
+ * Copyright (C) 2006 Benjamin Larsson
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file flashsv.c
+ * Flash Screen Video decoder
+ * @author Alex Beregszaszi
+ * @author Benjamin Larsson
+ */
+
+/* Bitstream description
+ * The picture is divided into blocks that are zlib compressed.
+ *
+ * The decoder is fed complete frames, the frameheader contains:
+ * 4bits of block width
+ * 12bits of frame width
+ * 4bits of block height
+ * 12bits of frame height
+ *
+ * Directly after the header are the compressed blocks. The blocks
+ * have their compressed size represented with 16bits in the beginnig.
+ * If the size = 0 then the block is unchanged from the previous frame.
+ * All blocks are decompressed until the buffer is consumed.
+ *
+ * Encoding ideas, a basic encoder would just use a fixed block size.
+ * Block sizes can be multipels of 16, from 16 to 256. The blocks don't
+ * have to be quadratic. A brute force search with a set of diffrent
+ * block sizes should give a better result then to just use a fixed size.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "common.h"
+#include "avcodec.h"
+#include "bitstream.h"
+
+#ifdef CONFIG_ZLIB
+#include <zlib.h>
+#endif
+
+typedef struct FlashSVContext {
+    AVCodecContext *avctx;
+    AVFrame frame;
+    int image_width, image_height;
+    int block_width, block_height;
+    uint8_t* tmpblock;
+    int block_size;
+#ifdef CONFIG_ZLIB
+    z_stream zstream;
+#endif
+} FlashSVContext;
+
+
+static void copy_region(uint8_t *sptr, uint8_t *dptr,
+        int dx, int dy, int h, int w, int stride)
+{
+    int i;
+
+    for (i = dx+h; i > dx; i--)
+    {
+        memcpy(dptr+(i*stride)+dy*3, sptr, w*3);
+        sptr += w*3;
+    }
+}
+
+
+static int flashsv_decode_init(AVCodecContext *avctx)
+{
+    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
+    int zret; // Zlib return code
+
+    s->avctx = avctx;
+#ifdef CONFIG_ZLIB
+    s->zstream.zalloc = Z_NULL;
+    s->zstream.zfree = Z_NULL;
+    s->zstream.opaque = Z_NULL;
+    zret = inflateInit(&(s->zstream));
+    if (zret != Z_OK) {
+        av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
+        return 1;
+    }
+#else
+    av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled. Needed for the decoder.\n");
+    return 1;
+#endif
+    avctx->pix_fmt = PIX_FMT_BGR24;
+    avctx->has_b_frames = 0;
+    s->frame.data[0] = NULL;
+
+    return 0;
+}
+
+
+static int flashsv_decode_frame(AVCodecContext *avctx,
+                                    void *data, int *data_size,
+                                    uint8_t *buf, int buf_size)
+{
+    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
+    int h_blocks, v_blocks, h_part, v_part, i, j;
+    GetBitContext gb;
+
+    /* no supplementary picture */
+    if (buf_size == 0)
+        return 0;
+
+    if(s->frame.data[0])
+            avctx->release_buffer(avctx, &s->frame);
+
+    init_get_bits(&gb, buf, buf_size * 8);
+
+    /* start to parse the bitstream */
+    s->block_width = 16* (get_bits(&gb, 4)+1);
+    s->image_width =     get_bits(&gb,12);
+    s->block_height= 16* (get_bits(&gb, 4)+1);
+    s->image_height=     get_bits(&gb,12);
+
+    /* calculate amount of blocks and the size of the border blocks */
+    h_blocks = s->image_width / s->block_width;
+    h_part = s->image_width % s->block_width;
+    v_blocks = s->image_height / s->block_height;
+    v_part = s->image_height % s->block_height;
+
+    /* the block size could change between frames, make sure the buffer
+     * is large enough, if not, get a larger one */
+    if(s->block_size < s->block_width*s->block_height) {
+        if (s->tmpblock != NULL)
+            av_free(s->tmpblock);
+        s->block_size = s->block_width*s->block_height;
+        if ((s->tmpblock = av_malloc(3*s->block_size)) == NULL) {
+            av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
+            return -1;
+        }
+    }
+
+    /* init the image size once */
+    if((avctx->width==0) && (avctx->height==0)){
+        avctx->width = s->image_width;
+        avctx->height = s->image_height;
+    }
+
+    /* check for changes of image width and image height */
+    if ((avctx->width != s->image_width) || (avctx->height != s->image_height)) {
+        av_log(avctx, AV_LOG_ERROR, "Frame width or height differs from first frames!\n");
+        av_log(avctx, AV_LOG_ERROR, "fh = %d, fv %d  vs  ch = %d, cv = %d\n",avctx->height,
+        avctx->width,s->image_height,s->image_width);
+        return -1;
+    }
+
+    av_log(avctx, AV_LOG_DEBUG, "image: %dx%d block: %dx%d num: %dx%d part: %dx%d\n",
+        s->image_width, s->image_height, s->block_width, s->block_height,
+        h_blocks, v_blocks, h_part, v_part);
+
+    s->frame.reference = 1;
+    s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;
+    if (avctx->get_buffer(avctx, &s->frame) < 0) {
+        av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+        return -1;
+    }
+
+    /* loop over all block columns */
+    for (j = 0; j < v_blocks + (v_part?1:0); j++)
+    {
+
+        int hp = j*s->block_height; // horiz position in frame
+        int hs = (j<v_blocks)?s->block_height:v_part; // size of block
+
+
+        /* loop over all block rows */
+        for (i = 0; i < h_blocks + (h_part?1:0); i++)
+        {
+            int wp = i*s->block_width; // vert position in frame
+            int ws = (i<h_blocks)?s->block_width:h_part; // size of block
+
+            /* get the size of the compressed zlib chunk */
+            int size = get_bits(&gb, 16);
+
+            if (size == 0) {
+                /* no change, don't do anything */
+            } else {
+                /* decompress block */
+#ifdef CONFIG_ZLIB
+                int ret = inflateReset(&(s->zstream));
+                if (ret != Z_OK)
+                {
+                    av_log(avctx, AV_LOG_ERROR, "error in decompression (reset) of block %dx%d\n", i, j);
+                    /* return -1; */
+                }
+                s->zstream.next_in = buf+(get_bits_count(&gb)/8);
+                s->zstream.avail_in = size;
+                s->zstream.next_out = s->tmpblock;
+                s->zstream.avail_out = s->block_size*3;
+                ret = inflate(&(s->zstream), Z_FINISH);
+                if (ret == Z_DATA_ERROR)
+                {
+                    av_log(avctx, AV_LOG_ERROR, "Zlib resync occured\n");
+                    inflateSync(&(s->zstream));
+                    ret = inflate(&(s->zstream), Z_FINISH);
+                }
+
+                if ((ret != Z_OK) && (ret != Z_STREAM_END))
+                {
+                    av_log(avctx, AV_LOG_ERROR, "error in decompression of block %dx%d: %d\n", i, j, ret);
+                    /* return -1; */
+                }
+#else
+                av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled in.\n");
+                return -1;
+#endif
+                copy_region(s->tmpblock, s->frame.data[0], s->image_height-(hp+hs+1), wp, hs, ws, s->frame.linesize[0]);
+                skip_bits(&gb, 8*size);   /* skip the consumed bits */
+            }
+        }
+    }
+
+    *data_size = sizeof(AVFrame);
+    *(AVFrame*)data = s->frame;
+
+    if ((get_bits_count(&gb)/8) != buf_size)
+        av_log(avctx, AV_LOG_ERROR, "buffer not fully consumed (%d != %d)\n",
+            buf_size, (get_bits_count(&gb)/8));
+
+    /* report that the buffer was completely consumed */
+    return buf_size;
+}
+
+
+static int flashsv_decode_end(AVCodecContext *avctx)
+{
+    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
+#ifdef CONFIG_ZLIB
+    inflateEnd(&(s->zstream));
+#endif
+    /* release the frame if needed */
+    if (s->frame.data[0])
+        avctx->release_buffer(avctx, &s->frame);
+
+    /* free the tmpblock */
+    if (s->tmpblock != NULL)
+        av_free(s->tmpblock);
+
+    return 0;
+}
+
+
+AVCodec flashsv_decoder = {
+    "flashsv",
+    CODEC_TYPE_VIDEO,
+    CODEC_ID_FLASHSV,
+    sizeof(FlashSVContext),
+    flashsv_decode_init,
+    NULL,
+    flashsv_decode_end,
+    flashsv_decode_frame,
+    CODEC_CAP_DR1,
+    .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, -1},
+};

libavformat/avienc.c

@@ -184,6 +184,7 @@ const CodecTag codec_bmp_tags[] = {
     { CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') },
     { CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') },
     { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') },
+    { CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') },
     { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') },
     { CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') },
     { CODEC_ID_ULTI, MKTAG('U', 'L', 'T', 'I') },

libavformat/flvdec.c

@@ -183,6 +183,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
             st->codec->codec_type = CODEC_TYPE_VIDEO;
             switch(flags & 0xF){
             case 2: st->codec->codec_id = CODEC_ID_FLV1; break;
+            case 3: st->codec->codec_id = CODEC_ID_FLASHSV; break;
             default:
                     av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flags & 0xf);
                 st->codec->codec_tag= flags & 0xF;