summaryrefslogtreecommitdiff
path: root/libavcodec/dirac_dwt.h
diff options
context:
space:
mode:
authorKieran Kunhya <kierank@ob-encoder.com>2015-12-09 08:24:36 +0000
committerRostislav Pehlivanov <atomnuker@gmail.com>2015-12-10 18:25:02 +0000
commit3f07f12f65e56d1cf96e5ac2cefc0ad9c7bfb6af (patch)
treecae42009ffbc267c02e97adc810ff97b26303dbf /libavcodec/dirac_dwt.h
parent9553689854d61069ae3467f9b46dac43ee991d96 (diff)
diracdec: Template DSP functions adding 10-bit versions
Diffstat (limited to 'libavcodec/dirac_dwt.h')
-rw-r--r--libavcodec/dirac_dwt.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/dirac_dwt.h b/libavcodec/dirac_dwt.h
index e5e447b0ac..41842b5cd6 100644
--- a/libavcodec/dirac_dwt.h
+++ b/libavcodec/dirac_dwt.h
@@ -30,21 +30,21 @@ typedef short IDWTELEM;
#define MAX_DECOMPOSITIONS 8
typedef struct DWTCompose {
- IDWTELEM *b[MAX_DWT_SUPPORT];
+ uint8_t *b[MAX_DWT_SUPPORT];
int y;
} DWTCompose;
struct DWTContext;
// Possible prototypes for vertical_compose functions
-typedef void (*vertical_compose_2tap)(IDWTELEM *b0, IDWTELEM *b1, int width);
-typedef void (*vertical_compose_3tap)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width);
-typedef void (*vertical_compose_5tap)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, int width);
-typedef void (*vertical_compose_9tap)(IDWTELEM *dst, IDWTELEM *b[8], int width);
+typedef void (*vertical_compose_2tap)(uint8_t *b0, uint8_t *b1, int width);
+typedef void (*vertical_compose_3tap)(uint8_t *b0, uint8_t *b1, uint8_t *b2, int width);
+typedef void (*vertical_compose_5tap)(uint8_t *b0, uint8_t *b1, uint8_t *b2, uint8_t *b3, uint8_t *b4, int width);
+typedef void (*vertical_compose_9tap)(uint8_t *dst, uint8_t *b[8], int width);
typedef struct DWTContext {
- IDWTELEM *buffer;
- IDWTELEM *temp;
+ uint8_t *buffer;
+ uint8_t *temp;
int width;
int height;
int stride;
@@ -57,7 +57,7 @@ typedef struct DWTContext {
void (*vertical_compose_l1)(void);
void (*vertical_compose_h1)(void);
void (*vertical_compose)(void); ///< one set of lowpass and highpass combined
- void (*horizontal_compose)(IDWTELEM *b, IDWTELEM *tmp, int width);
+ void (*horizontal_compose)(uint8_t *b, uint8_t *tmp, int width);
DWTCompose cs[MAX_DECOMPOSITIONS];
} DWTContext;
@@ -76,9 +76,9 @@ enum dwt_type {
};
// -1 if an error occurred, e.g. the dwt_type isn't recognized
-int ff_spatial_idwt_init2(DWTContext *d, IDWTELEM *buffer, int width, int height,
+int ff_spatial_idwt_init2(DWTContext *d, uint8_t *buffer, int width, int height,
int stride, enum dwt_type type, int decomposition_count,
- IDWTELEM *temp);
+ uint8_t *temp, int bit_depth);
void ff_spatial_idwt_slice2(DWTContext *d, int y);