[FFmpeg-cvslog] dsputil: Move draw_edges and clear_block* out of dsputil_template
Diego Biurrun
git at videolan.org
Wed Mar 26 15:41:15 CET 2014
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Jan 8 00:43:09 2014 +0100| [92ba965103d3884609730ba9bf293772dc78a9ef] | committer: Diego Biurrun
dsputil: Move draw_edges and clear_block* out of dsputil_template
The functions are not used templatized.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92ba965103d3884609730ba9bf293772dc78a9ef
---
libavcodec/dsputil.c | 38 ++++++++++++++++++++++++++++++++++++++
libavcodec/dsputil_template.c | 40 ----------------------------------------
2 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 843c244..534bc92 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -2402,6 +2402,44 @@ static void jref_idct_add(uint8_t *dest, int line_size, int16_t *block)
add_pixels_clamped_c(block, dest, line_size);
}
+/* draw the edges of width 'w' of an image of size width, height */
+// FIXME: Check that this is OK for MPEG-4 interlaced.
+static void draw_edges_8_c(uint8_t *buf, int wrap, int width, int height,
+ int w, int h, int sides)
+{
+ uint8_t *ptr = buf, *last_line;
+ int i;
+
+ /* left and right */
+ for (i = 0; i < height; i++) {
+ memset(ptr - w, ptr[0], w);
+ memset(ptr + width, ptr[width - 1], w);
+ ptr += wrap;
+ }
+
+ /* top and bottom + corners */
+ buf -= w;
+ last_line = buf + (height - 1) * wrap;
+ if (sides & EDGE_TOP)
+ for (i = 0; i < h; i++)
+ // top
+ memcpy(buf - (i + 1) * wrap, buf, width + w + w);
+ if (sides & EDGE_BOTTOM)
+ for (i = 0; i < h; i++)
+ // bottom
+ memcpy(last_line + (i + 1) * wrap, last_line, width + w + w);
+}
+
+static void clear_block_8_c(int16_t *block)
+{
+ memset(block, 0, sizeof(int16_t) * 64);
+}
+
+static void clear_blocks_8_c(int16_t *blocks)
+{
+ memset(blocks, 0, sizeof(int16_t) * 6 * 64);
+}
+
/* init static data */
av_cold void ff_dsputil_static_init(void)
{
diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c
index 8085078..7a8eb22 100644
--- a/libavcodec/dsputil_template.c
+++ b/libavcodec/dsputil_template.c
@@ -27,46 +27,6 @@
* DSP utils
*/
-#include "pixels.h"
-
-/* draw the edges of width 'w' of an image of size width, height */
-// FIXME: Check that this is OK for MPEG-4 interlaced.
-static void draw_edges_8_c(uint8_t *buf, int wrap, int width, int height,
- int w, int h, int sides)
-{
- uint8_t *ptr = buf, *last_line;
- int i;
-
- /* left and right */
- for (i = 0; i < height; i++) {
- memset(ptr - w, ptr[0], w);
- memset(ptr + width, ptr[width - 1], w);
- ptr += wrap;
- }
-
- /* top and bottom + corners */
- buf -= w;
- last_line = buf + (height - 1) * wrap;
- if (sides & EDGE_TOP)
- for (i = 0; i < h; i++)
- // top
- memcpy(buf - (i + 1) * wrap, buf, width + w + w);
- if (sides & EDGE_BOTTOM)
- for (i = 0; i < h; i++)
- // bottom
- memcpy(last_line + (i + 1) * wrap, last_line, width + w + w);
-}
-
-static void clear_block_8_c(int16_t *block)
-{
- memset(block, 0, sizeof(int16_t) * 64);
-}
-
-static void clear_blocks_8_c(int16_t *blocks)
-{
- memset(blocks, 0, sizeof(int16_t) * 6 * 64);
-}
-
#define PIXOP2(OPNAME, OP) \
static inline void OPNAME ## _no_rnd_pixels8_l2_8(uint8_t *dst, \
const uint8_t *src1, \
More information about the ffmpeg-cvslog
mailing list