@@ -5,6 +5,7 @@ version <next>

 - Apple QuickDraw (qdrw) video decoder

 - Creative ADPCM audio decoder

 - Electronic Arts Multimedia (WVE/UV2/etc.) file demuxer

+- Miro VideoXL (VIXL) video decoder

 version 0.4.9-pre1:

@@ -767,6 +767,7 @@ following image formats are supported:

 @item ZLIB                   @tab  X  @tab  X @tab Part of LCL, encoder experimental

 @item TechSmith Camtasia     @tab     @tab  X @tab fourcc: TSCC

 @item IBM Ultimotion         @tab     @tab  X @tab fourcc: ULTI

+@item Miro VideoXL           @tab     @tab  X @tab fourcc: VIXL

 @end multitable

 @code{X} means that the encoding (resp. decoding) is supported.

@@ -21,7 +21,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \

       msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \

       smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \

       flac.o vp3dsp.o integer.o snow.o tscc.o sonic.o ulti.o h264idct.o \

-      qdrw.o

+      qdrw.o xl.o

 ifeq ($(AMR_NB),yes)

 ifeq ($(AMR_NB_FIXED),yes)

@@ -109,6 +109,7 @@ void avcodec_register_all(void)

     register_avcodec(&tscc_decoder);

     register_avcodec(&ulti_decoder);

     register_avcodec(&qdraw_decoder);

+    register_avcodec(&xl_decoder);

 #ifdef CONFIG_FAAD

     register_avcodec(&aac_decoder);

     register_avcodec(&mpeg4aac_decoder);

@@ -17,7 +17,7 @@ extern "C" {

 #define FFMPEG_VERSION_INT     0x000409

 #define FFMPEG_VERSION         "0.4.9-pre1"

-#define LIBAVCODEC_BUILD       4727

+#define LIBAVCODEC_BUILD       4728

 #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT

 #define LIBAVCODEC_VERSION     FFMPEG_VERSION

@@ -104,6 +104,7 @@ enum CodecID {

     CODEC_ID_TSCC,

     CODEC_ID_ULTI,

     CODEC_ID_QDRAW,

+    CODEC_ID_VIXL,

     /* various pcm "codecs" */

     CODEC_ID_PCM_S16LE,

@@ -1890,6 +1891,7 @@ extern AVCodec flac_decoder;

 extern AVCodec tscc_decoder;

 extern AVCodec ulti_decoder;

 extern AVCodec qdraw_decoder;

+extern AVCodec xl_decoder;

 /* pcm codecs */

 #define PCM_CODEC(id, name) \

new file mode 100644

@@ -0,0 +1,144 @@

+/*

+ * Miro VideoXL codec

+ * Copyright (c) 2004 Konstantin Shishkov

+ *

+ * 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 xl.c

+ * Miro VideoXL codec.

+ */

+ 

+#include "avcodec.h"

+#include "mpegvideo.h"

+

+typedef struct VideoXLContext{

+    AVCodecContext *avctx;

+    AVFrame pic;

+} VideoXLContext;

+

+const int xl_table[32] = {

+   0,   1,   2,   3,   4,   5,   6,   7,

+   8,   9,  12,  15,  20,  25,  34,  46,

+  64,  82,  94, 103, 108, 113, 116, 119,

+ 120, 121, 122, 123, 124, 125, 126, 127};

+

+static int decode_frame(AVCodecContext *avctx, 

+                        void *data, int *data_size,

+                        uint8_t *buf, int buf_size)

+{

+    VideoXLContext * const a = avctx->priv_data;

+    AVFrame * const p= (AVFrame*)&a->pic;

+    uint8_t *Y, *U, *V;

+    int i, j;

+    int stride;

+    uint32_t val;

+    int y0, y1, y2, y3, c0, c1;

+        

+    

+    /* special case for last picture */

+    if (buf_size == 0) {

+        return 0;

+    }

+

+    if(p->data[0])

+        avctx->release_buffer(avctx, p);

+

+    p->reference = 0;

+    if(avctx->get_buffer(avctx, p) < 0){

+        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");

+        return -1;

+    }

+    p->pict_type= I_TYPE;

+    p->key_frame= 1;

+

+    Y = a->pic.data[0];

+    U = a->pic.data[1];

+    V = a->pic.data[2];

+    

+    stride = avctx->width - 4;

+    for (i = 0; i < avctx->height; i++) {

+        /* lines are stored in reversed order */

+        buf += stride;

+        

+        for (j = 0; j < avctx->width; j += 4) {

+            /* value is stored in LE dword with word swapped */

+            val = LE_32(buf);

+            buf -= 4;

+            val = ((val >> 16) & 0xFFFF) | ((val & 0xFFFF) << 16);

+    

+            if(!j)

+                y0 = (val & 0x1F) << 2;

+            else

+                y0 = y3 + xl_table[val & 0x1F];

+            val >>= 5;

+            y1 = y0 + xl_table[val & 0x1F];

+            val >>= 5;

+            y2 = y1 + xl_table[val & 0x1F];

+            val >>= 6; /* align to word */

+            y3 = y2 + xl_table[val & 0x1F];

+            val >>= 5;

+            if(!j)

+                c0 = (val & 0x1F) << 2;

+            else

+                c0 += xl_table[val & 0x1F];

+            val >>= 5;

+            if(!j)

+                c1 = (val & 0x1F) << 2;

+            else

+                c1 += xl_table[val & 0x1F];

+            

+            Y[j + 0] = y0 << 1;

+            Y[j + 1] = y1 << 1;

+            Y[j + 2] = y2 << 1;

+            Y[j + 3] = y3 << 1;

+            

+            U[j >> 2] = c0 << 1;

+            V[j >> 2] = c1 << 1;

+        }

+        

+        buf += avctx->width + 4;

+        Y += a->pic.linesize[0];

+        U += a->pic.linesize[1];

+        V += a->pic.linesize[2];

+    }

+

+    *data_size = sizeof(AVFrame);

+    *(AVFrame*)data = a->pic;

+    

+    return buf_size;

+}

+

+static int decode_init(AVCodecContext *avctx){

+//    VideoXLContext * const a = avctx->priv_data;

+

+    avctx->pix_fmt= PIX_FMT_YUV411P;

+

+    return 0;

+}

+

+AVCodec xl_decoder = {

+    "xl",

+    CODEC_TYPE_VIDEO,

+    CODEC_ID_VIXL,

+    sizeof(VideoXLContext),

+    decode_init,

+    NULL,

+    NULL,

+    decode_frame,

+    CODEC_CAP_DR1,

+};

@@ -169,6 +169,7 @@ const CodecTag codec_bmp_tags[] = {

     { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') },

     { CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') },

     { CODEC_ID_ULTI, MKTAG('U', 'L', 'T', 'I') },

+    { CODEC_ID_VIXL, MKTAG('V', 'I', 'X', 'L') },

     { CODEC_ID_RAWVIDEO, 0 },

     { 0, 0 },

 };