summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2017-02-08 09:32:17 +0100
committerAnton Khirnov <anton@khirnov.net>2017-02-11 11:37:45 +0100
commite6bff23f1e11aefb16a2b5d6ee72bf7469c5a66e (patch)
treea5093654857657901adc9792b40a93a974e5be50 /libavutil
parent5c8a5765dc5f4e29afb85b95be393c30f45412a8 (diff)
cpu: add a function for querying maximum required data alignment
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/cpu.c13
-rw-r--r--libavutil/cpu.h13
-rw-r--r--libavutil/version.h2
3 files changed, 27 insertions, 1 deletions
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index 0109c9e8d1..5aef6af217 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <stddef.h>
#include <stdint.h>
#include <stdatomic.h>
@@ -180,3 +181,15 @@ int av_cpu_count(void)
return nb_cpus;
}
+
+size_t av_cpu_max_align(void)
+{
+ int flags = av_get_cpu_flags();
+
+ if (flags & AV_CPU_FLAG_AVX)
+ return 32;
+ if (flags & (AV_CPU_FLAG_ALTIVEC | AV_CPU_FLAG_SSE | AV_CPU_FLAG_NEON))
+ return 16;
+
+ return 8;
+}
diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index c205ee16f6..4dcde27dbe 100644
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -21,6 +21,8 @@
#ifndef AVUTIL_CPU_H
#define AVUTIL_CPU_H
+#include <stddef.h>
+
#include "version.h"
#define AV_CPU_FLAG_FORCE 0x80000000 /* force usage of selected flags (OR) */
@@ -88,4 +90,15 @@ int av_parse_cpu_flags(const char *s);
*/
int av_cpu_count(void);
+/**
+ * Get the maximum data alignment that may be required by Libav.
+ *
+ * Note that this is affected by the build configuration and the CPU flags mask,
+ * so e.g. if the CPU supports AVX, but libavutil has been built with
+ * --disable-avx or the AV_CPU_FLAG_AVX flag has been disabled through
+ * av_set_cpu_flags_mask(), then this function will behave as if AVX is not
+ * present.
+ */
+size_t av_cpu_max_align(void);
+
#endif /* AVUTIL_CPU_H */
diff --git a/libavutil/version.h b/libavutil/version.h
index 7856a0acc3..0fcd19a1eb 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -54,7 +54,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 55
-#define LIBAVUTIL_VERSION_MINOR 30
+#define LIBAVUTIL_VERSION_MINOR 31
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \