From d4bdd0473d6f43132257c9fb3848d829755167a3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 5 Nov 2012 17:02:04 +0100 Subject: Rename directories, move files (step 1 of 2) (does not compile) Tis drops the silly lib prefixes, and attempts to organize the tree in a more logical way. Make the top-level directory less cluttered as well. Renames the following directories: libaf -> audio/filter libao2 -> audio/out libvo -> video/out libmpdemux -> demux Split libmpcodecs: vf* -> video/filter vd*, dec_video.* -> video/decode mp_image*, img_format*, ... -> video/ ad*, dec_audio.* -> audio/decode libaf/format.* is moved to audio/ - this is similar to how mp_image.* is located in video/. Move most top-level .c/.h files to core. (talloc.c/.h is left on top- level, because it's external.) Park some of the more annoying files in compat/. Some of these are relicts from the time mplayer used ffmpeg internals. sub/ is not split, because it's too much of a mess (subtitle code is mixed with OSD display and rendering). Maybe the organization of core is not ideal: it mixes playback core (like mplayer.c) and utility helpers (like bstr.c/h). Should the need arise, the playback core will be moved somewhere else, while core contains all helper and common code. --- compat/libav.h | 39 +++++++++++++++++++++++++++++ compat/mangle.h | 46 ++++++++++++++++++++++++++++++++++ compat/mpbswap.h | 32 ++++++++++++++++++++++++ compat/x86_cpu.h | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 193 insertions(+) create mode 100644 compat/libav.h create mode 100644 compat/mangle.h create mode 100644 compat/mpbswap.h create mode 100644 compat/x86_cpu.h (limited to 'compat') diff --git a/compat/libav.h b/compat/libav.h new file mode 100644 index 0000000000..ec6570f0f0 --- /dev/null +++ b/compat/libav.h @@ -0,0 +1,39 @@ +/* + * This file is part of mpv. + * + * mpv is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPV_LIBAV_COMPAT_H +#define MPV_LIBAV_COMPAT_H + +#include +#include +#include +#include + +#ifndef AV_CPU_FLAG_MMX2 +#define AV_CPU_FLAG_MMX2 AV_CPU_FLAG_MMXEXT +#endif + +#if LIBAVUTIL_VERSION_MICRO < 100 +#define AV_CODEC_ID_SUBRIP CODEC_ID_TEXT +#endif + +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0) +#define avcodec_free_frame av_freep +#endif + +#endif /* MPV_LIBAV_COMPAT_H */ diff --git a/compat/mangle.h b/compat/mangle.h new file mode 100644 index 0000000000..1769a3201f --- /dev/null +++ b/compat/mangle.h @@ -0,0 +1,46 @@ +/* + * CPP macros to deal with different symbol mangling across binary formats. + * + * Copyright (C) 2002 Felix Buenemann + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_MANGLE_H +#define MPLAYER_MANGLE_H + +#include "config.h" + +#if (__GNUC__ * 100 + __GNUC_MINOR__ >= 300) +#define attribute_used __attribute__((used)) +#else +#define attribute_used +#endif + +#if defined(_WIN32) || defined(__APPLE__) +#define EXTERN_PREFIX "_" +#else +#define EXTERN_PREFIX "" +#endif + +#if ARCH_X86_64 && defined(PIC) +#define MANGLE(a) EXTERN_PREFIX #a "(%%rip)" +#else +#define MANGLE(a) EXTERN_PREFIX #a +#endif + +#endif /* MPLAYER_MANGLE_H */ diff --git a/compat/mpbswap.h b/compat/mpbswap.h new file mode 100644 index 0000000000..f75c8b86c8 --- /dev/null +++ b/compat/mpbswap.h @@ -0,0 +1,32 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_MPBSWAP_H +#define MPLAYER_MPBSWAP_H + +#include + +#define bswap_16(x) av_bswap16(x) +#define bswap_32(x) av_bswap32(x) +#define be2me_16(x) av_be2ne16(x) +#define be2me_32(x) av_be2ne32(x) +#define le2me_16(x) av_le2ne16(x) +#define le2me_32(x) av_le2ne32(x) +#define le2me_64(x) av_le2ne64(x) + +#endif /* MPLAYER_MPBSWAP_H */ diff --git a/compat/x86_cpu.h b/compat/x86_cpu.h new file mode 100644 index 0000000000..49a5b28a35 --- /dev/null +++ b/compat/x86_cpu.h @@ -0,0 +1,76 @@ +/* + * copyright (c) 2006 Michael Niedermayer + * + * 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_X86_CPU_H +#define MP_AVUTIL_X86_CPU_H + +#include +#include "config.h" + +#if ARCH_X86_64 +# define REG_a "rax" +# define REG_b "rbx" +# define REG_c "rcx" +# define REG_d "rdx" +# define REG_D "rdi" +# define REG_S "rsi" +# define PTR_SIZE "8" +typedef int64_t x86_reg; + +# define REG_SP "rsp" +# define REG_BP "rbp" +# define REGBP rbp +# define REGa rax +# define REGb rbx +# define REGc rcx +# define REGd rdx +# define REGSP rsp + +#elif ARCH_X86_32 + +# define REG_a "eax" +# define REG_b "ebx" +# define REG_c "ecx" +# define REG_d "edx" +# define REG_D "edi" +# define REG_S "esi" +# define PTR_SIZE "4" +typedef int32_t x86_reg; + +# define REG_SP "esp" +# define REG_BP "ebp" +# define REGBP ebp +# define REGa eax +# define REGb ebx +# define REGc ecx +# define REGd edx +# define REGSP esp +#else +typedef int x86_reg; +#endif + +#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE)) +#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE)) + +#if ARCH_X86_64 && defined(PIC) +# define BROKEN_RELOCATIONS 1 +#endif + +#endif /* AVUTIL_X86_CPU_H */ -- cgit v1.2.3