Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044'

[ffmpeg] / libavcodec / hpeldsp.h

diff --git a/libavcodec/hpeldsp.h b/libavcodec/hpeldsp.h
index 57a4cc1a9f613589bd5958fb869beec0da5542b4..8e68729d8a0e914b9ac61a9a75918e1a237b55b5 100644 (file)
--- a/libavcodec/hpeldsp.h
+++ b/libavcodec/hpeldsp.h
@@ -32,9 +32,12 @@
 #include <stddef.h>
 
 /* add and put pixel (decoding) */
-// blocksizes for op_pixels_func are 8x4,8x8 16x8 16x16
-// h for op_pixels_func is limited to {width/2, width} but never larger
+// blocksizes for hpel_pixels_func are 8x4,8x8 16x8 16x16
+// h for hpel_pixels_func is limited to {width/2, width} but never larger
 // than 16 and never smaller than 4
+typedef void (*hpel_pixels_func)(uint8_t *block /*align width (8 or 16)*/,
+                                 const uint8_t *pixels /*align 1*/,
+                                 ptrdiff_t line_size, int h);
 typedef void (*op_pixels_func)(uint8_t *block /*align width (8 or 16)*/,
                                const uint8_t *pixels /*align 1*/,
                                ptrdiff_t line_size, int h);
@@ -53,7 +56,7 @@ typedef struct HpelDSPContext {
      * @param line_size number of bytes in a horizontal line of block
      * @param h height
      */
-    op_pixels_func put_pixels_tab[4][4];
+    hpel_pixels_func put_pixels_tab[4][4];
 
     /**
      * Halfpel motion compensation with rounding (a+b+1)>>1.
@@ -65,7 +68,7 @@ typedef struct HpelDSPContext {
      * @param line_size number of bytes in a horizontal line of block
      * @param h height
      */
-    op_pixels_func avg_pixels_tab[4][4];
+    hpel_pixels_func avg_pixels_tab[4][4];
 
     /**
      * Halfpel motion compensation with no rounding (a+b)>>1.
@@ -77,7 +80,7 @@ typedef struct HpelDSPContext {
      * @param line_size number of bytes in a horizontal line of block
      * @param h height
      */
-    op_pixels_func put_no_rnd_pixels_tab[4][4];
+    hpel_pixels_func put_no_rnd_pixels_tab[4][4];
 
     /**
      * Halfpel motion compensation with no rounding (a+b)>>1.
@@ -89,17 +92,17 @@ typedef struct HpelDSPContext {
      * @param line_size number of bytes in a horizontal line of block
      * @param h height
      */
-    op_pixels_func avg_no_rnd_pixels_tab[4];
+    hpel_pixels_func avg_no_rnd_pixels_tab[4];
 } HpelDSPContext;
 
-void ff_hpeldsp_init(HpelDSPContext* p, int flags);
+void ff_hpeldsp_init(HpelDSPContext *c, int flags);
 
-void ff_hpeldsp_init_alpha(HpelDSPContext* c, int flags);
-void ff_hpeldsp_init_arm(HpelDSPContext* c, int flags);
-void ff_hpeldsp_init_bfin(HpelDSPContext* c, int flags);
-void ff_hpeldsp_init_x86(HpelDSPContext* c, int flags);
-void ff_hpeldsp_init_ppc(HpelDSPContext* c, int flags);
-void ff_hpeldsp_init_sh4(HpelDSPContext* c, int flags);
-void ff_hpeldsp_init_vis(HpelDSPContext* c, int flags);
+void ff_hpeldsp_init_alpha(HpelDSPContext *c, int flags);
+void ff_hpeldsp_init_arm(HpelDSPContext *c, int flags);
+void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags);
+void ff_hpeldsp_init_ppc(HpelDSPContext *c, int flags);
+void ff_hpeldsp_init_sh4(HpelDSPContext *c, int flags);
+void ff_hpeldsp_init_vis(HpelDSPContext *c, int flags);
+void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags);
 
 #endif /* AVCODEC_HPELDSP_H */