Rename tpel_template.c ---> pel_template.c
authorDiego Biurrun <diego@biurrun.de>
Thu, 12 Jun 2014 14:05:49 +0000 (07:05 -0700)
committerDiego Biurrun <diego@biurrun.de>
Fri, 13 Jun 2014 12:21:34 +0000 (05:21 -0700)
The new name more accurately describes what the file is about.

libavcodec/h264qpel_template.c
libavcodec/hpeldsp.c
libavcodec/pel_template.c [new file with mode: 0644]
libavcodec/qpeldsp.c
libavcodec/tpel_template.c [deleted file]
libavcodec/tpeldsp.c

index d03b0dc..963f7f1 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "bit_depth_template.c"
 #include "hpel_template.c"
-#include "tpel_template.c"
+#include "pel_template.c"
 
 static inline void FUNC(copy_block2)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
 {
index 16f4c77..25694c5 100644 (file)
@@ -33,7 +33,7 @@
 
 #define BIT_DEPTH 8
 #include "hpel_template.c"
-#include "tpel_template.c"
+#include "pel_template.c"
 
 #define PIXOP2(OPNAME, OP)                                              \
 static inline void OPNAME ## _no_rnd_pixels8_l2_8(uint8_t *dst,         \
diff --git a/libavcodec/pel_template.c b/libavcodec/pel_template.c
new file mode 100644 (file)
index 0000000..b832ae7
--- /dev/null
@@ -0,0 +1,80 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "libavutil/intreadwrite.h"
+#include "pixels.h"
+#include "rnd_avg.h"
+
+#include "bit_depth_template.c"
+
+#define DEF_PEL(OPNAME, OP)                                             \
+static inline void FUNCC(OPNAME ## _pixels2)(uint8_t *block,            \
+                                             const uint8_t *pixels,     \
+                                             ptrdiff_t line_size,       \
+                                             int h)                     \
+{                                                                       \
+    int i;                                                              \
+    for (i = 0; i < h; i++) {                                           \
+        OP(*((pixel2 *) block), AV_RN2P(pixels));                       \
+        pixels += line_size;                                            \
+        block  += line_size;                                            \
+    }                                                                   \
+}                                                                       \
+                                                                        \
+static inline void FUNCC(OPNAME ## _pixels4)(uint8_t *block,            \
+                                             const uint8_t *pixels,     \
+                                             ptrdiff_t line_size,       \
+                                             int h)                     \
+{                                                                       \
+    int i;                                                              \
+    for (i = 0; i < h; i++) {                                           \
+        OP(*((pixel4 *) block), AV_RN4P(pixels));                       \
+        pixels += line_size;                                            \
+        block  += line_size;                                            \
+    }                                                                   \
+}                                                                       \
+                                                                        \
+static inline void FUNCC(OPNAME ## _pixels8)(uint8_t *block,            \
+                                             const uint8_t *pixels,     \
+                                             ptrdiff_t line_size,       \
+                                             int h)                     \
+{                                                                       \
+    int i;                                                              \
+    for (i = 0; i < h; i++) {                                           \
+        OP(*((pixel4 *) block), AV_RN4P(pixels));                       \
+        OP(*((pixel4 *) (block + 4 * sizeof(pixel))),                   \
+           AV_RN4P(pixels + 4 * sizeof(pixel)));                        \
+        pixels += line_size;                                            \
+        block  += line_size;                                            \
+    }                                                                   \
+}                                                                       \
+                                                                        \
+CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16),                              \
+               FUNCC(OPNAME ## _pixels8),                               \
+               8 * sizeof(pixel))
+
+#define op_avg(a, b) a = rnd_avg_pixel4(a, b)
+#define op_put(a, b) a = b
+
+DEF_PEL(avg, op_avg)
+DEF_PEL(put, op_put)
+#undef op_avg
+#undef op_put
index 7b51ce2..d5afac7 100644 (file)
@@ -33,7 +33,7 @@
 
 #define BIT_DEPTH 8
 #include "hpel_template.c"
-#include "tpel_template.c"
+#include "pel_template.c"
 #include "qpel_template.c"
 
 #define QPEL_MC(r, OPNAME, RND, OP)                                           \
diff --git a/libavcodec/tpel_template.c b/libavcodec/tpel_template.c
deleted file mode 100644 (file)
index f07679a..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "libavutil/intreadwrite.h"
-#include "pixels.h"
-#include "rnd_avg.h"
-
-#include "bit_depth_template.c"
-
-#define DEF_TPEL(OPNAME, OP)                                            \
-static inline void FUNCC(OPNAME ## _pixels2)(uint8_t *block,            \
-                                             const uint8_t *pixels,     \
-                                             ptrdiff_t line_size,       \
-                                             int h)                     \
-{                                                                       \
-    int i;                                                              \
-    for (i = 0; i < h; i++) {                                           \
-        OP(*((pixel2 *) block), AV_RN2P(pixels));                       \
-        pixels += line_size;                                            \
-        block  += line_size;                                            \
-    }                                                                   \
-}                                                                       \
-                                                                        \
-static inline void FUNCC(OPNAME ## _pixels4)(uint8_t *block,            \
-                                             const uint8_t *pixels,     \
-                                             ptrdiff_t line_size,       \
-                                             int h)                     \
-{                                                                       \
-    int i;                                                              \
-    for (i = 0; i < h; i++) {                                           \
-        OP(*((pixel4 *) block), AV_RN4P(pixels));                       \
-        pixels += line_size;                                            \
-        block  += line_size;                                            \
-    }                                                                   \
-}                                                                       \
-                                                                        \
-static inline void FUNCC(OPNAME ## _pixels8)(uint8_t *block,            \
-                                             const uint8_t *pixels,     \
-                                             ptrdiff_t line_size,       \
-                                             int h)                     \
-{                                                                       \
-    int i;                                                              \
-    for (i = 0; i < h; i++) {                                           \
-        OP(*((pixel4 *) block), AV_RN4P(pixels));                       \
-        OP(*((pixel4 *) (block + 4 * sizeof(pixel))),                   \
-           AV_RN4P(pixels + 4 * sizeof(pixel)));                        \
-        pixels += line_size;                                            \
-        block  += line_size;                                            \
-    }                                                                   \
-}                                                                       \
-                                                                        \
-CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16),                              \
-               FUNCC(OPNAME ## _pixels8),                               \
-               8 * sizeof(pixel))
-
-#define op_avg(a, b) a = rnd_avg_pixel4(a, b)
-#define op_put(a, b) a = b
-
-DEF_TPEL(avg, op_avg)
-DEF_TPEL(put, op_put)
-#undef op_avg
-#undef op_put
index 6a16813..7ea1da4 100644 (file)
@@ -29,7 +29,7 @@
 #include "tpeldsp.h"
 
 #define BIT_DEPTH 8
-#include "tpel_template.c"
+#include "pel_template.c"
 
 static inline void put_tpel_pixels_mc00_c(uint8_t *dst, const uint8_t *src,
                                           int stride, int width, int height)