ref: 9dfa76f94877db19e70ae846eef4a20bfb2481e8
parent: 5c95fd921e0d6204f132021e8d86bde8596f107d
author: James Zern <jzern@google.com>
date: Fri Sep 8 14:57:08 EDT 2017
vpx_mem: make vpx_memset16 inline Change-Id: Ibb2cab930c95836e6d6e66300c33e7d08e4474d4
--- a/vpx_mem/vpx_mem.c
+++ b/vpx_mem/vpx_mem.c
@@ -82,12 +82,3 @@
free(addr);
}
}
-
-#if CONFIG_VP9_HIGHBITDEPTH
-void *vpx_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;
-}
-#endif // CONFIG_VP9_HIGHBITDEPTH
--- a/vpx_mem/vpx_mem.h
+++ b/vpx_mem/vpx_mem.h
@@ -19,6 +19,8 @@
#include <stdlib.h>
#include <stddef.h>
+#include "vpx/vpx_integer.h"
+
#if defined(__cplusplus)
extern "C" {
#endif
@@ -29,7 +31,12 @@
void vpx_free(void *memblk);
#if CONFIG_VP9_HIGHBITDEPTH
-void *vpx_memset16(void *dest, int val, size_t length);
+static INLINE void *vpx_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;
+}
#endif
#include <string.h>