summaryrefslogtreecommitdiffstats
path: root/ffmpeg_files/x86
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-22 01:52:09 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-26 06:15:30 +0300
commita009d56d4d9672e88660bc7e1d179bbbdfb7b35a (patch)
tree3852711d9077c630e9090b7eb0215cbd352aee81 /ffmpeg_files/x86
parent97bd0624df0e2f7acaca708258eb7627fabf6d02 (diff)
downloadmpv-a009d56d4d9672e88660bc7e1d179bbbdfb7b35a.tar.bz2
mpv-a009d56d4d9672e88660bc7e1d179bbbdfb7b35a.tar.xz
Add copies of needed internal FFmpeg files under ffmpeg_files/
MPlayer used to depend on having an FFmpeg tree available at build time to provide this code, and FFmpeg changes occasionally broke the MPlayer build as a result. Some of the relevant functionality also depends on FFmpeg library symbols that are not part of the FFmpeg API, meaning that library changes could break MPlayer after the build. Add a copy of the relevant functionality to the MPlayer tree and use that instead. The added files are: - The headers bswap.h, intreadwrite.h and x86_cpu.h from libavutil. Some MPlayer code uses the functionality defined as macros and static inline functions in these headers. - Architecture-specific internal files used by the above headers. These are in the subdirectories: x86/, arm/, bfin/, sh4/. - taglists.[ch], which provides the codec tables from libavformat/riff.c and two functions to access them from libavformat/utils.c. Most of the headers are copied from FFmpeg revision 19452 with only the include guard names changed. A "common.h" include in bswap.h was changed to "libavutil/common.h" as it should use the installed header. Taglists.c contains snippets from the relevant files with some changes like renamed identifiers.
Diffstat (limited to 'ffmpeg_files/x86')
-rw-r--r--ffmpeg_files/x86/bswap.h61
1 files changed, 61 insertions, 0 deletions
diff --git a/ffmpeg_files/x86/bswap.h b/ffmpeg_files/x86/bswap.h
new file mode 100644
index 0000000000..62238d178a
--- /dev/null
+++ b/ffmpeg_files/x86/bswap.h
@@ -0,0 +1,61 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file libavutil/x86/bswap.h
+ * byte swapping routines
+ */
+
+#ifndef MP_AVUTIL_X86_BSWAP_H
+#define MP_AVUTIL_X86_BSWAP_H
+
+#include <stdint.h>
+#include "config.h"
+#include "libavutil/common.h"
+
+#define bswap_16 bswap_16
+static av_always_inline av_const uint16_t bswap_16(uint16_t x)
+{
+ __asm__("rorw $8, %0" : "+r"(x));
+ return x;
+}
+
+#define bswap_32 bswap_32
+static av_always_inline av_const uint32_t bswap_32(uint32_t x)
+{
+#if HAVE_BSWAP
+ __asm__("bswap %0" : "+r" (x));
+#else
+ __asm__("rorw $8, %w0 \n\t"
+ "rorl $16, %0 \n\t"
+ "rorw $8, %w0"
+ : "+r"(x));
+#endif
+ return x;
+}
+
+#if ARCH_X86_64
+#define bswap_64 bswap_64
+static inline uint64_t av_const bswap_64(uint64_t x)
+{
+ __asm__("bswap %0": "=r" (x) : "0" (x));
+ return x;
+}
+#endif
+
+#endif /* AVUTIL_X86_BSWAP_H */