Add stereo rematrixing support to the AC-3 encoders.

[ffmpeg] / libavcodec / roqvideo.h

diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
index f4efac7e3c77daa804af7af972f5ea6dffa21b91..3fe11c670bd23913ae74be8c345c98334f36a4ee 100644 (file)
--- a/libavcodec/roqvideo.h
+++ b/libavcodec/roqvideo.h
@@ -22,23 +22,25 @@
 #ifndef AVCODEC_ROQVIDEO_H
 #define AVCODEC_ROQVIDEO_H
 
+#include "libavutil/lfg.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;
 
+struct RoqTempData;
+
 typedef struct RoqContext {
 
     AVCodecContext *avctx;
@@ -47,18 +49,16 @@ typedef struct RoqContext {
     AVFrame *last_frame;
     AVFrame *current_frame;
     int first_frame;
-    int y_stride;
-    int c_stride;
 
     roq_cell cb2x2[256];
     roq_qcell cb4x4[256];
 
-    unsigned char *buf;
+    const unsigned char *buf;
     int size;
     int width, height;
 
     /* Encoder only data */
-    AVRandomState randctx;
+    AVLFG randctx;
     uint64_t lambda;
 
     motion_vect *this_motion4;
@@ -71,6 +71,7 @@ typedef struct RoqContext {
 
     AVFrame *frame_to_enc;
     uint8_t *out_buf;
+    struct RoqTempData *tmpData;
 } RoqContext;
 
 #define RoQ_INFO              0x1001
@@ -91,4 +92,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 // AVCODEC_ROQVIDEO_H
+#endif /* AVCODEC_ROQVIDEO_H */