1 files changed, 82 insertions, 3 deletions

diff --git a/chromium/third_party/ffmpeg/libavfilter/vf_showinfo.c b/chromium/third_party/ffmpeg/libavfilter/vf_showinfo.c
index ade3e1ae063..ec4bed14411 100644
--- a/chromium/third_party/ffmpeg/libavfilter/vf_showinfo.c
+++ b/chromium/third_party/ffmpeg/libavfilter/vf_showinfo.c
@@ -22,20 +22,66 @@
  * filter for showing textual video frame information
  */
 
+#include <inttypes.h>
+
 #include "libavutil/adler32.h"
 #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 void update_sample_stats(const uint8_t *src, int len, int64_t *sum, int64_t *sum2)
+{
+    int i;
+
+    for (i = 0; i < len; i++) {
+        *sum += src[i];
+        *sum2 += src[i] * src[i];
+    }
+}
+
 static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 {
     AVFilterContext *ctx = inlink->dst;
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
     uint32_t plane_checksum[4] = {0}, checksum = 0;
+    int64_t sum[4] = {0}, sum2[4] = {0};
+    int32_t pixelcount[4] = {0};
     int i, plane, vsub = desc->log2_chroma_h;
 
     for (plane = 0; plane < 4 && frame->data[plane] && frame->linesize[plane]; plane++) {
@@ -49,6 +95,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
         for (i = 0; i < h; i++) {
             plane_checksum[plane] = av_adler32_update(plane_checksum[plane], data, linesize);
             checksum = av_adler32_update(checksum, data, linesize);
+
+            update_sample_stats(data, linesize, sum+plane, sum2+plane);
+            pixelcount[plane] += linesize;
             data += frame->linesize[plane];
         }
     }
@@ -56,7 +105,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
     av_log(ctx, AV_LOG_INFO,
            "n:%"PRId64" pts:%s pts_time:%s pos:%"PRId64" "
            "fmt:%s sar:%d/%d s:%dx%d i:%c iskey:%d type:%c "
-           "checksum:%08X plane_checksum:[%08X",
+           "checksum:%08"PRIX32" plane_checksum:[%08"PRIX32,
            inlink->frame_count,
            av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base), av_frame_get_pkt_pos(frame),
            desc->name,
@@ -69,8 +118,38 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
            checksum, plane_checksum[0]);
 
     for (plane = 1; plane < 4 && frame->data[plane] && frame->linesize[plane]; plane++)
-        av_log(ctx, AV_LOG_INFO, " %08X", plane_checksum[plane]);
-    av_log(ctx, AV_LOG_INFO, "]\n");
+        av_log(ctx, AV_LOG_INFO, " %08"PRIX32, plane_checksum[plane]);
+    av_log(ctx, AV_LOG_INFO, "] mean:[");
+    for (plane = 0; plane < 4 && frame->data[plane] && frame->linesize[plane]; plane++)
+        av_log(ctx, AV_LOG_INFO, "%"PRId64" ", (sum[plane] + pixelcount[plane]/2) / pixelcount[plane]);
+    av_log(ctx, AV_LOG_INFO, "\b] stdev:[");
+    for (plane = 0; plane < 4 && frame->data[plane] && frame->linesize[plane]; plane++)
+        av_log(ctx, AV_LOG_INFO, "%3.1f ",
+               sqrt((sum2[plane] - sum[plane]*(double)sum[plane]/pixelcount[plane])/pixelcount[plane]));
+    av_log(ctx, AV_LOG_INFO, "\b]\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);
 }