From: Diego Biurrun Date: Tue, 28 Jan 2014 17:19:21 +0000 (+0100) Subject: x86: dsputil: Move fpel declarations to a separate header X-Git-Tag: v11_alpha1~852 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6655c933a887a2d20707fff657b614aa1d86a25b;p=platform%2Fupstream%2Flibav.git x86: dsputil: Move fpel declarations to a separate header --- diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c index bc9cbf7..d5c441f 100644 --- a/libavcodec/x86/cavsdsp.c +++ b/libavcodec/x86/cavsdsp.c @@ -30,6 +30,7 @@ #include "libavcodec/cavsdsp.h" #include "constants.h" #include "dsputil_x86.h" +#include "fpel.h" #include "config.h" #if HAVE_MMX_INLINE diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index 7b52874..d0832b1 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -28,6 +28,7 @@ #include "libavcodec/simple_idct.h" #include "libavcodec/version.h" #include "dsputil_x86.h" +#include "fpel.h" #include "idct_xvid.h" void ff_put_pixels8_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2, diff --git a/libavcodec/x86/dsputil_x86.h b/libavcodec/x86/dsputil_x86.h index ad41e69..9fd34fc 100644 --- a/libavcodec/x86/dsputil_x86.h +++ b/libavcodec/x86/dsputil_x86.h @@ -61,23 +61,6 @@ void ff_gmc_mmx(uint8_t *dst, uint8_t *src, void ff_vector_clipf_sse(float *dst, const float *src, float min, float max, int len); -void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_avg_pixels16_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_put_pixels8_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_put_pixels16_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_avg_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_put_pixels16_sse2(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); - void ff_avg_pixels8_x2_mmx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); diff --git a/libavcodec/x86/fpel.h b/libavcodec/x86/fpel.h new file mode 100644 index 0000000..88d1415 --- /dev/null +++ b/libavcodec/x86/fpel.h @@ -0,0 +1,43 @@ +/* + * 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 + */ + +#ifndef AVCODEC_X86_FPEL_H +#define AVCODEC_X86_FPEL_H + +#include +#include + +void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_avg_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_avg_pixels16_mmx(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_put_pixels8_mmx(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_put_pixels16_mmx(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_put_pixels16_sse2(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); + + +#endif /* AVCODEC_X86_FPEL_H */ diff --git a/libavcodec/x86/fpel_mmx.c b/libavcodec/x86/fpel_mmx.c index 9c88ccf..eef05ec 100644 --- a/libavcodec/x86/fpel_mmx.c +++ b/libavcodec/x86/fpel_mmx.c @@ -25,7 +25,7 @@ #include #include "config.h" -#include "dsputil_x86.h" +#include "fpel.h" #include "inline_asm.h" #if HAVE_MMX_INLINE diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index 8e067e3..aa6e9d5 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -26,7 +26,7 @@ #include "libavcodec/h264qpel.h" #include "libavcodec/mpegvideo.h" #include "libavcodec/pixels.h" -#include "dsputil_x86.h" +#include "fpel.h" #if HAVE_YASM void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels, diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c index e686f2c..0603e40 100644 --- a/libavcodec/x86/hpeldsp_init.c +++ b/libavcodec/x86/hpeldsp_init.c @@ -30,6 +30,7 @@ #include "libavcodec/hpeldsp.h" #include "libavcodec/pixels.h" #include "dsputil_x86.h" +#include "fpel.h" void ff_put_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); diff --git a/libavcodec/x86/vc1dsp_init.c b/libavcodec/x86/vc1dsp_init.c index 9bd5ae3..aff4b26 100644 --- a/libavcodec/x86/vc1dsp_init.c +++ b/libavcodec/x86/vc1dsp_init.c @@ -28,7 +28,7 @@ #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" #include "libavcodec/vc1dsp.h" -#include "dsputil_x86.h" +#include "fpel.h" #include "vc1dsp.h" #include "config.h" diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index 15fd2c8..046affb 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -31,7 +31,7 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/vc1dsp.h" #include "constants.h" -#include "dsputil_x86.h" +#include "fpel.h" #include "vc1dsp.h" #if HAVE_INLINE_ASM