mirror of
https://github.com/mpv-player/mpv
synced 2024-12-21 06:14:32 +00:00
a009d56d4d
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.
73 lines
1.8 KiB
C
73 lines
1.8 KiB
C
/*
|
|
* 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
|
|
*/
|
|
|
|
#ifndef MP_AVUTIL_ARM_BSWAP_H
|
|
#define MP_AVUTIL_ARM_BSWAP_H
|
|
|
|
#include <stdint.h>
|
|
#include "config.h"
|
|
#include "libavutil/common.h"
|
|
|
|
#ifdef __ARMCC_VERSION
|
|
|
|
#if HAVE_ARMV6
|
|
#define bswap_16 bswap_16
|
|
static av_always_inline av_const uint16_t bswap_16(uint16_t x)
|
|
{
|
|
__asm { rev16 x, x }
|
|
return x;
|
|
}
|
|
|
|
#define bswap_32 bswap_32
|
|
static av_always_inline av_const uint32_t bswap_32(uint32_t x)
|
|
{
|
|
return __rev(x);
|
|
}
|
|
#endif /* HAVE_ARMV6 */
|
|
|
|
#elif HAVE_INLINE_ASM
|
|
|
|
#if HAVE_ARMV6
|
|
#define bswap_16 bswap_16
|
|
static av_always_inline av_const uint16_t bswap_16(uint16_t x)
|
|
{
|
|
__asm__("rev16 %0, %0" : "+r"(x));
|
|
return x;
|
|
}
|
|
#endif
|
|
|
|
#define bswap_32 bswap_32
|
|
static av_always_inline av_const uint32_t bswap_32(uint32_t x)
|
|
{
|
|
#if HAVE_ARMV6
|
|
__asm__("rev %0, %0" : "+r"(x));
|
|
#else
|
|
uint32_t t;
|
|
__asm__ ("eor %1, %0, %0, ror #16 \n\t"
|
|
"bic %1, %1, #0xFF0000 \n\t"
|
|
"mov %0, %0, ror #8 \n\t"
|
|
"eor %0, %0, %1, lsr #8 \n\t"
|
|
: "+r"(x), "=&r"(t));
|
|
#endif /* HAVE_ARMV6 */
|
|
return x;
|
|
}
|
|
|
|
#endif /* __ARMCC_VERSION */
|
|
|
|
#endif /* AVUTIL_ARM_BSWAP_H */
|