Indention, it seems i have forgotton to commit this.

[ffmpeg] / libavcodec / roqvideo.h

diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
index 72b3e1de33974d8f21a4eea677c9c3d8c05c7508..c7544278f26d56b265fd4192f5826fe23e817aa5 100644 (file)
--- 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,28 @@
  * 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 FFMPEG_ROQVIDEO_H
+#define FFMPEG_ROQVIDEO_H
+
 #include "avcodec.h"
 #include "dsputil.h"
+#include "random.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;
+
 typedef struct RoqContext {
 
     AVCodecContext *avctx;
@@ -39,15 +47,28 @@ typedef struct RoqContext {
     AVFrame *last_frame;
     AVFrame *current_frame;
     int first_frame;
-    int y_stride;
-    int c_stride;
 
-    roq_cell cells[256];
-    roq_qcell qcells[256];
+    roq_cell cb2x2[256];
+    roq_qcell cb4x4[256];
 
     unsigned char *buf;
     int size;
+    int width, height;
+
+    /* Encoder only data */
+    AVRandomState 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;
 } RoqContext;
 
 #define RoQ_INFO              0x1001
@@ -67,3 +88,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 /* FFMPEG_ROQVIDEO_H */