diff options
author | wm4 <wm4@nowhere> | 2015-03-20 00:21:23 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-03-20 00:21:23 +0100 |
commit | 5f2a8474aee2a0353a07a6a74a0312f5e5f5ef23 (patch) | |
tree | efbca333ddc28a1006b1507667e7b58008bd9eab /video/memcpy_pic.h | |
parent | 145922a0700b50ffb38f20957c28020562f8d428 (diff) | |
download | mpv-5f2a8474aee2a0353a07a6a74a0312f5e5f5ef23.tar.bz2 mpv-5f2a8474aee2a0353a07a6a74a0312f5e5f5ef23.tar.xz |
video: uninline memcpy_pic functions
There's literally no reason why these functions have to be inline (they
might be performance critical, but then the function call overhead isn't
going to matter at all).
Uninline them and move them to mp_image.c. Drop the header file and fix
all uses of it.
Diffstat (limited to 'video/memcpy_pic.h')
-rw-r--r-- | video/memcpy_pic.h | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/video/memcpy_pic.h b/video/memcpy_pic.h deleted file mode 100644 index 437324a048..0000000000 --- a/video/memcpy_pic.h +++ /dev/null @@ -1,76 +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 <inttypes.h> -#include <string.h> -#include <stddef.h> - -static inline void memcpy_pic(void *dst, const void *src, - int bytesPerLine, int height, - int dstStride, int srcStride) -{ - if (bytesPerLine == dstStride && 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 (int i = 0; i < height; i++) { - memcpy(dst, src, bytesPerLine); - src = (uint8_t*)src + srcStride; - dst = (uint8_t*)dst + dstStride; - } - } -} - -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; - } - } -} - -static inline void memset16_pic(void *dst, int fill, int unitsPerLine, - int height, int stride) -{ - if (fill == 0) { - memset_pic(dst, 0, unitsPerLine * 2, height, stride); - } else { - for (int i = 0; i < height; i++) { - uint16_t *line = dst; - uint16_t *end = line + unitsPerLine; - while (line < end) - *line++ = fill; - dst = (uint8_t *)dst + stride; - } - } -} - -#endif /* MPLAYER_FASTMEMCPY_H */ |