| @@ -47,6 +47,7 @@ | |||||
| #include "faanidct.h" | #include "faanidct.h" | ||||
| #include "x86/fdct.h" | #include "x86/fdct.h" | ||||
| #include "x86/idct_xvid.h" | #include "x86/idct_xvid.h" | ||||
| #include "x86/simple_idct.h" | |||||
| #include "dctref.h" | #include "dctref.h" | ||||
| // ALTIVEC | // ALTIVEC | ||||
| @@ -44,10 +44,6 @@ void ff_simple_idct_10(int16_t *block); | |||||
| */ | */ | ||||
| void ff_prores_idct(int16_t *block, const int16_t *qmat); | void ff_prores_idct(int16_t *block, const int16_t *qmat); | ||||
| void ff_simple_idct_mmx(int16_t *block); | |||||
| void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block); | |||||
| void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block); | |||||
| void ff_simple_idct248_put(uint8_t *dest, int line_size, int16_t *block); | void ff_simple_idct248_put(uint8_t *dest, int line_size, int16_t *block); | ||||
| void ff_simple_idct84_add(uint8_t *dest, int line_size, int16_t *block); | void ff_simple_idct84_add(uint8_t *dest, int line_size, int16_t *block); | ||||
| @@ -22,9 +22,9 @@ | |||||
| #include "libavutil/x86/cpu.h" | #include "libavutil/x86/cpu.h" | ||||
| #include "libavcodec/avcodec.h" | #include "libavcodec/avcodec.h" | ||||
| #include "libavcodec/idctdsp.h" | #include "libavcodec/idctdsp.h" | ||||
| #include "libavcodec/simple_idct.h" | |||||
| #include "idct_xvid.h" | #include "idct_xvid.h" | ||||
| #include "idctdsp.h" | #include "idctdsp.h" | ||||
| #include "simple_idct.h" | |||||
| /* Input permutation for the simple_idct_mmx */ | /* Input permutation for the simple_idct_mmx */ | ||||
| static const uint8_t simple_mmx_permutation[64] = { | static const uint8_t simple_mmx_permutation[64] = { | ||||
| @@ -19,11 +19,12 @@ | |||||
| * License along with Libav; if not, write to the Free Software | * License along with Libav; if not, write to the Free Software | ||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #include "libavcodec/simple_idct.h" | |||||
| #include "libavutil/internal.h" | #include "libavutil/internal.h" | ||||
| #include "libavutil/mem.h" | #include "libavutil/mem.h" | ||||
| #include "libavutil/x86/asm.h" | #include "libavutil/x86/asm.h" | ||||
| #include "idctdsp.h" | #include "idctdsp.h" | ||||
| #include "simple_idct.h" | |||||
| #if HAVE_INLINE_ASM | #if HAVE_INLINE_ASM | ||||
| @@ -0,0 +1,28 @@ | |||||
| /* | |||||
| * 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_SIMPLE_IDCT_H | |||||
| #define AVCODEC_X86_SIMPLE_IDCT_H | |||||
| #include <stdint.h> | |||||
| void ff_simple_idct_mmx(int16_t *block); | |||||
| void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block); | |||||
| void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block); | |||||
| #endif /* AVCODEC_X86_SIMPLE_IDCT_H */ | |||||