From patchwork Wed Sep 20 03:00:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 5202 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp262318jaa; Tue, 19 Sep 2017 20:07:25 -0700 (PDT) X-Received: by 10.223.187.129 with SMTP id q1mr3183226wrg.239.1505876845223; Tue, 19 Sep 2017 20:07:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505876845; cv=none; d=google.com; s=arc-20160816; b=g48g0tLaSzM5+eqMCqQYa2BkzXwKCdnZVuXY42sDwSL9C88vzq4L99wc6t9C9aC/pI Zolg9SIvn4GAKpmCM8JeCbnbfbOTFES4VtYIw2dd1AC5THiGoBddcXCvv2iGp2mqRVKs ZjjEDkkjQth5MvX9TwS740yTmj8/RqeAi2TrGvSwJfQgk067Zz6bVoBVxzh34PFPADpl u9NTbmCkg2Okw+I1xJyNSxsaIJRyygVxd60FjxaqmlH82Cq8ceGpNYgGMWatYdEKmDrM vKwP1Tpitbe4T2mHH4vGRC25oPtXhy/1q01NyWaaR29zGmllu96KkAT2m0daTDDsPTDg 0Ktg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=z+mg3e5q1ZnzjEFHsSekimsTw/7vZHLPgwjiC1dilKo=; b=MPBc5f4t/yzBXjq8Iq/YuGJqXOOukqD0RAsr9kkni0kk2GiFPDj5jGFrMABcgasYH6 2pm5tRpXVesx+NkCwQpCKBjMfvoh1bItCC8XmkFz7sgexD35uo+rE4fxcWd/r9l4dJvK +lwqJ7Pz7P/8IY6xcfvQzoME/uWkpbztmVNgP1hsxEK1M5obFY0sAzlWS9/T2wB4dG/F iMVfrl74g4iezODQTCL7eVa6VhwPUFGWAi672gPvSaGbQpRVhNOKNee4C1bs+IqXwlJc tBTp7Uc06YmbNqNBE/sqKByqPVcKlXIO3f4bzx6Mw9yy+UwESXvIAwgAmTTEoi/404gC AtCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rARMaCGn; 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 m28si546997wmc.149.2017.09.19.20.07.24; Tue, 19 Sep 2017 20:07:25 -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 header.s=20161025 header.b=rARMaCGn; 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 E081A689817; Wed, 20 Sep 2017 06:07:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CED89688364 for ; Wed, 20 Sep 2017 06:07:07 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id p37so714192wrb.5 for ; Tue, 19 Sep 2017 20:07:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CqFc+WIAF4DvQg+Byzy3psU5JU6baai2TKdp9BfJtug=; b=rARMaCGn30dvqss3XXdtJhwYm9B1eBDCTJw7tXMDViLvrJy9jZ3zM77ZyebGIlgyNS AdhSKZ6mhslLeU5jPkwo1f4NwX/QKgaBedHiY6MXSfvMNRxjllOnLWeU7lDFxpIEnCCY 91wvMW7qgovUG88Jq6I23v9tTKau4a1JXcqiHl/Y/DfkgaIXhqSwaygYWnCdrldgm1if xpznljvw1BfUk8QBP/G49gtFiq3aJM9w4UPOtMNd8s5woKobvlewid8IZo+ezWbrmkv1 acUoyrkOldZi90hUm5Q7ULt7H0gcmDvGly1Fb3H8PLCQDD7478+Qs7Y/zbiZULDoaC/c JkKQ== 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:in-reply-to :references; bh=CqFc+WIAF4DvQg+Byzy3psU5JU6baai2TKdp9BfJtug=; b=mhHbhH1OZ4dDBSNKAGOvoEM63dBYQBEkcVWnTobR6KbjZa4UwU4wStEkbVuz/UjxuR 37YxTPcSYHmjLwUzhcuOw1OHecAkdlBlFA1Av146fhsi+L9Jxmtiy4M7yaBFYC0ABQEE mdUIKkkw+CzvI9+7cZvEZb2xRrr+ajT1w1vMzlOV7NJ73+8v9zenBIfHN/QHn1DnO6u0 +v1PQ3EF68HrkudQzR/KbtkFWB5wnJalVoMeVgTAbkPF5z8Wz11N/+8lG3Bw+CkPJg0m PQYMRxdP7el2GKBpK6lAJrqjMl3oa3iuIjmTYMGqXvWyW5JY4yEELw2ZEEC4dIFZw7eR vFew== X-Gm-Message-State: AHPjjUjNHb4tGzozSmcapM+/8lHoPnvTGoSUIgGoh9v67YKnBEXt6yCH TmoMBDMJD66xR0RPvGwwonyNL8or X-Google-Smtp-Source: AOwi7QBJwwyDxZ1byWZVsxd1Dz1hxSN/Cqh5gack9dyqy6Nrp+gqf2PlLJ0B7ALbEOCfAeTOEkmKIw== X-Received: by 10.223.166.99 with SMTP id k90mr2743179wrc.183.1505876433571; Tue, 19 Sep 2017 20:00:33 -0700 (PDT) Received: from moonbase.pars.ee ([2a00:23c4:7c83:f700:a634:d9ff:fe80:bf0b]) by smtp.gmail.com with ESMTPSA id g25sm629377wmc.16.2017.09.19.20.00.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Sep 2017 20:00:32 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Sep 2017 04:00:28 +0100 Message-Id: <20170920030028.3098-2-atomnuker@gmail.com> X-Mailer: git-send-email 2.14.1.821.g8fa685d3b7 In-Reply-To: <20170920030028.3098-1-atomnuker@gmail.com> References: <20170920030028.3098-1-atomnuker@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] pngdec: expose gAMA and cHRM chunks as AVMasteringDisplayMetadata 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 | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 0d6612ccca..b7d9ded89c 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" @@ -1163,10 +1164,15 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, AVFrame *p, AVPacket *avpkt) { AVDictionary **metadatap = NULL; + AVMasteringDisplayMetadata mdm; uint32_t tag, length; int decode_next_dat = 0; int ret; + mdm.has_primaries = 0; + mdm.has_luminance = 0; + mdm.has_gamma = 0; + for (;;) { length = bytestream2_get_bytes_left(&s->gb); if (length <= 0) { @@ -1287,6 +1293,41 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, goto fail; break; } + case MKTAG('c', 'H', 'R', 'M'): { + mdm.white_point[0].num = bytestream2_get_be32(&s->gb); + mdm.white_point[0].den = 100000; + mdm.white_point[1].num = bytestream2_get_be32(&s->gb); + mdm.white_point[1].den = 100000; + + /* Red primaries */ + mdm.display_primaries[0][0].num = bytestream2_get_be32(&s->gb); + mdm.display_primaries[0][0].den = 100000; + mdm.display_primaries[0][1].num = bytestream2_get_be32(&s->gb); + mdm.display_primaries[0][1].den = 100000; + + /* Green primaries */ + mdm.display_primaries[1][0].num = bytestream2_get_be32(&s->gb); + mdm.display_primaries[1][0].den = 100000; + mdm.display_primaries[1][1].num = bytestream2_get_be32(&s->gb); + mdm.display_primaries[1][1].den = 100000; + + /* Blue primaries */ + mdm.display_primaries[2][0].num = bytestream2_get_be32(&s->gb); + mdm.display_primaries[2][0].den = 100000; + mdm.display_primaries[2][1].num = bytestream2_get_be32(&s->gb); + mdm.display_primaries[2][1].den = 100000; + + mdm.has_primaries = 1; + bytestream2_skip(&s->gb, 4); /* crc */ + break; + } + case MKTAG('g', 'A', 'M', 'A'): { + mdm.gamma.num = bytestream2_get_be32(&s->gb); + mdm.gamma.den = 100000; + mdm.has_gamma = 1; + 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"); @@ -1305,6 +1346,11 @@ skip_tag: } exit_loop: + if (mdm.has_gamma || mdm.has_primaries) { + AVMasteringDisplayMetadata *new_mdm = av_mastering_display_metadata_create_side_data(p); + memcpy(new_mdm, &mdm, sizeof(AVMasteringDisplayMetadata)); + } + if (avctx->codec_id == AV_CODEC_ID_PNG && avctx->skip_frame == AVDISCARD_ALL) { return 0;