xsubdec: Convert to the new bitstream reader

[ffmpeg] / libavcodec / ffv1.h

diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h
index 7676c61be35895b8b3cb667150bdbce54fce7cc8..34370fa143b7e778e7c34b8d2968763bae389da3 100644 (file)
--- a/libavcodec/ffv1.h
+++ b/libavcodec/ffv1.h
@@ -1,7 +1,7 @@
 /*
  * FFV1 codec for libavcodec
  *
- * Copyright (c) 2012 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2003-2012 Michael Niedermayer <michaelni@gmx.at>
  *
  * This file is part of Libav.
  *
@@ -22,7 +22,13 @@
 
 #ifndef AVCODEC_FFV1_H
 #define AVCODEC_FFV1_H
+
+#include <stdint.h>
+
 #include "avcodec.h"
+#include "get_bits.h"
+#include "put_bits.h"
+#include "rangecoder.h"
 
 #define MAX_PLANES 4
 #define CONTEXT_SIZE 32
@@ -30,6 +36,10 @@
 #define MAX_QUANT_TABLES 8
 #define MAX_CONTEXT_INPUTS 5
 
+#define AC_GOLOMB_RICE          0
+#define AC_RANGE_DEFAULT_TAB    1
+#define AC_RANGE_CUSTOM_TAB     2
+
 extern const uint8_t ff_log2_run[41];
 
 extern const int8_t ffv1_quant5_10bit[256];
@@ -57,6 +67,7 @@ typedef struct PlaneContext {
 #define MAX_SLICES 256
 
 typedef struct FFV1Context {
+    AVClass *class;
     AVCodecContext *avctx;
     RangeCoder c;
     GetBitContext gb;
@@ -64,13 +75,21 @@ typedef struct FFV1Context {
     uint64_t rc_stat[256][2];
     uint64_t (*rc_stat2[MAX_QUANT_TABLES])[32][2];
     int version;
+    int minor_version;
     int width, height;
+    int chroma_planes;
     int chroma_h_shift, chroma_v_shift;
+    int transparency;
     int flags;
     int picture_number;
-    AVFrame picture;
+    int key_frame;
+    const AVFrame *frame;
+    AVFrame *last_picture;
+
+    AVFrame *cur;
     int plane_count;
     int ac;     // 1 = range coder <-> 0 = golomb rice
+    int ac_byte_count;      // number of bytes used for AC coding
     PlaneContext plane[MAX_PLANES];
     int16_t quant_table[MAX_CONTEXT_INPUTS][256];
     int16_t quant_tables[MAX_QUANT_TABLES][MAX_CONTEXT_INPUTS][256];
@@ -80,11 +99,17 @@ typedef struct FFV1Context {
     int run_index;
     int colorspace;
     int16_t *sample_buffer;
-    int gob_count;
 
-    int quant_table_count;
+    int ec;
+    int slice_damaged;
+    int key_frame_ok;
+    int context_model;
+
+    int bits_per_raw_sample;
+    int packed_at_lsb;
 
-    DSPContext dsp;
+    int gob_count;
+    int quant_table_count;
 
     struct FFV1Context *slice_context[MAX_SLICES];
     int slice_count;
@@ -175,10 +200,10 @@ static inline void update_vlc_state(VlcState *const state, const int v)
 }
 
 int ffv1_common_init(AVCodecContext *avctx);
-int ffv1_init_slice_state(FFV1Context *f);
+int ffv1_init_slice_state(FFV1Context *f, FFV1Context *fs);
 int ffv1_init_slice_contexts(FFV1Context *f);
 int ffv1_allocate_initial_states(FFV1Context *f);
-void ffv1_clear_state(FFV1Context *f);
+void ffv1_clear_slice_state(FFV1Context *f, FFV1Context *fs);
 int ffv1_close(AVCodecContext *avctx);
 
 #endif /* AVCODEC_FFV1_H */