Re: [libav-devel] [PATCH] spherical: add functions to retrieve and request projection names

[Vittorio Giovara]

On Thu, Apr 20, 2017 at 11:40 AM, Vittorio Giovara
 wrote:
> From: James Almer 
>
> Signed-off-by: James Almer 
> Signed-off-by: Vittorio Giovara 
> ---
> Hopefully this is the version everyone can compromise on.
> Vittorio
>
>  doc/APIchanges|  4 
>  libavutil/spherical.c | 28 
>  libavutil/spherical.h | 18 ++
>  libavutil/version.h   |  2 +-
>  4 files changed, 51 insertions(+), 1 deletion(-)
>
> diff --git a/doc/APIchanges b/doc/APIchanges
> index a0ca3b7ac0..09b4b31557 100644
> --- a/doc/APIchanges
> +++ b/doc/APIchanges
> @@ -13,6 +13,10 @@ libavutil: 2017-03-23
>
>  API changes, most recent first:
>
> +2017-04-xx - xxx - lavu 56.1.0 - spherical.h
> +  Add av_spherical_projection_name().
> +  Add av_spherical_from_name().
> +
>  2017-03-xx - xxx - lavc 57.37.0 - avcodec.h
>Add AVCodecContext.hwaccel_flags field. This will control some hwaccels at
>a later point.
> diff --git a/libavutil/spherical.c b/libavutil/spherical.c
> index f5accc487d..30c94951f1 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(ENOSYS);

changed to EINVAL as per other thread
queuing this and the other two patches unless any objections arise
-- 
Vittorio
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH] spherical: add functions to retrieve and request projection names

[Vittorio Giovara]

From: James Almer 

Signed-off-by: James Almer 
Signed-off-by: Vittorio Giovara 
---
Hopefully this is the version everyone can compromise on.
Vittorio

 doc/APIchanges|  4 
 libavutil/spherical.c | 28 
 libavutil/spherical.h | 18 ++
 libavutil/version.h   |  2 +-
 4 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index a0ca3b7ac0..09b4b31557 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,10 @@ libavutil: 2017-03-23
 
 API changes, most recent first:
 
+2017-04-xx - xxx - lavu 56.1.0 - spherical.h
+  Add av_spherical_projection_name().
+  Add av_spherical_from_name().
+
 2017-03-xx - xxx - lavc 57.37.0 - avcodec.h
   Add AVCodecContext.hwaccel_flags field. This will control some hwaccels at
   a later point.
diff --git a/libavutil/spherical.c b/libavutil/spherical.c
index f5accc487d..30c94951f1 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(ENOSYS);
+}
diff --git a/libavutil/spherical.h b/libavutil/spherical.h
index fd662cf676..51ef22421e 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 b8425ea2c8..fd72ff431d 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, \
-- 
2.12.0

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel