X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Froqvideo.h;h=3fe11c670bd23913ae74be8c345c98334f36a4ee;hb=dc7e07ac1f015117a3abaa9c5f3a594cc7fd0b7a;hp=dace062b8c5f3c038232bc3660c38f356d7541b3;hpb=29b29011e5631c4e867baf42258a00886d142841;p=ffmpeg

diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
index dace062b8c5..3fe11c670bd 100644
--- a/libavcodec/roqvideo.h
+++ b/libavcodec/roqvideo.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2003 the ffmpeg project
+ * Copyright (C) 2003 Mike Melanson
+ * Copyright (C) 2003 Dr. Tim Ferguson
  *
  * This file is part of FFmpeg.
  *
@@ -16,21 +17,30 @@
  * 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
- *
  */
 
+#ifndef AVCODEC_ROQVIDEO_H
+#define AVCODEC_ROQVIDEO_H
+
+#include "libavutil/lfg.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
 typedef struct {
-  unsigned char y[4];
-  unsigned char u, v;
+    unsigned char y[4];
+    unsigned char u, v;
 } roq_cell;
 
 typedef struct {
-  int idx[4];
+    int idx[4];
 } roq_qcell;
 
+typedef struct {
+    int d[2];
+} motion_vect;
+
+struct RoqTempData;
+
 typedef struct RoqContext {
 
     AVCodecContext *avctx;
@@ -38,15 +48,30 @@ typedef struct RoqContext {
     AVFrame frames[2];
     AVFrame *last_frame;
     AVFrame *current_frame;
-    int y_stride;
-    int c_stride;
+    int first_frame;
 
-    roq_cell cells[256];
-    roq_qcell qcells[256];
+    roq_cell cb2x2[256];
+    roq_qcell cb4x4[256];
 
-    unsigned char *buf;
+    const unsigned char *buf;
     int size;
+    int width, height;
 
+    /* Encoder only data */
+    AVLFG randctx;
+    uint64_t lambda;
+
+    motion_vect *this_motion4;
+    motion_vect *last_motion4;
+
+    motion_vect *this_motion8;
+    motion_vect *last_motion8;
+
+    unsigned int framesSinceKeyframe;
+
+    AVFrame *frame_to_enc;
+    uint8_t *out_buf;
+    struct RoqTempData *tmpData;
 } RoqContext;
 
 #define RoQ_INFO              0x1001
@@ -66,3 +91,5 @@ 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);
+
+#endif /* AVCODEC_ROQVIDEO_H */