[FFmpeg-cvslog] r22308 - in trunk/libavcodec/alpha: dsputil_alpha.c dsputil_alpha.h motion_est_alpha.c simple_idct_alpha.c
mru
subversion
Mon Mar 8 03:36:04 CET 2010
Author: mru
Date: Mon Mar 8 03:36:03 2010
New Revision: 22308
Log:
Alpha: move dsputil prototypes to a header file
Added:
trunk/libavcodec/alpha/dsputil_alpha.h
Modified:
trunk/libavcodec/alpha/dsputil_alpha.c
trunk/libavcodec/alpha/motion_est_alpha.c
trunk/libavcodec/alpha/simple_idct_alpha.c
Modified: trunk/libavcodec/alpha/dsputil_alpha.c
==============================================================================
--- trunk/libavcodec/alpha/dsputil_alpha.c Mon Mar 8 03:36:00 2010 (r22307)
+++ trunk/libavcodec/alpha/dsputil_alpha.c Mon Mar 8 03:36:03 2010 (r22308)
@@ -20,33 +20,14 @@
*/
#include "libavcodec/dsputil.h"
+#include "dsputil_alpha.h"
#include "asm.h"
-void ff_simple_idct_axp(DCTELEM *block);
-void ff_simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block);
-void ff_simple_idct_add_axp(uint8_t *dest, int line_size, DCTELEM *block);
-
-void put_pixels_axp_asm(uint8_t *block, const uint8_t *pixels,
- int line_size, int h);
-void put_pixels_clamped_mvi_asm(const DCTELEM *block, uint8_t *pixels,
- int line_size);
-void add_pixels_clamped_mvi_asm(const DCTELEM *block, uint8_t *pixels,
- int line_size);
void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
int line_size);
void (*add_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
int line_size);
-void get_pixels_mvi(DCTELEM *restrict block,
- const uint8_t *restrict pixels, int line_size);
-void diff_pixels_mvi(DCTELEM *block, const uint8_t *s1, const uint8_t *s2,
- int stride);
-int pix_abs8x8_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
-int pix_abs16x16_mvi_asm(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
-int pix_abs16x16_x2_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
-int pix_abs16x16_y2_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
-int pix_abs16x16_xy2_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
-
#if 0
/* These functions were the base for the optimized assembler routines,
and remain here for documentation purposes. */
@@ -280,8 +261,8 @@ PIXOP(put_no_rnd, STORE);
#define STORE(l, b) stq(AVG2(l, ldq(b)), b);
PIXOP(avg_no_rnd, STORE);
-void put_pixels16_axp_asm(uint8_t *block, const uint8_t *pixels,
- int line_size, int h)
+static void put_pixels16_axp_asm(uint8_t *block, const uint8_t *pixels,
+ int line_size, int h)
{
put_pixels_axp_asm(block, pixels, line_size, h);
put_pixels_axp_asm(block + 8, pixels + 8, line_size, h);
Added: trunk/libavcodec/alpha/dsputil_alpha.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavcodec/alpha/dsputil_alpha.h Mon Mar 8 03:36:03 2010 (r22308)
@@ -0,0 +1,50 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_ALPHA_DSPUTIL_ALPHA_H
+#define AVCODEC_ALPHA_DSPUTIL_ALPHA_H
+
+#include "libavcodec/dsputil.h"
+
+void ff_simple_idct_axp(DCTELEM *block);
+void ff_simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block);
+void ff_simple_idct_add_axp(uint8_t *dest, int line_size, DCTELEM *block);
+
+void put_pixels_axp_asm(uint8_t *block, const uint8_t *pixels,
+ int line_size, int h);
+void put_pixels_clamped_mvi_asm(const DCTELEM *block, uint8_t *pixels,
+ int line_size);
+void add_pixels_clamped_mvi_asm(const DCTELEM *block, uint8_t *pixels,
+ int line_size);
+extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
+ int line_size);
+extern void (*add_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
+ int line_size);
+
+void get_pixels_mvi(DCTELEM *restrict block,
+ const uint8_t *restrict pixels, int line_size);
+void diff_pixels_mvi(DCTELEM *block, const uint8_t *s1, const uint8_t *s2,
+ int stride);
+int pix_abs8x8_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
+int pix_abs16x16_mvi_asm(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
+int pix_abs16x16_x2_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
+int pix_abs16x16_y2_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
+int pix_abs16x16_xy2_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
+
+
+#endif /* AVCODEC_ALPHA_DSPUTIL_ALPHA_H */
Modified: trunk/libavcodec/alpha/motion_est_alpha.c
==============================================================================
--- trunk/libavcodec/alpha/motion_est_alpha.c Mon Mar 8 03:36:00 2010 (r22307)
+++ trunk/libavcodec/alpha/motion_est_alpha.c Mon Mar 8 03:36:03 2010 (r22308)
@@ -20,6 +20,7 @@
*/
#include "libavcodec/dsputil.h"
+#include "dsputil_alpha.h"
#include "asm.h"
void get_pixels_mvi(DCTELEM *restrict block,
Modified: trunk/libavcodec/alpha/simple_idct_alpha.c
==============================================================================
--- trunk/libavcodec/alpha/simple_idct_alpha.c Mon Mar 8 03:36:00 2010 (r22307)
+++ trunk/libavcodec/alpha/simple_idct_alpha.c Mon Mar 8 03:36:03 2010 (r22308)
@@ -27,13 +27,9 @@
*/
#include "libavcodec/dsputil.h"
+#include "dsputil_alpha.h"
#include "asm.h"
-extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
- int line_size);
-extern void (*add_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
- int line_size);
-
// cos(i * M_PI / 16) * sqrt(2) * (1 << 14)
// W4 is actually exactly 16384, but using 16383 works around
// accumulating rounding errors for some encoders
More information about the ffmpeg-cvslog
mailing list