X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvp8dsp.h;h=877e264ff982e18c887b4984fa3f4fb20cf03646;hb=6fee1b90ce3bf4fbdfde7016e0890057c9000487;hp=bce0062c51d617c3007ce66607e4976f1fd8cfd3;hpb=511cf612ac979f536fd65e14603a87ca5ad435f3;p=ffmpeg diff --git a/libavcodec/vp8dsp.h b/libavcodec/vp8dsp.h index bce0062c51d..877e264ff98 100644 --- a/libavcodec/vp8dsp.h +++ b/libavcodec/vp8dsp.h @@ -27,20 +27,21 @@ #ifndef AVCODEC_VP8DSP_H #define AVCODEC_VP8DSP_H -#include "dsputil.h" +#include +#include typedef void (*vp8_mc_func)(uint8_t *dst/*align 8*/, ptrdiff_t dstStride, uint8_t *src/*align 1*/, ptrdiff_t srcStride, int h, int x, int y); typedef struct VP8DSPContext { - void (*vp8_luma_dc_wht)(DCTELEM block[4][4][16], DCTELEM dc[16]); - void (*vp8_luma_dc_wht_dc)(DCTELEM block[4][4][16], DCTELEM dc[16]); - void (*vp8_idct_add)(uint8_t *dst, DCTELEM block[16], ptrdiff_t stride); - void (*vp8_idct_dc_add)(uint8_t *dst, DCTELEM block[16], ptrdiff_t stride); - void (*vp8_idct_dc_add4y)(uint8_t *dst, DCTELEM block[4][16], + void (*vp8_luma_dc_wht)(int16_t block[4][4][16], int16_t dc[16]); + void (*vp8_luma_dc_wht_dc)(int16_t block[4][4][16], int16_t dc[16]); + void (*vp8_idct_add)(uint8_t *dst, int16_t block[16], ptrdiff_t stride); + void (*vp8_idct_dc_add)(uint8_t *dst, int16_t block[16], ptrdiff_t stride); + void (*vp8_idct_dc_add4y)(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride); - void (*vp8_idct_dc_add4uv)(uint8_t *dst, DCTELEM block[4][16], + void (*vp8_idct_dc_add4uv)(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride); // loop filter applied to edges between macroblocks @@ -89,7 +90,7 @@ void ff_put_vp8_pixels4_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride, void ff_vp8dsp_init(VP8DSPContext *c); void ff_vp8dsp_init_x86(VP8DSPContext *c); -void ff_vp8dsp_init_altivec(VP8DSPContext *c); void ff_vp8dsp_init_arm(VP8DSPContext *c); +void ff_vp8dsp_init_ppc(VP8DSPContext *c); #endif /* AVCODEC_VP8DSP_H */