From patchwork Wed May 31 15:58:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 3774 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp358268vsk; Wed, 31 May 2017 09:07:21 -0700 (PDT) X-Received: by 10.28.155.65 with SMTP id d62mr6412445wme.78.1496246841760; Wed, 31 May 2017 09:07:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496246841; cv=none; d=google.com; s=arc-20160816; b=j6cshml9bFE7nCVp93J3sdGY2/0qJubSNiwJCfGD7AxTB1fliDiBJlftJA7yW0IYXp d+HB/fewTGjvIzhfLrhelSS22vcAcIsnnTt1LaziENLh+ZVYX6puEkuLj5vMBoPD2cD5 9bz9vBpWAgmkV8+M4RJPOHkMf1YNCGjZXUz7+nDVyc/gBuNwLQTiD3Tqu4NNbU6BoJ1k +pu8+V/MnjKQi5xBx0nMOlNVfpfOYs5c9zabIAojz/ZQ3dXdRrRQFR2JHuEIeDWMgvER oKL/Sl92OEeC2t60TJeX2qlTuVucBKYcN27ofY5o1OMiUuppy/Fe4KJ+IoX8QvHDB23F aXpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=/l88QKZ6rnbeASN/vrGurGuGNIB80c0VhiXnXZcp7nE=; b=spi2TN3p1V6KGhp3xG5Md0GuoAHN0mGN7+34mOJ4Lqk9zogB5Xq031Z7sdeAst317H mod2slWJCZ8OOb07GsaQRvZ8JNSE7b0n5Ta5LlNlvIAl3WwLQyqoKXYgdn7L9/8hfiqH eCrEv0rLYMGT3pX1n3mRsBtU6i4rab6QIN3ljxtmsRr160r4uk8opZymbzLQGfdm2vg8 8Dk6gtUUHc1uNn/MfeorStGU9tOsicUvosZagpMwUdSTWE+I66IltmgN00M4c4iZBSmA MaSWggxjjmv5Rvd2Fe8TPTKlOj2KXEA/DAX4uY7pPjex/ROcuWRQMpiLmJzO1vrhzwF8 aMxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 33si2675295wrr.268.2017.05.31.09.07.21; Wed, 31 May 2017 09:07:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 04D4568981B; Wed, 31 May 2017 19:07:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 139D1680C5C for ; Wed, 31 May 2017 19:07:08 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id v195so2375482qka.2 for ; Wed, 31 May 2017 09:07:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=UtR9ta8iabJz5fh/bh+FgxK5FuDi/IubKgmUobzsjfM=; b=IxN7Uis+UwbujHjg+WEjXaaiM3ZCQGAR3T0RaNUo34W35HkCtVAsH6CDCiYAJyg4y2 jUYd1j2n0PN6fD1VfwBXly5sV4X3AkDppA6U1sLjrydpX6Jz9LKM6KcpYRDr5jWAMyUP sq2cs11djJTRmeOVxL0eGJeLKqxmT6DuIuivorrXUdaUx6ZBz/bY++tm+SJtaDiYNzf1 Mbr6oKBD3+palCtkDgs6Qx2IbaPditIGCVLvxwKxVMIMlYkxYIcXiGvy3R8IZJgsBnU0 zHetfxX/kZQ1ql5oXE54FgO09FagvqA4LHcKoWBhHHC5vOFZHTEKpjzrCCj6vGNwBH+v GHhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=UtR9ta8iabJz5fh/bh+FgxK5FuDi/IubKgmUobzsjfM=; b=hk/lY51+M4NBnHQwzOkuSPrqXrDLouv/bFyi3b35YIPnzvh6Ff69PnTyq0fL4cAMtP CoaG0QN2Kr8vgKpuHKVVBtjRUtXXYzOPLwAb4OLf8cSArDhO3tMMPjSWJjlTxRy+Ug5l UcyXIeN9k0e9oqNNyONSuO3+MZL27/nDRi3gEFOHM1bwvdU/yvZYDo1VUEmEsTKbsXx3 BuSje84raAfc+MEpp5AbNPfXvIHO2watDhYgkKczs/fDC8EdJF1Ob3OA8YAF3xrn5NS8 BZNxfiDct59PF3WyXm1lo8MKkwrbppYZO0QMs12XqZ09R9HiAH1a34nI8P9E03m1FEoq O9ZQ== X-Gm-Message-State: AODbwcBv1mizkVQlP3/psPsHVJV6WzF2m0JsLP4d2S3Ln9MxD2gvAsC+ BP4wQoXRjSOWo9K+ X-Received: by 10.55.59.12 with SMTP id i12mr6147383qka.72.1496246342724; Wed, 31 May 2017 08:59:02 -0700 (PDT) Received: from vimacbookpro.vimeows.com ([8.40.92.161]) by smtp.gmail.com with ESMTPSA id r10sm10768572qtb.15.2017.05.31.08.59.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 31 May 2017 08:59:01 -0700 (PDT) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 May 2017 11:58:59 -0400 Message-Id: <20170531155900.10712-1-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.12.0 Subject: [FFmpeg-devel] [PATCH 1/2] ffprobe: Print AVMasteringDisplayMetadata side data contents X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- ffprobe.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/ffprobe.c b/ffprobe.c index f2a3cc7a73..f6d0264334 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -35,6 +35,7 @@ #include "libavutil/bprint.h" #include "libavutil/display.h" #include "libavutil/hash.h" +#include "libavutil/mastering_display_metadata.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/spherical.h" @@ -1893,6 +1894,25 @@ static void print_pkt_side_data(WriterContext *w, print_int("discard_padding", AV_RL32(sd->data + 4)); print_int("skip_reason", AV_RL8(sd->data + 8)); print_int("discard_reason", AV_RL8(sd->data + 9)); + } else if (sd->type == AV_PKT_DATA_MASTERING_DISPLAY_METADATA) { + AVMasteringDisplayMetadata *metadata = (AVMasteringDisplayMetadata *)sd->data; + + if (metadata->has_primaries) { + print_q("red_x", metadata->display_primaries[0][0], '/'); + print_q("red_y", metadata->display_primaries[0][1], '/'); + print_q("green_x", metadata->display_primaries[1][0], '/'); + print_q("green_y", metadata->display_primaries[1][1], '/'); + print_q("blue_x", metadata->display_primaries[2][0], '/'); + print_q("blue_y", metadata->display_primaries[2][1], '/'); + + print_q("white_point_x", metadata->white_point[0], '/'); + print_q("white_point_y", metadata->white_point[1], '/'); + } + + if (metadata->has_luminance) { + print_q("min_luminance", metadata->min_luminance, '/'); + print_q("max_luminance", metadata->max_luminance, '/'); + } } writer_print_section_footer(w); } @@ -2116,6 +2136,25 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, char tcbuf[AV_TIMECODE_STR_SIZE]; av_timecode_make_mpeg_tc_string(tcbuf, *(int64_t *)(sd->data)); print_str("timecode", tcbuf); + } else if (sd->type == AV_FRAME_DATA_MASTERING_DISPLAY_METADATA) { + AVMasteringDisplayMetadata *metadata = (AVMasteringDisplayMetadata *)sd->data; + + if (metadata->has_primaries) { + print_q("red_x", metadata->display_primaries[0][0], '/'); + print_q("red_y", metadata->display_primaries[0][1], '/'); + print_q("green_x", metadata->display_primaries[1][0], '/'); + print_q("green_y", metadata->display_primaries[1][1], '/'); + print_q("blue_x", metadata->display_primaries[2][0], '/'); + print_q("blue_y", metadata->display_primaries[2][1], '/'); + + print_q("white_point_x", metadata->white_point[0], '/'); + print_q("white_point_y", metadata->white_point[1], '/'); + } + + if (metadata->has_luminance) { + print_q("min_luminance", metadata->min_luminance, '/'); + print_q("max_luminance", metadata->max_luminance, '/'); + } } writer_print_section_footer(w); }