From patchwork Thu Nov 9 00:25:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 5971 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1401383jah; Wed, 8 Nov 2017 16:32:22 -0800 (PST) X-Google-Smtp-Source: ABhQp+SIyKpDs8YCAHLrPK4l/ja0b3FWh2ev5jrlG1hT3Bg6CJy1p/FwLdaEy4WhgcR3kqAZYdtP X-Received: by 10.28.222.70 with SMTP id v67mr1477647wmg.99.1510187542636; Wed, 08 Nov 2017 16:32:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510187542; cv=none; d=google.com; s=arc-20160816; b=ef9C4ImPLDQL6fs7CjSBgoPvT6votNFx91GqgtK3LYvsEpRt/tLk596347asrtCz9S cRXI9SZZaYXQ9KSkD7LdT+YFO+lEUHsWjZeg+iTeKLc4HyEDHY+EM5NtkXqncKn1K1QS 6qnpLEJYVOnLK05DB72QdlQuGDhPQCIS6urawzXtr1/GSpgZNx5Lbl2ZSvOE0YmeExYs PWt0xPqEVd955Zn7RqZc/478jNKvdDoxbZxh7uV60MNpn3CDhFsmEEllzHQElqQj19iY 6SNlHM3rvmuhHHjBEoC7kY7SlY9G9qc7wia3EEx7m9tKZg0uNKvLC/e/DxxBYpW9jCTd r1kw== 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:cc: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=w/VoL0gSxVXSWbwsRhWnB70BWZ2wBsaXGdcCPgHGdsk=; b=WstKCcFSOCNjMKP+eRdHveyx6nZlhheZGEz+LFbGTIDeaLjofj0+mVe5lm4cRU39ph z/7glVESLqz13txoQ78WLU5bXWO9qZD4JH87yDxB0L8Bto1MQEWjbASuIyC++VCQod8f 3ince1mRi8wKwzL1jcNuv/johm6CGrFGFdGynBrUh5Qnrccx4DtnnAZyfqUlmfQYIRkd BbR+V5FLw13jSwP34FGnXeUDYDl5KyOKfSzicsUNta8+UucF7sAjYHscBw1nZ0NNLcXf tQsBqU94Y1BKriRz4HPD+d3uXc2nbiMPtbFFal62tQ9QYJvLHv+CNvo/xGEwQSKxb4fB kTZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=i8ggcCp5; 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 t145si4399641wmt.206.2017.11.08.16.32.21; Wed, 08 Nov 2017 16:32:22 -0800 (PST) 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 header.s=20161025 header.b=i8ggcCp5; 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 DADE4688354; Thu, 9 Nov 2017 02:32:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06D7E680960 for ; Thu, 9 Nov 2017 02:32:02 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id z3so14293959wme.5 for ; Wed, 08 Nov 2017 16:32:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3LHbH7sEZTxd2wOcD54RBYWcoz3s0sTG8YnZTdhqe7A=; b=i8ggcCp5aB2aQjSRw+W2InRbTtPAoBjiC1LlCnh2KuqnD7wpmq6gB3obnuVeQUyuWL wI+dQK8a1hP44EH267I0x77DcL1DxoFqVI6OSo6g1YmMgA1xUw25tThQ6VH6bjbwMxrR dOowwYumtHzoelAIhlA5cBFmQL5jCrOApIlaM1eHPDDt42yx+/bLNYUQP8Je3hZhoewX NHUciOtjxUuuy5B83Edvf3ppWOb2lwc3JPeeJCtaTcOm4/mjwY3CXgp2DnhjOWcsPuKg v8aSLvSQqanMz3na3bYfj4b1aDKqhVaR40sspmbw+1ihygFxjv9KsW8ZoFvD7cUuk3LC +VGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3LHbH7sEZTxd2wOcD54RBYWcoz3s0sTG8YnZTdhqe7A=; b=Zmw/501uXwqh0Jr2K3qlR3OwYV1hxq/5yeS/CET5/HbpBzUVVxAyF9x0uoG9HTOgOS Jm7vGuHIcGCLGDLDd2qrTfUs/MmwgV4b56VMjrjXgMdYA95E8gDiwbwIBejT/j2j9CVN +4YeIp6Ox5xsAnXN/411I+XvdpJRnaxdHN4H/19PtUiVwV+eJdaojvoPEUt+vV5eoofJ x87ckbQHPWDs7NUeWxksFOUK322T5lMbw53irMmXY5I+k1Kp/jMElSzs2QYF10nbvM5G dg1MnPXWh/F5jro+RRg/7B2LjaC2361hZQDUNVcCrLK4DofuuYzkzzmY6wZujTbNPGXo yjEQ== X-Gm-Message-State: AJaThX7W1RT7955bwwCqQ0RAFywjzT2flUQn5vAf+1nvscVcfIbp+dut ItAp1F/wBFI1MiLZMyHYBiItnKwu X-Received: by 10.28.54.22 with SMTP id d22mr1527113wma.120.1510187141224; Wed, 08 Nov 2017 16:25:41 -0800 (PST) Received: from moonbase.pars.ee ([2a00:23c4:7c83:f700:a434:62f:de2c:265c]) by smtp.gmail.com with ESMTPSA id x23sm2838881wmc.31.2017.11.08.16.25.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Nov 2017 16:25:40 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Nov 2017 00:25:39 +0000 Message-Id: <20171109002539.8368-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.15.0.448.gf294e3d99a Subject: [FFmpeg-devel] [PATCH v4] pngdec: expose gAMA and cHRM chunks as side/meta data 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 Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Rostislav Pehlivanov --- libavcodec/pngdec.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 0d6612ccca..aef0d95819 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -25,6 +25,7 @@ #include "libavutil/bprint.h" #include "libavutil/imgutils.h" #include "libavutil/stereo3d.h" +#include "libavutil/mastering_display_metadata.h" #include "avcodec.h" #include "bytestream.h" @@ -1165,7 +1166,7 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, AVDictionary **metadatap = NULL; uint32_t tag, length; int decode_next_dat = 0; - int ret; + int i, ret; for (;;) { length = bytestream2_get_bytes_left(&s->gb); @@ -1287,6 +1288,33 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, goto fail; break; } + case MKTAG('c', 'H', 'R', 'M'): { + AVMasteringDisplayMetadata *mdm = av_mastering_display_metadata_create_side_data(p); + if (!mdm) { + ret = AVERROR(ENOMEM); + goto fail; + } + + mdm->white_point[0] = av_make_q(bytestream2_get_be32(&s->gb), 100000); + mdm->white_point[1] = av_make_q(bytestream2_get_be32(&s->gb), 100000); + + /* RGB Primaries */ + for (i = 0; i < 3; i++) { + mdm->display_primaries[i][0] = av_make_q(bytestream2_get_be32(&s->gb), 100000); + mdm->display_primaries[i][1] = av_make_q(bytestream2_get_be32(&s->gb), 100000); + } + + mdm->has_primaries = 1; + bytestream2_skip(&s->gb, 4); /* crc */ + break; + } + case MKTAG('g', 'A', 'M', 'A'): { + av_dict_set_int(&p->metadata, "gamma_num", bytestream2_get_be32(&s->gb), 0); + av_dict_set_int(&p->metadata, "gamma_den", 100000, 0); + + bytestream2_skip(&s->gb, 4); /* crc */ + break; + } case MKTAG('I', 'E', 'N', 'D'): if (!(s->pic_state & PNG_ALLIMAGE)) av_log(avctx, AV_LOG_ERROR, "IEND without all image\n");