Module: libav
Branch: master
Commit: ad52eef997dce374b4c7f3d1cdedf382935fea5e
Author: James Almer <jamr...@gmail.com>
Committer: Vittorio Giovara <vittorio.giov...@gmail.com>
Date: Thu Apr 20 11:40:48 2017 -0400
spherical: add functions to retrieve and request projection names
Signed-off-by: James Almer <jamr...@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com>
---
doc/APIchanges | 3 +++
libavutil/spherical.c | 28 ++++++++++++++++++++++++++++
libavutil/spherical.h | 18 ++++++++++++++++++
libavutil/version.h | 2 +-
4 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 58d59dd..34d788a 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2017-03-23
API changes, most recent first:
+2017-04-xx - xxxxxxx - lavu 56.1.0 - spherical.h
+ Add av_spherical_projection_name() and av_spherical_from_name().
+
2017-04-26 - xxxxxxx - lavc 58.3.1 - avcodec.h
Add AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH.
diff --git a/libavutil/spherical.c b/libavutil/spherical.c
index f5accc4..b37db93 100644
--- a/libavutil/spherical.c
+++ b/libavutil/spherical.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "common.h"
#include "mem.h"
#include "spherical.h"
@@ -50,3 +51,30 @@ void av_spherical_tile_bounds(AVSphericalMapping *map,
*right = orig_width - width - *left;
*bottom = orig_height - height - *top;
}
+
+static const char *spherical_projection_names[] = {
+ [AV_SPHERICAL_EQUIRECTANGULAR] = "equirectangular",
+ [AV_SPHERICAL_CUBEMAP] = "cubemap",
+ [AV_SPHERICAL_EQUIRECTANGULAR_TILE] = "tiled equirectangular",
+};
+
+const char *av_spherical_projection_name(enum AVSphericalProjection projection)
+{
+ if ((unsigned) projection >= FF_ARRAY_ELEMS(spherical_projection_names))
+ return "unknown";
+
+ return spherical_projection_names[projection];
+}
+
+int av_spherical_from_name(const char *name)
+{
+ int i;
+
+ for (i = 0; i < FF_ARRAY_ELEMS(spherical_projection_names); i++) {
+ size_t len = strlen(spherical_projection_names[i]);
+ if (!strncmp(spherical_projection_names[i], name, len))
+ return i;
+ }
+
+ return AVERROR(EINVAL);
+}
diff --git a/libavutil/spherical.h b/libavutil/spherical.h
index fd662cf..51ef224 100644
--- a/libavutil/spherical.h
+++ b/libavutil/spherical.h
@@ -206,6 +206,24 @@ void av_spherical_tile_bounds(AVSphericalMapping *map,
size_t width, size_t height,
size_t *left, size_t *top,
size_t *right, size_t *bottom);
+
+/**
+ * Provide a human-readable name of a given AVSphericalProjection.
+ *
+ * @param projection The input AVSphericalProjection.
+ *
+ * @return The name of the AVSphericalProjection, or "unknown".
+ */
+const char *av_spherical_projection_name(enum AVSphericalProjection
projection);
+
+/**
+ * Get the AVSphericalProjection form a human-readable name.
+ *
+ * @param name The input string.
+ *
+ * @return The AVSphericalProjection value, or AVERROR if not found.
+ */
+int av_spherical_from_name(const char *name);
/**
* @}
* @}
diff --git a/libavutil/version.h b/libavutil/version.h
index b8425ea..fd72ff4 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -54,7 +54,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 56
-#define LIBAVUTIL_VERSION_MINOR 0
+#define LIBAVUTIL_VERSION_MINOR 1
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
