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>

2 files changed, 165 insertions, 0 deletions

diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c
index c105efb0fd..a68212c7bb 100644
--- a/libavfilter/af_ashowinfo.c
+++ b/libavfilter/af_ashowinfo.c
@@ -30,7 +30,10 @@
 #include "libavutil/attributes.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
+#include "libavutil/downmix_info.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
+#include "libavutil/replaygain.h"
 #include "libavutil/timestamp.h"
 #include "libavutil/samplefmt.h"
 
@@ -51,6 +54,99 @@ static av_cold void uninit(AVFilterContext *ctx)
     av_freep(&s->plane_checksums);
 }
 
+static void dump_matrixenc(AVFilterContext *ctx, AVFrameSideData *sd)
+{
+    enum AVMatrixEncoding enc;
+
+    av_log(ctx, AV_LOG_INFO, "matrix encoding: ");
+
+    if (sd->size < sizeof(enum AVMatrixEncoding)) {
+        av_log(ctx, AV_LOG_INFO, "invalid data");
+        return;
+    }
+
+    enc = *(enum AVMatrixEncoding *)sd->data;
+    switch (enc) {
+    case AV_MATRIX_ENCODING_NONE:           av_log(ctx, AV_LOG_INFO, "none");                break;
+    case AV_MATRIX_ENCODING_DOLBY:          av_log(ctx, AV_LOG_INFO, "Dolby");               break;
+    case AV_MATRIX_ENCODING_DPLII:          av_log(ctx, AV_LOG_INFO, "Dolby Pro Logic II");  break;
+    case AV_MATRIX_ENCODING_DPLIIX:         av_log(ctx, AV_LOG_INFO, "Dolby Pro Logic IIx"); break;
+    case AV_MATRIX_ENCODING_DPLIIZ:         av_log(ctx, AV_LOG_INFO, "Dolby Pro Logic IIz"); break;
+    case AV_MATRIX_ENCODING_DOLBYEX:        av_log(ctx, AV_LOG_INFO, "Dolby EX");            break;
+    case AV_MATRIX_ENCODING_DOLBYHEADPHONE: av_log(ctx, AV_LOG_INFO, "Dolby Headphone");     break;
+    default:                                av_log(ctx, AV_LOG_WARNING, "unknown");          break;
+    }
+}
+
+static void dump_downmix(AVFilterContext *ctx, AVFrameSideData *sd)
+{
+    AVDownmixInfo *di;
+
+    av_log(ctx, AV_LOG_INFO, "downmix: ");
+    if (sd->size < sizeof(*di)) {
+        av_log(ctx, AV_LOG_INFO, "invalid data");
+        return;
+    }
+
+    di = (AVDownmixInfo *)sd->data;
+
+    av_log(ctx, AV_LOG_INFO, "preferred downmix type - ");
+    switch (di->preferred_downmix_type) {
+    case AV_DOWNMIX_TYPE_LORO:    av_log(ctx, AV_LOG_INFO, "Lo/Ro");              break;
+    case AV_DOWNMIX_TYPE_LTRT:    av_log(ctx, AV_LOG_INFO, "Lt/Rt");              break;
+    case AV_DOWNMIX_TYPE_DPLII:   av_log(ctx, AV_LOG_INFO, "Dolby Pro Logic II"); break;
+    default:                      av_log(ctx, AV_LOG_WARNING, "unknown");         break;
+    }
+
+    av_log(ctx, AV_LOG_INFO, " Mix levels: center %f (%f ltrt) - "
+           "surround %f (%f ltrt) - lfe %f",
+           di->center_mix_level, di->center_mix_level_ltrt,
+           di->surround_mix_level, di->surround_mix_level_ltrt,
+           di->lfe_mix_level);
+}
+
+static void print_gain(AVFilterContext *ctx, const char *str, int32_t gain)
+{
+    av_log(ctx, AV_LOG_INFO, "%s - ", str);
+    if (gain == INT32_MIN)
+        av_log(ctx, AV_LOG_INFO, "unknown");
+    else
+        av_log(ctx, AV_LOG_INFO, "%f", gain / 100000.0f);
+    av_log(ctx, AV_LOG_INFO, ", ");
+}
+
+static void print_peak(AVFilterContext *ctx, const char *str, uint32_t peak)
+{
+    av_log(ctx, AV_LOG_INFO, "%s - ", str);
+    if (!peak)
+        av_log(ctx, AV_LOG_INFO, "unknown");
+    else
+        av_log(ctx, AV_LOG_INFO, "%f", (float)peak / UINT32_MAX);
+    av_log(ctx, AV_LOG_INFO, ", ");
+}
+
+static void dump_replaygain(AVFilterContext *ctx, AVFrameSideData *sd)
+{
+    AVReplayGain *rg;
+
+    av_log(ctx, AV_LOG_INFO, "replaygain: ");
+    if (sd->size < sizeof(*rg)) {
+        av_log(ctx, AV_LOG_INFO, "invalid data");
+        return;
+    }
+    rg = (AVReplayGain*)sd->data;
+
+    print_gain(ctx, "track gain", rg->track_gain);
+    print_peak(ctx, "track peak", rg->track_peak);
+    print_gain(ctx, "album gain", rg->album_gain);
+    print_peak(ctx, "album peak", rg->album_peak);
+}
+
+static void dump_unknown(AVFilterContext *ctx, AVFrameSideData *sd)
+{
+    av_log(ctx, AV_LOG_INFO, "unknown side data type: %d, size %d bytes", sd->type, sd->size);
+}
+
 static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
 {
     AVFilterContext *ctx = inlink->dst;
@@ -96,6 +192,20 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
         av_log(ctx, AV_LOG_INFO, "%08"PRIX32" ", s->plane_checksums[i]);
     av_log(ctx, AV_LOG_INFO, "]\n");
 
+    for (i = 0; i < buf->nb_side_data; i++) {
+        AVFrameSideData *sd = buf->side_data[i];
+
+        av_log(ctx, AV_LOG_INFO, "  side data - ");
+        switch (sd->type) {
+        case AV_FRAME_DATA_MATRIXENCODING: dump_matrixenc (ctx, sd); break;
+        case AV_FRAME_DATA_DOWNMIX_INFO:   dump_downmix   (ctx, sd); break;
+        case AV_FRAME_DATA_REPLAYGAIN:     dump_replaygain(ctx, sd); break;
+        default:                           dump_unknown   (ctx, sd); break;
+        }
+
+        av_log(ctx, AV_LOG_INFO, "\n");
+    }
+
     return ff_filter_frame(inlink->dst->outputs[0], buf);
 }
 
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);
 }