Commit c7bf98d4 authored by James Almer's avatar James Almer Committed by Vittorio Giovara

avprobe: use av_spherical_projection_name() to print spherical projection names

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 498864fe
...@@ -817,25 +817,21 @@ static void show_stream(InputFile *ifile, InputStream *ist) ...@@ -817,25 +817,21 @@ static void show_stream(InputFile *ifile, InputStream *ist)
case AV_PKT_DATA_SPHERICAL: case AV_PKT_DATA_SPHERICAL:
spherical = (AVSphericalMapping *)sd->data; spherical = (AVSphericalMapping *)sd->data;
probe_object_header("spherical"); probe_object_header("spherical");
probe_str("projection", av_spherical_projection_name(spherical->projection));
if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR) { if (spherical->projection == AV_SPHERICAL_CUBEMAP) {
probe_str("projection", "equirectangular");
} else if (spherical->projection == AV_SPHERICAL_CUBEMAP) {
probe_str("projection", "cubemap");
probe_int("padding", spherical->padding); probe_int("padding", spherical->padding);
} else if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE) { } else if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE) {
size_t l, t, r, b; size_t l, t, r, b;
av_spherical_tile_bounds(spherical, par->width, par->height, av_spherical_tile_bounds(spherical, par->width, par->height,
&l, &t, &r, &b); &l, &t, &r, &b);
probe_str("projection", "tiled equirectangular");
probe_object_header("bounding"); probe_object_header("bounding");
probe_int("left", l); probe_int("left", l);
probe_int("top", t); probe_int("top", t);
probe_int("right", r); probe_int("right", r);
probe_int("bottom", b); probe_int("bottom", b);
probe_object_footer("bounding"); probe_object_footer("bounding");
} else }
probe_str("projection", "unknown");
probe_object_header("orientation"); probe_object_header("orientation");
probe_int("yaw", (double) spherical->yaw / (1 << 16)); probe_int("yaw", (double) spherical->yaw / (1 << 16));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment