aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-02-07 15:06:09 +0100
committerDiego Biurrun <diego@biurrun.de>2012-02-13 09:59:53 +0100
commit0bf184e59cdb9a33883b8a04c8573d132ab5ee7c (patch)
tree2e4c53856ca2e9a8f265811f69a20d4a1d686c7c
parent75f11901b588684dae19eaa9e5896931b30ffdcc (diff)
downloadffmpeg-0bf184e59cdb9a33883b8a04c8573d132ab5ee7c.tar.gz
Move PS2 MMI code below the mips subdirectory, where it belongs.
Also give a more suitable name to the MMI-optimized IDCT; it is not PS2-specific, as the name currently suggests.
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/avcodec.h2
-rw-r--r--libavcodec/mips/Makefile6
-rw-r--r--libavcodec/mips/dsputil_mmi.c (renamed from libavcodec/ps2/dsputil_mmi.c)2
-rw-r--r--libavcodec/mips/idct_mmi.c (renamed from libavcodec/ps2/idct_mmi.c)0
-rw-r--r--libavcodec/mips/mmi.h (renamed from libavcodec/ps2/mmi.h)6
-rw-r--r--libavcodec/mips/mpegvideo_mmi.c (renamed from libavcodec/ps2/mpegvideo_mmi.c)0
-rw-r--r--libavcodec/options.c2
8 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 6c9673f13d..a891651f26 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -694,7 +694,7 @@ HOSTPROGS = aac_tablegen aacps_tablegen cbrt_tablegen cos_tablegen \
dv_tablegen motionpixels_tablegen mpegaudio_tablegen \
pcm_tablegen qdm2_tablegen sinewin_tablegen
-DIRS = alpha arm avr32 bfin ppc ps2 sh4 sparc x86
+DIRS = alpha arm avr32 bfin mips ppc sh4 sparc x86
CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 26e9c42f9d..6afa140ebd 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1729,7 +1729,7 @@ typedef struct AVCodecContext {
#define FF_IDCT_SIMPLE 2
#define FF_IDCT_SIMPLEMMX 3
#define FF_IDCT_LIBMPEG2MMX 4
-#define FF_IDCT_PS2 5
+#define FF_IDCT_MMI 5
#define FF_IDCT_ARM 7
#define FF_IDCT_ALTIVEC 8
#define FF_IDCT_SH4 9
diff --git a/libavcodec/mips/Makefile b/libavcodec/mips/Makefile
index 3f4da68ec9..006617687e 100644
--- a/libavcodec/mips/Makefile
+++ b/libavcodec/mips/Makefile
@@ -1,3 +1,3 @@
-OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \
- ps2/idct_mmi.o \
- ps2/mpegvideo_mmi.o \
+OBJS-$(HAVE_MMI) += mips/dsputil_mmi.o \
+ mips/idct_mmi.o \
+ mips/mpegvideo_mmi.o \
diff --git a/libavcodec/ps2/dsputil_mmi.c b/libavcodec/mips/dsputil_mmi.c
index 06e3bdabcb..20a435a065 100644
--- a/libavcodec/ps2/dsputil_mmi.c
+++ b/libavcodec/mips/dsputil_mmi.c
@@ -153,7 +153,7 @@ void dsputil_init_mmi(DSPContext* c, AVCodecContext *avctx)
}
if (avctx->bits_per_raw_sample <= 8 &&
- (idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_PS2)) {
+ (idct_algo == FF_IDCT_AUTO || idct_algo == FF_IDCT_MMI)) {
c->idct_put= ff_mmi_idct_put;
c->idct_add= ff_mmi_idct_add;
c->idct = ff_mmi_idct;
diff --git a/libavcodec/ps2/idct_mmi.c b/libavcodec/mips/idct_mmi.c
index 9b9033ae44..9b9033ae44 100644
--- a/libavcodec/ps2/idct_mmi.c
+++ b/libavcodec/mips/idct_mmi.c
diff --git a/libavcodec/ps2/mmi.h b/libavcodec/mips/mmi.h
index cbd0921946..48f2778809 100644
--- a/libavcodec/ps2/mmi.h
+++ b/libavcodec/mips/mmi.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCODEC_PS2_MMI_H
-#define AVCODEC_PS2_MMI_H
+#ifndef AVCODEC_MIPS_MMI_H
+#define AVCODEC_MIPS_MMI_H
#include <stdint.h>
@@ -176,4 +176,4 @@ void ff_mmi_idct(DCTELEM *block);
#define pextlb(rs, rt, rd) \
__asm__ volatile ("pextlb " #rd ", " #rs ", " #rt )
-#endif /* AVCODEC_PS2_MMI_H */
+#endif /* AVCODEC_MIPS_MMI_H */
diff --git a/libavcodec/ps2/mpegvideo_mmi.c b/libavcodec/mips/mpegvideo_mmi.c
index 623e35af33..623e35af33 100644
--- a/libavcodec/ps2/mpegvideo_mmi.c
+++ b/libavcodec/mips/mpegvideo_mmi.c
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 04fb1b404b..81e910cb7e 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -214,7 +214,7 @@ static const AVOption options[]={
{"simple", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLE }, INT_MIN, INT_MAX, V|E|D, "idct"},
{"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"},
{"libmpeg2mmx", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_LIBMPEG2MMX }, INT_MIN, INT_MAX, V|E|D, "idct"},
-{"ps2", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_PS2 }, INT_MIN, INT_MAX, V|E|D, "idct"},
+{"mmi", NULL, 0, AV_OPT_TYPE_CONST, { .dbl = FF_IDCT_MMI }, INT_MIN, INT_MAX, V|E|D, "idct"},
{"arm", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_ARM }, INT_MIN, INT_MAX, V|E|D, "idct"},
{"altivec", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_ALTIVEC }, INT_MIN, INT_MAX, V|E|D, "idct"},
{"sh4", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SH4 }, INT_MIN, INT_MAX, V|E|D, "idct"},