72889a2a60
CONFIG_VP9_HIGHBITDEPTH is currently used by both vp9 and vp10, but in many place outside vp9/vp10, the macro was used in conjunction of CONFIG_VP9. This created a dependency on vp9 for vp10 to build. This commit removes the dependency by use CONFIG_VP9_HIGHBITDEPTH only in these places. Change-Id: I8cc007fc9cf132394c6498ce6759e606b64a6ad0
104 lines
2.6 KiB
C
104 lines
2.6 KiB
C
/*
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
|
|
#define __VPX_MEM_C__
|
|
|
|
#include "vpx_mem.h"
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "include/vpx_mem_intrnl.h"
|
|
#include "vpx/vpx_integer.h"
|
|
|
|
void *vpx_memalign(size_t align, size_t size) {
|
|
void *addr,
|
|
* x = NULL;
|
|
|
|
addr = malloc(size + align - 1 + ADDRESS_STORAGE_SIZE);
|
|
|
|
if (addr) {
|
|
x = align_addr((unsigned char *)addr + ADDRESS_STORAGE_SIZE, (int)align);
|
|
/* save the actual malloc address */
|
|
((size_t *)x)[-1] = (size_t)addr;
|
|
}
|
|
|
|
return x;
|
|
}
|
|
|
|
void *vpx_malloc(size_t size) {
|
|
return vpx_memalign(DEFAULT_ALIGNMENT, size);
|
|
}
|
|
|
|
void *vpx_calloc(size_t num, size_t size) {
|
|
void *x;
|
|
|
|
x = vpx_memalign(DEFAULT_ALIGNMENT, num * size);
|
|
|
|
if (x)
|
|
memset(x, 0, num * size);
|
|
|
|
return x;
|
|
}
|
|
|
|
void *vpx_realloc(void *memblk, size_t size) {
|
|
void *addr,
|
|
* new_addr = NULL;
|
|
int align = DEFAULT_ALIGNMENT;
|
|
|
|
/*
|
|
The realloc() function changes the size of the object pointed to by
|
|
ptr to the size specified by size, and returns a pointer to the
|
|
possibly moved block. The contents are unchanged up to the lesser
|
|
of the new and old sizes. If ptr is null, realloc() behaves like
|
|
malloc() for the specified size. If size is zero (0) and ptr is
|
|
not a null pointer, the object pointed to is freed.
|
|
*/
|
|
if (!memblk)
|
|
new_addr = vpx_malloc(size);
|
|
else if (!size)
|
|
vpx_free(memblk);
|
|
else {
|
|
addr = (void *)(((size_t *)memblk)[-1]);
|
|
memblk = NULL;
|
|
|
|
new_addr = realloc(addr, size + align + ADDRESS_STORAGE_SIZE);
|
|
|
|
if (new_addr) {
|
|
addr = new_addr;
|
|
new_addr = (void *)(((size_t)
|
|
((unsigned char *)new_addr + ADDRESS_STORAGE_SIZE) + (align - 1)) &
|
|
(size_t) - align);
|
|
/* save the actual malloc address */
|
|
((size_t *)new_addr)[-1] = (size_t)addr;
|
|
}
|
|
}
|
|
|
|
return new_addr;
|
|
}
|
|
|
|
void vpx_free(void *memblk) {
|
|
if (memblk) {
|
|
void *addr = (void *)(((size_t *)memblk)[-1]);
|
|
free(addr);
|
|
}
|
|
}
|
|
|
|
#if CONFIG_VP9_HIGHBITDEPTH
|
|
void *vpx_memset16(void *dest, int val, size_t length) {
|
|
int i;
|
|
void *orig = dest;
|
|
uint16_t *dest16 = dest;
|
|
for (i = 0; i < length; i++)
|
|
*dest16++ = val;
|
|
return orig;
|
|
}
|
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|