diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:32:48 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:32:48 +0100 |
commit | 15fe694e5ca13e217a643553fbd8e15b5fc865de (patch) | |
tree | 02afe639baac5afd4c8abd5aeef73d1c6ac0bc23 /libavfilter/vf_showinfo.c | |
parent | 1034fbdf53003eb74ad30576d1f2205abc429357 (diff) | |
parent | b4679ecdbd80ae050094733f137ccd7ebf1316ab (diff) |
Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'
* commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab':
{v,a}f_showinfo: print frame side data
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_showinfo.c')
-rw-r--r-- | libavfilter/vf_showinfo.c | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index de2e994c0d..f0822ec26a 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -28,11 +28,43 @@ #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/pixdesc.h" +#include "libavutil/stereo3d.h" #include "libavutil/timestamp.h" + #include "avfilter.h" #include "internal.h" #include "video.h" +static void dump_stereo3d(AVFilterContext *ctx, AVFrameSideData *sd) +{ + AVStereo3D *stereo; + + av_log(ctx, AV_LOG_INFO, "stereoscopic information: "); + if (sd->size < sizeof(*stereo)) { + av_log(ctx, AV_LOG_INFO, "invalid data"); + return; + } + + stereo = (AVStereo3D *)sd->data; + + av_log(ctx, AV_LOG_INFO, "type - "); + switch (stereo->type) { + case AV_STEREO3D_2D: av_log(ctx, AV_LOG_INFO, "2D"); break; + case AV_STEREO3D_SIDEBYSIDE: av_log(ctx, AV_LOG_INFO, "side by side"); break; + case AV_STEREO3D_TOPBOTTOM: av_log(ctx, AV_LOG_INFO, "top and bottom"); break; + case AV_STEREO3D_FRAMESEQUENCE: av_log(ctx, AV_LOG_INFO, "frame alternate"); break; + case AV_STEREO3D_CHECKERBOARD: av_log(ctx, AV_LOG_INFO, "checkerboard"); break; + case AV_STEREO3D_LINES: av_log(ctx, AV_LOG_INFO, "interleaved lines"); break; + case AV_STEREO3D_COLUMNS: av_log(ctx, AV_LOG_INFO, "interleaved columns"); break; + case AV_STEREO3D_SIDEBYSIDE_QUINCUNX: av_log(ctx, AV_LOG_INFO, "side by side " + "(quincunx subsampling)"); break; + default: av_log(ctx, AV_LOG_WARNING, "unknown"); break; + } + + if (stereo->flags & AV_STEREO3D_FLAG_INVERT) + av_log(ctx, AV_LOG_INFO, " (inverted)"); +} + static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; @@ -74,6 +106,29 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) av_log(ctx, AV_LOG_INFO, " %08"PRIX32, plane_checksum[plane]); av_log(ctx, AV_LOG_INFO, "]\n"); + for (i = 0; i < frame->nb_side_data; i++) { + AVFrameSideData *sd = frame->side_data[i]; + + av_log(ctx, AV_LOG_INFO, " side data - "); + switch (sd->type) { + case AV_FRAME_DATA_PANSCAN: + av_log(ctx, AV_LOG_INFO, "pan/scan"); + break; + case AV_FRAME_DATA_A53_CC: + av_log(ctx, AV_LOG_INFO, "A/53 closed captions (%d bytes)", sd->size); + break; + case AV_FRAME_DATA_STEREO3D: + dump_stereo3d(ctx, sd); + break; + default: + av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)", + sd->type, sd->size); + break; + } + + av_log(ctx, AV_LOG_INFO, "\n"); + } + return ff_filter_frame(inlink->dst->outputs[0], frame); } |