virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

Move PS2 MMI code below the mips subdirectory, where it belongs.

Browse Source 
Also give a more suitable name to the MMI-optimized IDCT;
it is not PS2-specific, as the name currently suggests.
This commit is contained in:
Diego Biurrun 2012-02-07 15:06:09 +01:00
parent 75f11901b5
commit 0bf184e59c
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/Makefile
View File

@ -694,7 +694,7 @@ HOSTPROGS = aac_tablegen aacps_tablegen cbrt_tablegen cos_tablegen \
dv_tablegen motionpixels_tablegen mpegaudio_tablegen \ dv_tablegen motionpixels_tablegen mpegaudio_tablegen \
pcm_tablegen qdm2_tablegen sinewin_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) CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF)

2
libavcodec/avcodec.h
View File

@ -1729,7 +1729,7 @@ typedef struct AVCodecContext {
#define FF_IDCT_SIMPLE 2 #define FF_IDCT_SIMPLE 2
#define FF_IDCT_SIMPLEMMX 3 #define FF_IDCT_SIMPLEMMX 3
#define FF_IDCT_LIBMPEG2MMX 4 #define FF_IDCT_LIBMPEG2MMX 4
#define FF_IDCT_PS2 5 #define FF_IDCT_MMI 5
#define FF_IDCT_ARM 7 #define FF_IDCT_ARM 7
#define FF_IDCT_ALTIVEC 8 #define FF_IDCT_ALTIVEC 8
#define FF_IDCT_SH4 9 #define FF_IDCT_SH4 9

6
libavcodec/mips/Makefile
View File

@ -1,3 +1,3 @@
OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \ OBJS-$(HAVE_MMI) += mips/dsputil_mmi.o \
ps2/idct_mmi.o \ mips/idct_mmi.o \
ps2/mpegvideo_mmi.o \ mips/mpegvideo_mmi.o \

2
libavcodec/ps2/dsputil_mmi.c → libavcodec/mips/dsputil_mmi.c
View File

@ -153,7 +153,7 @@ void dsputil_init_mmi(DSPContext* c, AVCodecContext *avctx)
} }
if (avctx->bits_per_raw_sample <= 8 && 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_put= ff_mmi_idct_put;
c->idct_add= ff_mmi_idct_add; c->idct_add= ff_mmi_idct_add;
c->idct = ff_mmi_idct; c->idct = ff_mmi_idct;

0
libavcodec/ps2/idct_mmi.c → libavcodec/mips/idct_mmi.c
View File

6
libavcodec/ps2/mmi.h → libavcodec/mips/mmi.h
View File

@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef AVCODEC_PS2_MMI_H #ifndef AVCODEC_MIPS_MMI_H
#define AVCODEC_PS2_MMI_H #define AVCODEC_MIPS_MMI_H
#include <stdint.h> #include <stdint.h>
@ -176,4 +176,4 @@ void ff_mmi_idct(DCTELEM *block);
#define pextlb(rs, rt, rd) \ #define pextlb(rs, rt, rd) \
__asm__ volatile ("pextlb " #rd ", " #rs ", " #rt ) __asm__ volatile ("pextlb " #rd ", " #rs ", " #rt )
#endif /* AVCODEC_PS2_MMI_H */ #endif /* AVCODEC_MIPS_MMI_H */

0
libavcodec/ps2/mpegvideo_mmi.c → libavcodec/mips/mpegvideo_mmi.c
View File

2
libavcodec/options.c
View File

@ -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"}, {"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"}, {"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"}, {"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"}, {"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"}, {"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"}, {"sh4", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SH4 }, INT_MIN, INT_MAX, V|E|D, "idct"},