diff options
| author | Boyuan Yang <byang@debian.org> | 2021-11-07 08:50:20 -0500 |
|---|---|---|
| committer | Boyuan Yang <byang@debian.org> | 2021-11-07 08:50:20 -0500 |
| commit | 513fcf1cd0dca1a6cbef9ff6e38e22237e75ba44 (patch) | |
| tree | 249280ac94eb2b871de89cd1b166fff4ee00ab09 /src/utils/memory.h | |
| parent | 3c21ceac2f6a5adfab07d3d458880561543d0a31 (diff) | |
| parent | 320ef65362608ee1148c299d8d5d7618af34e470 (diff) | |
| download | libgav1-513fcf1cd0dca1a6cbef9ff6e38e22237e75ba44.tar.gz libgav1-513fcf1cd0dca1a6cbef9ff6e38e22237e75ba44.tar.bz2 libgav1-513fcf1cd0dca1a6cbef9ff6e38e22237e75ba44.zip | |
Update upstream source from tag 'upstream/0.17.0'
Update to upstream version '0.17.0'
with Debian dir 5b612b6a2d67788b0c85bac59e50edc1545bfd7e
Diffstat (limited to 'src/utils/memory.h')
| -rw-r--r-- | src/utils/memory.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/utils/memory.h b/src/utils/memory.h index a8da53b..d1762a2 100644 --- a/src/utils/memory.h +++ b/src/utils/memory.h @@ -17,7 +17,7 @@ #ifndef LIBGAV1_SRC_UTILS_MEMORY_H_ #define LIBGAV1_SRC_UTILS_MEMORY_H_ -#if defined(__ANDROID__) || defined(_MSC_VER) +#if defined(__ANDROID__) || defined(_MSC_VER) || defined(__MINGW32__) #include <malloc.h> #endif @@ -55,7 +55,7 @@ enum { // void AlignedFree(void* aligned_memory); // Free aligned memory. -#if defined(_MSC_VER) // MSVC +#if defined(_MSC_VER) || defined(__MINGW32__) inline void* AlignedAlloc(size_t alignment, size_t size) { return _aligned_malloc(size, alignment); @@ -63,7 +63,7 @@ inline void* AlignedAlloc(size_t alignment, size_t size) { inline void AlignedFree(void* aligned_memory) { _aligned_free(aligned_memory); } -#else // !defined(_MSC_VER) +#else // !(defined(_MSC_VER) || defined(__MINGW32__)) inline void* AlignedAlloc(size_t alignment, size_t size) { #if defined(__ANDROID__) @@ -89,7 +89,7 @@ inline void* AlignedAlloc(size_t alignment, size_t size) { inline void AlignedFree(void* aligned_memory) { free(aligned_memory); } -#endif // defined(_MSC_VER) +#endif // defined(_MSC_VER) || defined(__MINGW32__) inline void Memset(uint8_t* const dst, int value, size_t count) { memset(dst, value, count); @@ -101,6 +101,12 @@ inline void Memset(uint16_t* const dst, int value, size_t count) { } } +inline void Memset(int16_t* const dst, int value, size_t count) { + for (size_t i = 0; i < count; ++i) { + dst[i] = static_cast<int16_t>(value); + } +} + struct MallocDeleter { void operator()(void* ptr) const { free(ptr); } }; |