[FFmpeg-cvslog] ffprobe: use av_spherical_projection_name() to print spherical projection names

James Almer git at videolan.org
Fri Mar 31 20:13:08 EEST 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Mar 28 23:49:55 2017 -0300| [2a2854f57842e843ae0d4bd0ebe617135b2f63a0] | committer: James Almer

ffprobe: use av_spherical_projection_name() to print spherical projection names

Reviewed-by: Vittorio Giovara <vittorio.giovara at gmail.com>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a2854f57842e843ae0d4bd0ebe617135b2f63a0
---

 ffprobe.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ffprobe.c b/ffprobe.c
index fa60894..3567468 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1872,22 +1872,18 @@ static void print_pkt_side_data(WriterContext *w,
             print_int("inverted", !!(stereo->flags & AV_STEREO3D_FLAG_INVERT));
         } else if (sd->type == AV_PKT_DATA_SPHERICAL) {
             const AVSphericalMapping *spherical = (AVSphericalMapping *)sd->data;
-            if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR)
-                print_str("projection", "equirectangular");
-            else if (spherical->projection == AV_SPHERICAL_CUBEMAP) {
-                print_str("projection", "cubemap");
+            print_str("projection", av_spherical_projection_name(spherical->projection));
+            if (spherical->projection == AV_SPHERICAL_CUBEMAP) {
                 print_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);
-                print_str("projection", "tiled equirectangular");
                 print_int("bound_left", l);
                 print_int("bound_top", t);
                 print_int("bound_right", r);
                 print_int("bound_bottom", b);
-            } else
-                print_str("projection", "unknown");
+            }
 
             print_int("yaw", (double) spherical->yaw / (1 << 16));
             print_int("pitch", (double) spherical->pitch / (1 << 16));



More information about the ffmpeg-cvslog mailing list