Split RoQ decoder to accommodate future encoder patch

patch by Vitor vitor1001 gmail moc
original thread: [FFmpeg-devel] [PATCH] RoQ video encoder, take 2
date: 05/27/2007 12:21 PM

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

4 files changed, 304 insertions, 243 deletions

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index f287c3cbb2..0eb15fd624 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -134,7 +134,7 @@ OBJS-$(CONFIG_QPEG_DECODER)            += qpeg.o
 OBJS-$(CONFIG_QTRLE_DECODER)           += qtrle.o
 OBJS-$(CONFIG_RA_144_DECODER)          += ra144.o
 OBJS-$(CONFIG_RA_288_DECODER)          += ra288.o
-OBJS-$(CONFIG_ROQ_DECODER)             += roqvideo.o
+OBJS-$(CONFIG_ROQ_DECODER)             += roqvideodec.o roqvideo.o
 OBJS-$(CONFIG_ROQ_DPCM_DECODER)        += dpcm.o
 OBJS-$(CONFIG_ROQ_DPCM_ENCODER)        += roqaudioenc.o
 OBJS-$(CONFIG_RPZA_DECODER)            += rpza.o
diff --git a/libavcodec/roqvideo.c b/libavcodec/roqvideo.c
index 25c62874ea..5725757834 100644
--- a/libavcodec/roqvideo.c
+++ b/libavcodec/roqvideo.c
@@ -21,65 +21,15 @@
 
 /**
  * @file roqvideo.c
- * Id RoQ Video Decoder by Dr. Tim Ferguson
- * For more information about the Id RoQ format, visit:
- *   http://www.csse.monash.edu.au/~timf/
+ * Id RoQ Video common functions based on work by Dr. Tim Ferguson
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "avcodec.h"
-#include "bytestream.h"
-#include "dsputil.h"
-
-typedef struct {
-  unsigned char y[4];
-  unsigned char u, v;
-} roq_cell;
-
-typedef struct {
-  int idx[4];
-} roq_qcell;
+#include "roqvideo.h"
 
 #define avg2(a,b) av_clip_uint8(((int)(a)+(int)(b)+1)>>1)
 #define avg4(a,b,c,d) av_clip_uint8(((int)(a)+(int)(b)+(int)(c)+(int)(d)+2)>>2)
 
-typedef struct RoqContext {
-
-    AVCodecContext *avctx;
-    DSPContext dsp;
-    AVFrame frames[2];
-    AVFrame *last_frame;
-    AVFrame *current_frame;
-    int first_frame;
-    int y_stride;
-    int c_stride;
-
-    roq_cell cells[256];
-    roq_qcell qcells[256];
-
-    unsigned char *buf;
-    int size;
-
-} RoqContext;
-
-#define RoQ_INFO              0x1001
-#define RoQ_QUAD_CODEBOOK     0x1002
-#define RoQ_QUAD_VQ           0x1011
-#define RoQ_SOUND_MONO        0x1020
-#define RoQ_SOUND_STEREO      0x1021
-
-#define RoQ_ID_MOT              0x00
-#define RoQ_ID_FCC              0x01
-#define RoQ_ID_SLD              0x02
-#define RoQ_ID_CCC              0x03
-
-#define get_byte(in_buffer) *(in_buffer++)
-
-
 void ff_apply_vector_2x2(RoqContext *ri, int x, int y, roq_cell *cell)
 {
     unsigned char *yptr;
@@ -277,193 +227,3 @@ void ff_apply_motion_8x8(RoqContext *ri, int x, int y,
         pb = ri->last_frame->data[2] + (my/2) * (ri->y_stride/2) + (mx + 1)/2;
     }
 }
-
-static void roqvideo_decode_frame(RoqContext *ri)
-{
-    unsigned int chunk_id = 0, chunk_arg = 0;
-    unsigned long chunk_size = 0;
-    int i, j, k, nv1, nv2, vqflg = 0, vqflg_pos = -1;
-    int vqid, bpos, xpos, ypos, xp, yp, x, y, mx, my;
-    int frame_stats[2][4] = {{0},{0}};
-    roq_qcell *qcell;
-    unsigned char *buf = ri->buf;
-    unsigned char *buf_end = ri->buf + ri->size;
-
-    while (buf < buf_end) {
-        chunk_id = bytestream_get_le16(&buf);
-        chunk_size = bytestream_get_le32(&buf);
-        chunk_arg = bytestream_get_le16(&buf);
-
-        if(chunk_id == RoQ_QUAD_VQ)
-            break;
-        if(chunk_id == RoQ_QUAD_CODEBOOK) {
-            if((nv1 = chunk_arg >> 8) == 0)
-                nv1 = 256;
-            if((nv2 = chunk_arg & 0xff) == 0 && nv1 * 6 < chunk_size)
-                nv2 = 256;
-            for(i = 0; i < nv1; i++) {
-                ri->cells[i].y[0] = get_byte(buf);
-                ri->cells[i].y[1] = get_byte(buf);
-                ri->cells[i].y[2] = get_byte(buf);
-                ri->cells[i].y[3] = get_byte(buf);
-                ri->cells[i].u = get_byte(buf);
-                ri->cells[i].v = get_byte(buf);
-            }
-            for(i = 0; i < nv2; i++)
-                for(j = 0; j < 4; j++)
-                    ri->qcells[i].idx[j] = get_byte(buf);
-        }
-    }
-
-    bpos = xpos = ypos = 0;
-    while(bpos < chunk_size) {
-        for (yp = ypos; yp < ypos + 16; yp += 8)
-            for (xp = xpos; xp < xpos + 16; xp += 8) {
-                if (vqflg_pos < 0) {
-                    vqflg = buf[bpos++]; vqflg |= (buf[bpos++] << 8);
-                    vqflg_pos = 7;
-                }
-                vqid = (vqflg >> (vqflg_pos * 2)) & 0x3;
-                frame_stats[0][vqid]++;
-                vqflg_pos--;
-
-                switch(vqid) {
-                case RoQ_ID_MOT:
-                    ff_apply_motion_8x8(ri, xp, yp, 0, 0);
-                    break;
-                case RoQ_ID_FCC:
-                    mx = 8 - (buf[bpos] >> 4) - ((signed char) (chunk_arg >> 8));
-                    my = 8 - (buf[bpos++] & 0xf) - ((signed char) chunk_arg);
-                    ff_apply_motion_8x8(ri, xp, yp, mx, my);
-                    break;
-                case RoQ_ID_SLD:
-                    qcell = ri->qcells + buf[bpos++];
-                    ff_apply_vector_4x4(ri, xp, yp, ri->cells + qcell->idx[0]);
-                    ff_apply_vector_4x4(ri, xp+4, yp, ri->cells + qcell->idx[1]);
-                    ff_apply_vector_4x4(ri, xp, yp+4, ri->cells + qcell->idx[2]);
-                    ff_apply_vector_4x4(ri, xp+4, yp+4, ri->cells + qcell->idx[3]);
-                    break;
-                case RoQ_ID_CCC:
-                    for (k = 0; k < 4; k++) {
-                        x = xp; y = yp;
-                        if(k & 0x01) x += 4;
-                        if(k & 0x02) y += 4;
-
-                        if (vqflg_pos < 0) {
-                            vqflg = buf[bpos++];
-                            vqflg |= (buf[bpos++] << 8);
-                            vqflg_pos = 7;
-                        }
-                        vqid = (vqflg >> (vqflg_pos * 2)) & 0x3;
-                        frame_stats[1][vqid]++;
-                        vqflg_pos--;
-                        switch(vqid) {
-                        case RoQ_ID_MOT:
-                            ff_apply_motion_4x4(ri, x, y, 0, 0);
-                            break;
-                        case RoQ_ID_FCC:
-                            mx = 8 - (buf[bpos] >> 4) - ((signed char) (chunk_arg >> 8));
-                            my = 8 - (buf[bpos++] & 0xf) - ((signed char) chunk_arg);
-                            ff_apply_motion_4x4(ri, x, y, mx, my);
-                            break;
-                        case RoQ_ID_SLD:
-                            qcell = ri->qcells + buf[bpos++];
-                            ff_apply_vector_2x2(ri, x, y, ri->cells + qcell->idx[0]);
-                            ff_apply_vector_2x2(ri, x+2, y, ri->cells + qcell->idx[1]);
-                            ff_apply_vector_2x2(ri, x, y+2, ri->cells + qcell->idx[2]);
-                            ff_apply_vector_2x2(ri, x+2, y+2, ri->cells + qcell->idx[3]);
-                            break;
-                        case RoQ_ID_CCC:
-                            ff_apply_vector_2x2(ri, x, y, ri->cells + buf[bpos]);
-                            ff_apply_vector_2x2(ri, x+2, y, ri->cells + buf[bpos+1]);
-                            ff_apply_vector_2x2(ri, x, y+2, ri->cells + buf[bpos+2]);
-                            ff_apply_vector_2x2(ri, x+2, y+2, ri->cells + buf[bpos+3]);
-                            bpos += 4;
-                            break;
-                        }
-                    }
-                    break;
-                default:
-                    av_log(ri->avctx, AV_LOG_ERROR, "Unknown vq code: %d\n", vqid);
-            }
-        }
-
-        xpos += 16;
-        if (xpos >= ri->avctx->width) {
-            xpos -= ri->avctx->width;
-            ypos += 16;
-        }
-        if(ypos >= ri->avctx->height)
-            break;
-    }
-}
-
-
-static int roq_decode_init(AVCodecContext *avctx)
-{
-    RoqContext *s = avctx->priv_data;
-
-    s->avctx = avctx;
-    s->first_frame = 1;
-    s->last_frame    = &s->frames[0];
-    s->current_frame = &s->frames[1];
-    avctx->pix_fmt = PIX_FMT_YUV420P;
-    dsputil_init(&s->dsp, avctx);
-
-    return 0;
-}
-
-static int roq_decode_frame(AVCodecContext *avctx,
-                            void *data, int *data_size,
-                            uint8_t *buf, int buf_size)
-{
-    RoqContext *s = avctx->priv_data;
-
-    if (avctx->get_buffer(avctx, s->current_frame)) {
-        av_log(avctx, AV_LOG_ERROR, "  RoQ: get_buffer() failed\n");
-        return -1;
-    }
-    s->y_stride = s->current_frame->linesize[0];
-    s->c_stride = s->current_frame->linesize[1];
-
-    s->buf = buf;
-    s->size = buf_size;
-    roqvideo_decode_frame(s);
-
-    /* release the last frame if it is allocated */
-    if (s->first_frame)
-        s->first_frame = 0;
-    else
-        avctx->release_buffer(avctx, s->last_frame);
-
-    *data_size = sizeof(AVFrame);
-    *(AVFrame*)data = *s->current_frame;
-
-    /* shuffle frames */
-    FFSWAP(AVFrame *, s->current_frame, s->last_frame);
-
-    return buf_size;
-}
-
-static int roq_decode_end(AVCodecContext *avctx)
-{
-    RoqContext *s = avctx->priv_data;
-
-    /* release the last frame */
-    if (s->last_frame->data[0])
-        avctx->release_buffer(avctx, s->last_frame);
-
-    return 0;
-}
-
-AVCodec roq_decoder = {
-    "roqvideo",
-    CODEC_TYPE_VIDEO,
-    CODEC_ID_ROQ,
-    sizeof(RoqContext),
-    roq_decode_init,
-    NULL,
-    roq_decode_end,
-    roq_decode_frame,
-    CODEC_CAP_DR1,
-};
diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
new file mode 100644
index 0000000000..72b3e1de33
--- /dev/null
+++ b/libavcodec/roqvideo.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2003 the ffmpeg project
+ *
+ * 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.1 of the License, or (at your option) any later version.
+ *
+ * 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#include "avcodec.h"
+#include "dsputil.h"
+
+typedef struct {
+  unsigned char y[4];
+  unsigned char u, v;
+} roq_cell;
+
+typedef struct {
+  int idx[4];
+} roq_qcell;
+
+typedef struct RoqContext {
+
+    AVCodecContext *avctx;
+    DSPContext dsp;
+    AVFrame frames[2];
+    AVFrame *last_frame;
+    AVFrame *current_frame;
+    int first_frame;
+    int y_stride;
+    int c_stride;
+
+    roq_cell cells[256];
+    roq_qcell qcells[256];
+
+    unsigned char *buf;
+    int size;
+
+} RoqContext;
+
+#define RoQ_INFO              0x1001
+#define RoQ_QUAD_CODEBOOK     0x1002
+#define RoQ_QUAD_VQ           0x1011
+#define RoQ_SOUND_MONO        0x1020
+#define RoQ_SOUND_STEREO      0x1021
+
+#define RoQ_ID_MOT              0x00
+#define RoQ_ID_FCC              0x01
+#define RoQ_ID_SLD              0x02
+#define RoQ_ID_CCC              0x03
+
+void ff_apply_vector_2x2(RoqContext *ri, int x, int y, roq_cell *cell);
+void ff_apply_vector_4x4(RoqContext *ri, int x, int y, roq_cell *cell);
+
+void ff_apply_motion_4x4(RoqContext *ri, int x, int y, int deltax, int deltay);
+
+void ff_apply_motion_8x8(RoqContext *ri, int x, int y, int deltax, int deltay);
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
new file mode 100644
index 0000000000..bb14cafa87
--- /dev/null
+++ b/libavcodec/roqvideodec.c
@@ -0,0 +1,232 @@
+/*
+ * Copyright (C) 2003 the ffmpeg project
+ *
+ * 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.1 of the License, or (at your option) any later version.
+ *
+ * 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+/**
+ * @file roqvideodec.c
+ * Id RoQ Video Decoder by Dr. Tim Ferguson
+ * For more information about the Id RoQ format, visit:
+ *   http://www.csse.monash.edu.au/~timf/
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "avcodec.h"
+#include "bytestream.h"
+#include "dsputil.h"
+#include "roqvideo.h"
+
+#define avg2(a,b) av_clip_uint8(((int)(a)+(int)(b)+1)>>1)
+#define avg4(a,b,c,d) av_clip_uint8(((int)(a)+(int)(b)+(int)(c)+(int)(d)+2)>>2)
+
+#define get_byte(in_buffer) *(in_buffer++)
+
+static void roqvideo_decode_frame(RoqContext *ri)
+{
+    unsigned int chunk_id = 0, chunk_arg = 0;
+    unsigned long chunk_size = 0;
+    int i, j, k, nv1, nv2, vqflg = 0, vqflg_pos = -1;
+    int vqid, bpos, xpos, ypos, xp, yp, x, y, mx, my;
+    int frame_stats[2][4] = {{0},{0}};
+    roq_qcell *qcell;
+    unsigned char *buf = ri->buf;
+    unsigned char *buf_end = ri->buf + ri->size;
+
+    while (buf < buf_end) {
+        chunk_id = bytestream_get_le16(&buf);
+        chunk_size = bytestream_get_le32(&buf);
+        chunk_arg = bytestream_get_le16(&buf);
+
+        if(chunk_id == RoQ_QUAD_VQ)
+            break;
+        if(chunk_id == RoQ_QUAD_CODEBOOK) {
+            if((nv1 = chunk_arg >> 8) == 0)
+                nv1 = 256;
+            if((nv2 = chunk_arg & 0xff) == 0 && nv1 * 6 < chunk_size)
+                nv2 = 256;
+            for(i = 0; i < nv1; i++) {
+                ri->cells[i].y[0] = get_byte(buf);
+                ri->cells[i].y[1] = get_byte(buf);
+                ri->cells[i].y[2] = get_byte(buf);
+                ri->cells[i].y[3] = get_byte(buf);
+                ri->cells[i].u = get_byte(buf);
+                ri->cells[i].v = get_byte(buf);
+            }
+            for(i = 0; i < nv2; i++)
+                for(j = 0; j < 4; j++)
+                    ri->qcells[i].idx[j] = get_byte(buf);
+        }
+    }
+
+    bpos = xpos = ypos = 0;
+    while(bpos < chunk_size) {
+        for (yp = ypos; yp < ypos + 16; yp += 8)
+            for (xp = xpos; xp < xpos + 16; xp += 8) {
+                if (vqflg_pos < 0) {
+                    vqflg = buf[bpos++]; vqflg |= (buf[bpos++] << 8);
+                    vqflg_pos = 7;
+                }
+                vqid = (vqflg >> (vqflg_pos * 2)) & 0x3;
+                frame_stats[0][vqid]++;
+                vqflg_pos--;
+
+                switch(vqid) {
+                case RoQ_ID_MOT:
+                    ff_apply_motion_8x8(ri, xp, yp, 0, 0);
+                    break;
+                case RoQ_ID_FCC:
+                    mx = 8 - (buf[bpos] >> 4) - ((signed char) (chunk_arg >> 8));
+                    my = 8 - (buf[bpos++] & 0xf) - ((signed char) chunk_arg);
+                    ff_apply_motion_8x8(ri, xp, yp, mx, my);
+                    break;
+                case RoQ_ID_SLD:
+                    qcell = ri->qcells + buf[bpos++];
+                    ff_apply_vector_4x4(ri, xp, yp, ri->cells + qcell->idx[0]);
+                    ff_apply_vector_4x4(ri, xp+4, yp, ri->cells + qcell->idx[1]);
+                    ff_apply_vector_4x4(ri, xp, yp+4, ri->cells + qcell->idx[2]);
+                    ff_apply_vector_4x4(ri, xp+4, yp+4, ri->cells + qcell->idx[3]);
+                    break;
+                case RoQ_ID_CCC:
+                    for (k = 0; k < 4; k++) {
+                        x = xp; y = yp;
+                        if(k & 0x01) x += 4;
+                        if(k & 0x02) y += 4;
+
+                        if (vqflg_pos < 0) {
+                            vqflg = buf[bpos++];
+                            vqflg |= (buf[bpos++] << 8);
+                            vqflg_pos = 7;
+                        }
+                        vqid = (vqflg >> (vqflg_pos * 2)) & 0x3;
+                        frame_stats[1][vqid]++;
+                        vqflg_pos--;
+                        switch(vqid) {
+                        case RoQ_ID_MOT:
+                            ff_apply_motion_4x4(ri, x, y, 0, 0);
+                            break;
+                        case RoQ_ID_FCC:
+                            mx = 8 - (buf[bpos] >> 4) - ((signed char) (chunk_arg >> 8));
+                            my = 8 - (buf[bpos++] & 0xf) - ((signed char) chunk_arg);
+                            ff_apply_motion_4x4(ri, x, y, mx, my);
+                            break;
+                        case RoQ_ID_SLD:
+                            qcell = ri->qcells + buf[bpos++];
+                            ff_apply_vector_2x2(ri, x, y, ri->cells + qcell->idx[0]);
+                            ff_apply_vector_2x2(ri, x+2, y, ri->cells + qcell->idx[1]);
+                            ff_apply_vector_2x2(ri, x, y+2, ri->cells + qcell->idx[2]);
+                            ff_apply_vector_2x2(ri, x+2, y+2, ri->cells + qcell->idx[3]);
+                            break;
+                        case RoQ_ID_CCC:
+                            ff_apply_vector_2x2(ri, x, y, ri->cells + buf[bpos]);
+                            ff_apply_vector_2x2(ri, x+2, y, ri->cells + buf[bpos+1]);
+                            ff_apply_vector_2x2(ri, x, y+2, ri->cells + buf[bpos+2]);
+                            ff_apply_vector_2x2(ri, x+2, y+2, ri->cells + buf[bpos+3]);
+                            bpos += 4;
+                            break;
+                        }
+                    }
+                    break;
+                default:
+                    av_log(ri->avctx, AV_LOG_ERROR, "Unknown vq code: %d\n", vqid);
+            }
+        }
+
+        xpos += 16;
+        if (xpos >= ri->avctx->width) {
+            xpos -= ri->avctx->width;
+            ypos += 16;
+        }
+        if(ypos >= ri->avctx->height)
+            break;
+    }
+}
+
+
+static int roq_decode_init(AVCodecContext *avctx)
+{
+    RoqContext *s = avctx->priv_data;
+
+    s->avctx = avctx;
+    s->first_frame = 1;
+    s->last_frame    = &s->frames[0];
+    s->current_frame = &s->frames[1];
+    avctx->pix_fmt = PIX_FMT_YUV420P;
+    dsputil_init(&s->dsp, avctx);
+
+    return 0;
+}
+
+static int roq_decode_frame(AVCodecContext *avctx,
+                            void *data, int *data_size,
+                            uint8_t *buf, int buf_size)
+{
+    RoqContext *s = avctx->priv_data;
+
+    if (avctx->get_buffer(avctx, s->current_frame)) {
+        av_log(avctx, AV_LOG_ERROR, "  RoQ: get_buffer() failed\n");
+        return -1;
+    }
+    s->y_stride = s->current_frame->linesize[0];
+    s->c_stride = s->current_frame->linesize[1];
+
+    s->buf = buf;
+    s->size = buf_size;
+    roqvideo_decode_frame(s);
+
+    /* release the last frame if it is allocated */
+    if (s->first_frame)
+        s->first_frame = 0;
+    else
+        avctx->release_buffer(avctx, s->last_frame);
+
+    *data_size = sizeof(AVFrame);
+    *(AVFrame*)data = *s->current_frame;
+
+    /* shuffle frames */
+    FFSWAP(AVFrame *, s->current_frame, s->last_frame);
+
+    return buf_size;
+}
+
+static int roq_decode_end(AVCodecContext *avctx)
+{
+    RoqContext *s = avctx->priv_data;
+
+    /* release the last frame */
+    if (s->last_frame->data[0])
+        avctx->release_buffer(avctx, s->last_frame);
+
+    return 0;
+}
+
+AVCodec roq_decoder = {
+    "roqvideo",
+    CODEC_TYPE_VIDEO,
+    CODEC_ID_ROQ,
+    sizeof(RoqContext),
+    roq_decode_init,
+    NULL,
+    roq_decode_end,
+    roq_decode_frame,
+    CODEC_CAP_DR1,
+};