diff options
Diffstat (limited to 'third_party/aom/aom_mem')
| -rw-r--r-- | third_party/aom/aom_mem/aom_mem.c | 84 | ||||
| -rw-r--r-- | third_party/aom/aom_mem/aom_mem.cmake | 26 | ||||
| -rw-r--r-- | third_party/aom/aom_mem/aom_mem.h | 70 | ||||
| -rw-r--r-- | third_party/aom/aom_mem/include/aom_mem_intrnl.h | 33 |
4 files changed, 0 insertions, 213 deletions
diff --git a/third_party/aom/aom_mem/aom_mem.c b/third_party/aom/aom_mem/aom_mem.c deleted file mode 100644 index e603fc5bf..000000000 --- a/third_party/aom/aom_mem/aom_mem.c +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2016, Alliance for Open Media. All rights reserved - * - * This source code is subject to the terms of the BSD 2 Clause License and - * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License - * was not distributed with this source code in the LICENSE file, you can - * obtain it at www.aomedia.org/license/software. If the Alliance for Open - * Media Patent License 1.0 was not distributed with this source code in the - * PATENTS file, you can obtain it at www.aomedia.org/license/patent. - */ - -#include "aom_mem.h" -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include "include/aom_mem_intrnl.h" -#include "aom/aom_integer.h" - -#if defined(AOM_MAX_ALLOCABLE_MEMORY) -// Returns 0 in case of overflow of nmemb * size. -static int check_size_argument_overflow(uint64_t nmemb, uint64_t size) { - const uint64_t total_size = nmemb * size; - if (nmemb == 0) return 1; - if (size > AOM_MAX_ALLOCABLE_MEMORY / nmemb) return 0; - if (total_size != (size_t)total_size) return 0; - return 1; -} -#endif - -static size_t GetAlignedMallocSize(size_t size, size_t align) { - return size + align - 1 + ADDRESS_STORAGE_SIZE; -} - -static size_t *GetMallocAddressLocation(void *const mem) { - return ((size_t *)mem) - 1; -} - -static void SetActualMallocAddress(void *const mem, - const void *const malloc_addr) { - size_t *const malloc_addr_location = GetMallocAddressLocation(mem); - *malloc_addr_location = (size_t)malloc_addr; -} - -static void *GetActualMallocAddress(void *const mem) { - const size_t *const malloc_addr_location = GetMallocAddressLocation(mem); - return (void *)(*malloc_addr_location); -} - -void *aom_memalign(size_t align, size_t size) { - void *x = NULL; - const size_t aligned_size = GetAlignedMallocSize(size, align); -#if defined(AOM_MAX_ALLOCABLE_MEMORY) - if (!check_size_argument_overflow(1, aligned_size)) return NULL; -#endif - void *const addr = malloc(aligned_size); - if (addr) { - x = align_addr((unsigned char *)addr + ADDRESS_STORAGE_SIZE, align); - SetActualMallocAddress(x, addr); - } - return x; -} - -void *aom_malloc(size_t size) { return aom_memalign(DEFAULT_ALIGNMENT, size); } - -void *aom_calloc(size_t num, size_t size) { - const size_t total_size = num * size; - void *const x = aom_malloc(total_size); - if (x) memset(x, 0, total_size); - return x; -} - -void aom_free(void *memblk) { - if (memblk) { - void *addr = GetActualMallocAddress(memblk); - free(addr); - } -} - -void *aom_memset16(void *dest, int val, size_t length) { - size_t i; - uint16_t *dest16 = (uint16_t *)dest; - for (i = 0; i < length; i++) *dest16++ = val; - return dest; -} diff --git a/third_party/aom/aom_mem/aom_mem.cmake b/third_party/aom/aom_mem/aom_mem.cmake deleted file mode 100644 index eaee8440b..000000000 --- a/third_party/aom/aom_mem/aom_mem.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (c) 2017, Alliance for Open Media. All rights reserved -# -# This source code is subject to the terms of the BSD 2 Clause License and the -# Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License was -# not distributed with this source code in the LICENSE file, you can obtain it -# at www.aomedia.org/license/software. If the Alliance for Open Media Patent -# License 1.0 was not distributed with this source code in the PATENTS file, you -# can obtain it at www.aomedia.org/license/patent. -# -if(AOM_AOM_MEM_AOM_MEM_CMAKE_) - return() -endif() # AOM_AOM_MEM_AOM_MEM_CMAKE_ -set(AOM_AOM_MEM_AOM_MEM_CMAKE_ 1) - -list(APPEND AOM_MEM_SOURCES "${AOM_ROOT}/aom_mem/aom_mem.c" - "${AOM_ROOT}/aom_mem/aom_mem.h" - "${AOM_ROOT}/aom_mem/include/aom_mem_intrnl.h") - -# Creates the aom_mem build target and makes libaom depend on it. The libaom -# target must exist before this function is called. -function(setup_aom_mem_targets) - add_library(aom_mem OBJECT ${AOM_MEM_SOURCES}) - set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_mem PARENT_SCOPE) - target_sources(aom PRIVATE $<TARGET_OBJECTS:aom_mem>) -endfunction() diff --git a/third_party/aom/aom_mem/aom_mem.h b/third_party/aom/aom_mem/aom_mem.h deleted file mode 100644 index 4b1fa45f1..000000000 --- a/third_party/aom/aom_mem/aom_mem.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2016, Alliance for Open Media. All rights reserved - * - * This source code is subject to the terms of the BSD 2 Clause License and - * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License - * was not distributed with this source code in the LICENSE file, you can - * obtain it at www.aomedia.org/license/software. If the Alliance for Open - * Media Patent License 1.0 was not distributed with this source code in the - * PATENTS file, you can obtain it at www.aomedia.org/license/patent. - */ - -#ifndef AOM_AOM_MEM_AOM_MEM_H_ -#define AOM_AOM_MEM_AOM_MEM_H_ - -#include "aom/aom_integer.h" -#include "config/aom_config.h" - -#if defined(__uClinux__) -#include <lddk.h> -#endif - -#if defined(__cplusplus) -extern "C" { -#endif - -#ifndef AOM_MAX_ALLOCABLE_MEMORY -#if SIZE_MAX > (1ULL << 32) -#define AOM_MAX_ALLOCABLE_MEMORY 8589934592 // 8 GB -#else -// For 32-bit targets keep this below INT_MAX to avoid valgrind warnings. -#define AOM_MAX_ALLOCABLE_MEMORY ((1ULL << 31) - (1 << 16)) -#endif -#endif - -void *aom_memalign(size_t align, size_t size); -void *aom_malloc(size_t size); -void *aom_calloc(size_t num, size_t size); -void aom_free(void *memblk); -void *aom_memset16(void *dest, int val, size_t length); - -#include <string.h> - -#ifdef AOM_MEM_PLTFRM -#include AOM_MEM_PLTFRM -#endif - -#if CONFIG_DEBUG -#define AOM_CHECK_MEM_ERROR(error_info, lval, expr) \ - do { \ - lval = (expr); \ - if (!lval) \ - aom_internal_error(error_info, AOM_CODEC_MEM_ERROR, \ - "Failed to allocate " #lval " at %s:%d", __FILE__, \ - __LINE__); \ - } while (0) -#else -#define AOM_CHECK_MEM_ERROR(error_info, lval, expr) \ - do { \ - lval = (expr); \ - if (!lval) \ - aom_internal_error(error_info, AOM_CODEC_MEM_ERROR, \ - "Failed to allocate " #lval); \ - } while (0) -#endif - -#if defined(__cplusplus) -} -#endif - -#endif // AOM_AOM_MEM_AOM_MEM_H_ diff --git a/third_party/aom/aom_mem/include/aom_mem_intrnl.h b/third_party/aom/aom_mem/include/aom_mem_intrnl.h deleted file mode 100644 index cbc30a9bb..000000000 --- a/third_party/aom/aom_mem/include/aom_mem_intrnl.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016, Alliance for Open Media. All rights reserved - * - * This source code is subject to the terms of the BSD 2 Clause License and - * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License - * was not distributed with this source code in the LICENSE file, you can - * obtain it at www.aomedia.org/license/software. If the Alliance for Open - * Media Patent License 1.0 was not distributed with this source code in the - * PATENTS file, you can obtain it at www.aomedia.org/license/patent. - */ - -#ifndef AOM_AOM_MEM_INCLUDE_AOM_MEM_INTRNL_H_ -#define AOM_AOM_MEM_INCLUDE_AOM_MEM_INTRNL_H_ - -#include "config/aom_config.h" - -#define ADDRESS_STORAGE_SIZE sizeof(size_t) - -#ifndef DEFAULT_ALIGNMENT -#if defined(VXWORKS) -/*default addr alignment to use in calls to aom_* functions other than - aom_memalign*/ -#define DEFAULT_ALIGNMENT 32 -#else -#define DEFAULT_ALIGNMENT (2 * sizeof(void *)) /* NOLINT */ -#endif -#endif - -/*returns an addr aligned to the byte boundary specified by align*/ -#define align_addr(addr, align) \ - (void *)(((size_t)(addr) + ((align)-1)) & ~(size_t)((align)-1)) - -#endif // AOM_AOM_MEM_INCLUDE_AOM_MEM_INTRNL_H_ |