Merge commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6'

* commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6':
  vf_showinfo: Display spherical properties

Merged-by: James Almer <jamrial@gmail.com>

diff --cc libavfilter/vf_showinfo.c
index 834e742fcbd696551ccbafe7f7cceae018f689a3,d5605e6922d6464355a67b64c2098d6b99b016ed..e0b3223801d266fb49a97309c1202f8a4f76fc33
--- 1/libavfilter/vf_showinfo.c
--- 2/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@@ -29,13 -29,54 +29,51 @@@
  #include "libavutil/imgutils.h"
  #include "libavutil/internal.h"
  #include "libavutil/pixdesc.h"
+ #include "libavutil/spherical.h"
  #include "libavutil/stereo3d.h"
 +#include "libavutil/timestamp.h"
  
  #include "avfilter.h"
  #include "internal.h"
  #include "video.h"
  
 -typedef struct ShowInfoContext {
 -    unsigned int frame;
 -} ShowInfoContext;
 -
+ static void dump_spherical(AVFilterContext *ctx, AVFrame *frame, AVFrameSideData *sd)
+ {
+     AVSphericalMapping *spherical = (AVSphericalMapping *)sd->data;
+     double yaw, pitch, roll;
+ 
+     av_log(ctx, AV_LOG_INFO, "spherical information: ");
+     if (sd->size < sizeof(*spherical)) {
+         av_log(ctx, AV_LOG_INFO, "invalid data");
+         return;
+     }
+ 
+     if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR)
+         av_log(ctx, AV_LOG_INFO, "equirectangular ");
+     else if (spherical->projection == AV_SPHERICAL_CUBEMAP)
+         av_log(ctx, AV_LOG_INFO, "cubemap ");
+     else if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE)
+         av_log(ctx, AV_LOG_INFO, "tiled equirectangular ");
+     else {
+         av_log(ctx, AV_LOG_WARNING, "unknown");
+         return;
+     }
+ 
+     yaw = ((double)spherical->yaw) / (1 << 16);
+     pitch = ((double)spherical->pitch) / (1 << 16);
+     roll = ((double)spherical->roll) / (1 << 16);
+     av_log(ctx, AV_LOG_INFO, "(%f/%f/%f) ", yaw, pitch, roll);
+ 
+     if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE) {
+         size_t l, t, r, b;
+         av_spherical_tile_bounds(spherical, frame->width, frame->height,
+                                  &l, &t, &r, &b);
+         av_log(ctx, AV_LOG_INFO, "[%zu, %zu, %zu, %zu] ", l, t, r, b);
+     } else if (spherical->projection == AV_SPHERICAL_CUBEMAP) {
+         av_log(ctx, AV_LOG_INFO, "[pad %"PRIu32"] ", spherical->padding);
+     }
+ }
+ 
  static void dump_stereo3d(AVFilterContext *ctx, AVFrameSideData *sd)
  {
      AVStereo3D *stereo;