Browse code

Merge commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe'

* commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe':
vf_showinfo: Simplify reporting stereo3d information

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

James Almer authored on 2017/10/24 06:49:22
Showing 1 changed files
... ...
@@ -48,19 +48,7 @@ static void dump_stereo3d(AVFilterContext *ctx, AVFrameSideData *sd)
48 48
 
49 49
     stereo = (AVStereo3D *)sd->data;
50 50
 
51
-    av_log(ctx, AV_LOG_INFO, "type - ");
52
-    switch (stereo->type) {
53
-    case AV_STEREO3D_2D:                  av_log(ctx, AV_LOG_INFO, "2D");                     break;
54
-    case AV_STEREO3D_SIDEBYSIDE:          av_log(ctx, AV_LOG_INFO, "side by side");           break;
55
-    case AV_STEREO3D_TOPBOTTOM:           av_log(ctx, AV_LOG_INFO, "top and bottom");         break;
56
-    case AV_STEREO3D_FRAMESEQUENCE:       av_log(ctx, AV_LOG_INFO, "frame alternate");        break;
57
-    case AV_STEREO3D_CHECKERBOARD:        av_log(ctx, AV_LOG_INFO, "checkerboard");           break;
58
-    case AV_STEREO3D_LINES:               av_log(ctx, AV_LOG_INFO, "interleaved lines");      break;
59
-    case AV_STEREO3D_COLUMNS:             av_log(ctx, AV_LOG_INFO, "interleaved columns");    break;
60
-    case AV_STEREO3D_SIDEBYSIDE_QUINCUNX: av_log(ctx, AV_LOG_INFO, "side by side "
61
-                                                                   "(quincunx subsampling)"); break;
62
-    default:                              av_log(ctx, AV_LOG_WARNING, "unknown");             break;
63
-    }
51
+    av_log(ctx, AV_LOG_INFO, "type - %s", av_stereo3d_type_name(stereo->type));
64 52
 
65 53
     if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
66 54
         av_log(ctx, AV_LOG_INFO, " (inverted)");