---
libavcodec/arm/{idctdsp_init_armv5te.c => idct.h} | 28 +++++++----------------
libavcodec/arm/idctdsp_init_arm.c | 4 +---
libavcodec/arm/idctdsp_init_armv5te.c | 2 +-
libavcodec/arm/idctdsp_init_armv6.c | 2 +-
libavcodec/arm/idctdsp_init_neon.c | 2 +-
libavcodec/dct-test.c | 8 +------
6 files changed, 13 insertions(+), 33 deletions(-)
copy libavcodec/arm/{idctdsp_init_armv5te.c => idct.h} (50%)
diff --git a/libavcodec/arm/idctdsp_init_armv5te.c b/libavcodec/arm/idct.h
similarity index 50%
copy from libavcodec/arm/idctdsp_init_armv5te.c
copy to libavcodec/arm/idct.h
index 1088563..1693785 100644
--- a/libavcodec/arm/idctdsp_init_armv5te.c
+++ b/libavcodec/arm/idct.h
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2009 Mans Rullgard <[email protected]>
- *
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
@@ -18,26 +16,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef AVCODEC_ARM_IDCT_H
+#define AVCODEC_ARM_IDCT_H
+
#include <stdint.h>
-#include "libavutil/attributes.h"
-#include "libavcodec/avcodec.h"
-#include "libavcodec/idctdsp.h"
-#include "idctdsp_arm.h"
+void ff_j_rev_dct_arm(int16_t *data);
+void ff_simple_idct_arm(int16_t *data);
void ff_simple_idct_armv5te(int16_t *data);
-void ff_simple_idct_put_armv5te(uint8_t *dest, int line_size, int16_t *data);
-void ff_simple_idct_add_armv5te(uint8_t *dest, int line_size, int16_t *data);
+void ff_simple_idct_armv6(int16_t *data);
+void ff_simple_idct_neon(int16_t *data);
-av_cold void ff_idctdsp_init_armv5te(IDCTDSPContext *c, AVCodecContext *avctx,
- unsigned high_bit_depth)
-{
- if (!high_bit_depth &&
- (avctx->idct_algo == FF_IDCT_AUTO ||
- avctx->idct_algo == FF_IDCT_SIMPLEARMV5TE)) {
- c->idct_put = ff_simple_idct_put_armv5te;
- c->idct_add = ff_simple_idct_add_armv5te;
- c->idct = ff_simple_idct_armv5te;
- c->perm_type = FF_IDCT_PERM_NONE;
- }
-}
+#endif /* AVCODEC_ARM_IDCT_H */
diff --git a/libavcodec/arm/idctdsp_init_arm.c
b/libavcodec/arm/idctdsp_init_arm.c
index cf75383..0b32df0 100644
--- a/libavcodec/arm/idctdsp_init_arm.c
+++ b/libavcodec/arm/idctdsp_init_arm.c
@@ -26,11 +26,9 @@
#include "libavutil/arm/cpu.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/idctdsp.h"
+#include "idct.h"
#include "idctdsp_arm.h"
-void ff_j_rev_dct_arm(int16_t *data);
-void ff_simple_idct_arm(int16_t *data);
-
/* XXX: local hack */
static void (*ff_put_pixels_clamped)(const int16_t *block, uint8_t *pixels,
int line_size);
static void (*ff_add_pixels_clamped)(const int16_t *block, uint8_t *pixels,
int line_size);
diff --git a/libavcodec/arm/idctdsp_init_armv5te.c
b/libavcodec/arm/idctdsp_init_armv5te.c
index 1088563..d089bfb 100644
--- a/libavcodec/arm/idctdsp_init_armv5te.c
+++ b/libavcodec/arm/idctdsp_init_armv5te.c
@@ -23,9 +23,9 @@
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/idctdsp.h"
+#include "idct.h"
#include "idctdsp_arm.h"
-void ff_simple_idct_armv5te(int16_t *data);
void ff_simple_idct_put_armv5te(uint8_t *dest, int line_size, int16_t *data);
void ff_simple_idct_add_armv5te(uint8_t *dest, int line_size, int16_t *data);
diff --git a/libavcodec/arm/idctdsp_init_armv6.c
b/libavcodec/arm/idctdsp_init_armv6.c
index 282128f..3d618f7 100644
--- a/libavcodec/arm/idctdsp_init_armv6.c
+++ b/libavcodec/arm/idctdsp_init_armv6.c
@@ -23,9 +23,9 @@
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/idctdsp.h"
+#include "idct.h"
#include "idctdsp_arm.h"
-void ff_simple_idct_armv6(int16_t *data);
void ff_simple_idct_put_armv6(uint8_t *dest, int line_size, int16_t *data);
void ff_simple_idct_add_armv6(uint8_t *dest, int line_size, int16_t *data);
diff --git a/libavcodec/arm/idctdsp_init_neon.c
b/libavcodec/arm/idctdsp_init_neon.c
index 66783d8..d0eb728 100644
--- a/libavcodec/arm/idctdsp_init_neon.c
+++ b/libavcodec/arm/idctdsp_init_neon.c
@@ -24,9 +24,9 @@
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/idctdsp.h"
+#include "idct.h"
#include "idctdsp_arm.h"
-void ff_simple_idct_neon(int16_t *data);
void ff_simple_idct_put_neon(uint8_t *dest, int line_size, int16_t *data);
void ff_simple_idct_add_neon(uint8_t *dest, int line_size, int16_t *data);
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index a37898e..a16f89c 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -39,6 +39,7 @@
#include "libavutil/lfg.h"
#include "libavutil/time.h"
+#include "arm/idct.h"
#include "dct.h"
#include "idctdsp.h"
#include "simple_idct.h"
@@ -58,13 +59,6 @@ void ff_bfin_fdct(int16_t *block);
// ALTIVEC
void ff_fdct_altivec(int16_t *block);
-// ARM
-void ff_j_rev_dct_arm(int16_t *data);
-void ff_simple_idct_arm(int16_t *data);
-void ff_simple_idct_armv5te(int16_t *data);
-void ff_simple_idct_armv6(int16_t *data);
-void ff_simple_idct_neon(int16_t *data);
-
struct algo {
const char *name;
void (*func)(int16_t *block);
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
