mirror of
https://github.com/mpv-player/mpv
synced 2024-11-14 22:48:35 +01: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.
104 lines
2.5 KiB
C
104 lines
2.5 KiB
C
/*
|
|
* copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
|
|
// This file in MPlayer is otherwise the same as in FFmpeg, except it
|
|
// includes "libavutil/common.h" instead of "common.h".
|
|
|
|
/**
|
|
* @file libavutil/bswap.h
|
|
* byte swapping routines
|
|
*/
|
|
|
|
#ifndef MP_AVUTIL_BSWAP_H
|
|
#define MP_AVUTIL_BSWAP_H
|
|
|
|
#include <stdint.h>
|
|
#include "libavutil/common.h"
|
|
#include "config.h"
|
|
|
|
#if ARCH_ARM
|
|
# include "arm/bswap.h"
|
|
#elif ARCH_BFIN
|
|
# include "bfin/bswap.h"
|
|
#elif ARCH_SH4
|
|
# include "sh4/bswap.h"
|
|
#elif ARCH_X86
|
|
# include "x86/bswap.h"
|
|
#endif
|
|
|
|
#ifndef bswap_16
|
|
static av_always_inline av_const uint16_t bswap_16(uint16_t x)
|
|
{
|
|
x= (x>>8) | (x<<8);
|
|
return x;
|
|
}
|
|
#endif
|
|
|
|
#ifndef bswap_32
|
|
static av_always_inline av_const uint32_t bswap_32(uint32_t x)
|
|
{
|
|
x= ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF);
|
|
x= (x>>16) | (x<<16);
|
|
return x;
|
|
}
|
|
#endif
|
|
|
|
#ifndef bswap_64
|
|
static inline uint64_t av_const bswap_64(uint64_t x)
|
|
{
|
|
#if 0
|
|
x= ((x<< 8)&0xFF00FF00FF00FF00ULL) | ((x>> 8)&0x00FF00FF00FF00FFULL);
|
|
x= ((x<<16)&0xFFFF0000FFFF0000ULL) | ((x>>16)&0x0000FFFF0000FFFFULL);
|
|
return (x>>32) | (x<<32);
|
|
#else
|
|
union {
|
|
uint64_t ll;
|
|
uint32_t l[2];
|
|
} w, r;
|
|
w.ll = x;
|
|
r.l[0] = bswap_32 (w.l[1]);
|
|
r.l[1] = bswap_32 (w.l[0]);
|
|
return r.ll;
|
|
#endif
|
|
}
|
|
#endif
|
|
|
|
// be2me ... big-endian to machine-endian
|
|
// le2me ... little-endian to machine-endian
|
|
|
|
#ifdef WORDS_BIGENDIAN
|
|
#define be2me_16(x) (x)
|
|
#define be2me_32(x) (x)
|
|
#define be2me_64(x) (x)
|
|
#define le2me_16(x) bswap_16(x)
|
|
#define le2me_32(x) bswap_32(x)
|
|
#define le2me_64(x) bswap_64(x)
|
|
#else
|
|
#define be2me_16(x) bswap_16(x)
|
|
#define be2me_32(x) bswap_32(x)
|
|
#define be2me_64(x) bswap_64(x)
|
|
#define le2me_16(x) (x)
|
|
#define le2me_32(x) (x)
|
|
#define le2me_64(x) (x)
|
|
#endif
|
|
|
|
#endif /* AVUTIL_BSWAP_H */
|