diff options
author | wm4 <wm4@nowhere> | 2012-11-05 17:02:04 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-12 20:06:14 +0100 |
commit | d4bdd0473d6f43132257c9fb3848d829755167a3 (patch) | |
tree | 8021c2f7da1841393c8c832105e20cd527826d6c /libvo/fastmemcpy.h | |
parent | bd48deba77bd5582c5829d6fe73a7d2571088aba (diff) | |
download | mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.bz2 mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.xz |
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.
Diffstat (limited to 'libvo/fastmemcpy.h')
-rw-r--r-- | libvo/fastmemcpy.h | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h deleted file mode 100644 index c2cd79314f..0000000000 --- a/libvo/fastmemcpy.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer 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. - * - * 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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_FASTMEMCPY_H -#define MPLAYER_FASTMEMCPY_H - -#include "config.h" -#include <inttypes.h> -#include <string.h> -#include <stddef.h> - -#define memcpy_pic(d, s, b, h, ds, ss) memcpy_pic2(d, s, b, h, ds, ss, 0) -#define my_memcpy_pic(d, s, b, h, ds, ss) memcpy_pic2(d, s, b, h, ds, ss, 1) - -/** - * \param limit2width always skip data between end of line and start of next - * instead of copying the full block when strides are the same - */ -static inline void * memcpy_pic2(void * dst, const void * src, - int bytesPerLine, int height, - int dstStride, int srcStride, int limit2width) -{ - int i; - void *retval=dst; - - if(!limit2width && dstStride == srcStride) - { - if (srcStride < 0) { - src = (uint8_t*)src + (height-1)*srcStride; - dst = (uint8_t*)dst + (height-1)*dstStride; - srcStride = -srcStride; - } - - memcpy(dst, src, srcStride*height); - } - else - { - for(i=0; i<height; i++) - { - memcpy(dst, src, bytesPerLine); - src = (uint8_t*)src + srcStride; - dst = (uint8_t*)dst + dstStride; - } - } - - return retval; -} - -static inline void memset_pic(void *dst, int fill, int bytesPerLine, int height, - int stride) -{ - if (bytesPerLine == stride) { - memset(dst, fill, stride * height); - } else { - for (int i = 0; i < height; i++) { - memset(dst, fill, bytesPerLine); - dst = (uint8_t *)dst + stride; - } - } -} - -#endif /* MPLAYER_FASTMEMCPY_H */ |