X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Froqvideo.h;h=eed2f226feb814f4cc27b585c6a047ebea7f60b3;hb=72fe16a13e3ebd5396ac173bf84c8b20085c16d5;hp=8ce9297b226be14c187063ab29bf09c0358f6db7;hpb=699b3f99d0376a8fd5159bdad857228bda59cff6;p=ffmpeg

diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
index 8ce9297b226..eed2f226feb 100644
--- a/libavcodec/roqvideo.h
+++ b/libavcodec/roqvideo.h
@@ -1,55 +1,75 @@
 /*
- * Copyright (C) 2003 the ffmpeg project
+ * Copyright (C) 2003 Mike Melanson
+ * Copyright (C) 2003 Dr. Tim Ferguson
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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,
+ * Libav 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
+ * License along with Libav; 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"
+#include "bytestream.h"
 
-typedef struct {
-  unsigned char y[4];
-  unsigned char u, v;
+typedef struct roq_cell {
+    unsigned char y[4];
+    unsigned char u, v;
 } roq_cell;
 
-typedef struct {
-  int idx[4];
+typedef struct roq_qcell {
+    int idx[4];
 } roq_qcell;
 
+typedef struct motion_vect {
+    int d[2];
+} motion_vect;
+
+struct RoqTempData;
+
 typedef struct RoqContext {
 
     AVCodecContext *avctx;
-    DSPContext dsp;
     AVFrame frames[2];
     AVFrame *last_frame;
     AVFrame *current_frame;
-    int y_stride;
-    int c_stride;
+    int first_frame;
 
     roq_cell cb2x2[256];
     roq_qcell cb4x4[256];
 
-    unsigned char *buf;
-    int size;
+    GetByteContext gb;
+    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;
 
+    const AVFrame *frame_to_enc;
+    uint8_t *out_buf;
+    struct RoqTempData *tmpData;
 } RoqContext;
 
 #define RoQ_INFO              0x1001
@@ -70,4 +90,4 @@ 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
+#endif /* AVCODEC_ROQVIDEO_H */