avfilter/vf_ssim: remove unnecessary check

[ffmpeg] / libavcodec / cfhd.h

diff --git a/libavcodec/cfhd.h b/libavcodec/cfhd.h
index 09c570c06b0b4a79ca1cc1909d707455db97f38b..19e5c7cf03b8504444ecb5389238dcf62a119e8c 100644 (file)
--- a/libavcodec/cfhd.h
+++ b/libavcodec/cfhd.h
@@ -29,11 +29,16 @@
 #include "bytestream.h"
 #include "get_bits.h"
 #include "vlc.h"
+#include "cfhddsp.h"
 
 enum CFHDParam {
     SampleType       =   1,
     SampleIndexTable =   2,
     BitstreamMarker  =   4,
+    VersionMajor     =   5,
+    VersionMinor     =   6,
+    VersionRevision  =   7,
+    VersionEdit      =   8,
     TransformType    =  10,
     NumFrames        =  11,
     ChannelCount     =  12,
@@ -78,12 +83,16 @@ enum CFHDParam {
     Precision        =  70,
     InputFormat      =  71,
     BandCodingFlags  =  72,
+    PeakLevel        =  74,
+    PeakOffsetLow    =  75,
+    PeakOffsetHigh   =  76,
+    Version          =  79,
     BandSecondPass   =  82,
     PrescaleTable    =  83,
     EncodedFormat    =  84,
+    DisplayHeight    =  85,
     ChannelWidth     = 104,
     ChannelHeight    = 105,
-    PrescaleShift    = 109,
 };
 
 #define VLC_BITS       9
@@ -105,6 +114,7 @@ typedef struct SubBand {
     int width;
     int a_height;
     int height;
+    int8_t read_ok;
 } SubBand;
 
 typedef struct Plane {
@@ -156,6 +166,7 @@ typedef struct CFHDContext {
     int a_width;
     int a_height;
     int a_format;
+    int a_transform_type;
 
     int bpc; // bits per channel/component
     int channel_cnt;
@@ -171,9 +182,11 @@ typedef struct CFHDContext {
     int level;
     int subband_num_actual;
 
-    uint8_t prescale_shift[3];
+    uint8_t prescale_table[8];
     Plane plane[4];
     Peak peak;
+
+    CFHDDSPContext dsp;
 } CFHDContext;
 
 int ff_cfhd_init_vlcs(CFHDContext *s);