From c7bf98d4372e9217c8d75d2ca1f298385909e4da Mon Sep 17 00:00:00 2001 From: James Almer Date: Tue, 4 Apr 2017 17:24:19 -0300 Subject: [PATCH] avprobe: use av_spherical_projection_name() to print spherical projection names Signed-off-by: James Almer --- avtools/avprobe.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/avtools/avprobe.c b/avtools/avprobe.c index 5f5e670f1b..a9ca1934ca 100644 --- a/avtools/avprobe.c +++ b/avtools/avprobe.c @@ -817,25 +817,21 @@ static void show_stream(InputFile *ifile, InputStream *ist) case AV_PKT_DATA_SPHERICAL: spherical = (AVSphericalMapping *)sd->data; probe_object_header("spherical"); + probe_str("projection", av_spherical_projection_name(spherical->projection)); - if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR) { - probe_str("projection", "equirectangular"); - } else if (spherical->projection == AV_SPHERICAL_CUBEMAP) { - probe_str("projection", "cubemap"); + if (spherical->projection == AV_SPHERICAL_CUBEMAP) { probe_int("padding", spherical->padding); } else if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE) { size_t l, t, r, b; av_spherical_tile_bounds(spherical, par->width, par->height, &l, &t, &r, &b); - probe_str("projection", "tiled equirectangular"); probe_object_header("bounding"); probe_int("left", l); probe_int("top", t); probe_int("right", r); probe_int("bottom", b); probe_object_footer("bounding"); - } else - probe_str("projection", "unknown"); + } probe_object_header("orientation"); probe_int("yaw", (double) spherical->yaw / (1 << 16));