diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-17 20:26:00 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-17 20:28:59 -0300 |
| commit | 6007f7d4665e970714c2962c0ddb7de910d9da0c (patch) | |
| tree | 199d6b22ab0f54964528cd45dc892f8da5ab8ac2 /libavcodec/cfhd.h | |
| parent | 8f2cc2f1e9ef7611cbba43fe96f331271b4844fd (diff) | |
| parent | 5f794aa1653aa04c1da7397e9ccacad947fadf5f (diff) | |
| download | ffmpeg-6007f7d4665e970714c2962c0ddb7de910d9da0c.tar.gz | |
Merge commit '5f794aa1653aa04c1da7397e9ccacad947fadf5f'
* commit '5f794aa1653aa04c1da7397e9ccacad947fadf5f':
Add Cineform HD Decoder
See 3485332bf99602910fe8830b0230d02fc653135d.
Some cosmetics are merged. The refactoring is not merged at the
request of Kieran Kunhya.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/cfhd.h')
| -rw-r--r-- | libavcodec/cfhd.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/libavcodec/cfhd.h b/libavcodec/cfhd.h index 67a0e4c32c..b0a52088aa 100644 --- a/libavcodec/cfhd.h +++ b/libavcodec/cfhd.h @@ -27,10 +27,10 @@ #include "avcodec.h" #include "get_bits.h" +#include "vlc.h" -#define VLC_BITS 9 -#define NB_VLC_TABLE_9 (71+3) -#define NB_VLC_TABLE_18 (263+1) +#define VLC_BITS 9 +#define SUBBAND_COUNT 10 typedef struct CFHD_RL_VLC_ELEM { int16_t level; @@ -43,7 +43,7 @@ typedef struct CFHD_RL_VLC_ELEM { typedef struct SubBand { int level; int orientation; - int stride; + ptrdiff_t stride; int a_width; int width; int a_height; @@ -62,7 +62,7 @@ typedef struct Plane { int16_t *idwt_tmp; /* TODO: merge this into SubBand structure */ - int16_t *subband[10]; + int16_t *subband[SUBBAND_COUNT]; int16_t *l_h[8]; SubBand band[DWT_LEVELS][4]; @@ -79,18 +79,15 @@ typedef struct CFHDContext { GetBitContext gb; - int chroma_x_shift; - int chroma_y_shift; - int coded_width; int coded_height; - int coded_format; + enum AVPixelFormat coded_format; int a_width; int a_height; int a_format; - int bpc; + int bpc; // bits per channel/component int channel_cnt; int subband_cnt; int channel_num; @@ -106,7 +103,6 @@ typedef struct CFHDContext { uint8_t prescale_shift[3]; Plane plane[4]; - } CFHDContext; int ff_cfhd_init_vlcs(CFHDContext *s); |