From patchwork Mon Nov 6 17:59:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 5893 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp3167465jah; Mon, 6 Nov 2017 09:59:39 -0800 (PST) X-Google-Smtp-Source: ABhQp+THBtoNpXTn7Fb9g2rt7/H2p3NOOkbOSMzJMC89qRd3ts+9klJMh+ocZEiuKNq4SWLfKgFY X-Received: by 10.28.237.18 with SMTP id l18mr4475218wmh.136.1509991179339; Mon, 06 Nov 2017 09:59:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1509991179; cv=none; d=google.com; s=arc-20160816; b=Yr7IDnLoyYIVvMLLp62i7b544z4uNmy96Yu3WdMx8/+MiJK3GpbHPKNOnasuAuje6T BtZV9w4ozwC3Q72xf/iUZflO24x468Au9UTmknS7/PX0xT+w6GLpBAQdZg11kiWN308W OLX6SqsI5NkakIV22Al4SiJbr4FTDB64ifgC8eyZc6ecRkAp0qkIj7D66YV3L9dB5IuC hR1xEOlLPc1FPN1PKCuaFqu9SbzX9a5gFiAhFPs0xY4AUmjv0JyRWMfV9pfFG7wOgGnA Bs/8ApUYADd5N5MjPD72d6w0DKlKmIeDhfyTsx+dB+OpKuPqyWHAC16nctDpcQygx+P6 FsKQ== 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=BQpohzBb7Q/N4uWBaIW/ajAymeIFj/q0XoxwtKaFC6Y=; b=y4fpa+3k+GEAME+cvf4awcAfSQZMO6IqL5PegKykeLu7qsiYsxJ2jjw3RGsccBMcCj G5WAV4Jkjr7JAYdN8Kig260RNyNw9KTAbWUKoFGmjWswLPd4bAk/9yY6yrO2O6yn2W+A oV2gmOQ5INNOfmsxdr/HZlg/H21pkRyN4zuuQbH87EPOcxlTZT9+Rrzm/yzm0jc9lZAH NoJgoCGaSpQlavItPzgB8pjDHGm6ZjCjM8dbmXRR9pmi12bcmOhXlnj32EDyYaAcQ9Mc BakBofNP1zwLxjOa7QuMpW0jIU9gEg8e5NoCEjVQFrhcNLiQvBnxyY7pFPCF53y/GB28 vbsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mLjpWGF0; 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 f15si7149093wmg.4.2017.11.06.09.59.38; Mon, 06 Nov 2017 09:59:39 -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=mLjpWGF0; 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 BC2E8689B54; Mon, 6 Nov 2017 19:59:25 +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 021746806CD for ; Mon, 6 Nov 2017 19:59:19 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id n74so11576089wmi.1 for ; Mon, 06 Nov 2017 09:59:31 -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=So1jam+4VB+IfDAULhb9U+vH0aCve2EhTR5gbX7YrPQ=; b=mLjpWGF0BceCZTOO92ZATjSq4qTP0kKadKMNx2mWqgYzLOXQV8TawJKl/JsnopVT6S lJt0jYHSX6CCb7RGTE9lm7Z7tGjkbH2r9t15z2jKt0uP2QOgmeQT1DbGGW+xEcXvoucv PvPPdR9/yIrae3tK7chcDyJzwvh44iJUp7FcU86nxU8rsaoPpfUfksgfbLdREwFJWwrR nJCjLPUpknCBORSjvu/sovTzxY40QfOePvZa52g4Mnaf1LoXcvq+39t+/2spF6Az2iYC FPjMN+LQvzOAQ8pB/0dzjYm79R9pmIJTlvE/0JUNIj9/t8OE2DRYhKpdZZJtwIW3Vi9v TKBA== 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=So1jam+4VB+IfDAULhb9U+vH0aCve2EhTR5gbX7YrPQ=; b=XJFS5eurha0kC1cSw/qNKzsexWDFQDk3dtqvr/ZOBz8uma8yJZzeMJ0QLljbqxqK9+ 7LldQDmJM9+t/npWmUc8mAaz2u3ztUBsgxAkwSt3ZqiiAB1CZ/Ciy5NbDsAxWGdNZiXL KN0egnJB1jUzuSjuGa129gAPfmeMSWBIqhM2zc803jSVHW5VGXNXucziIkg1cyfC4OkR BawV1E1TtGQqE2mfJiThCEHQWmzMRxqsCPHMSfaaRfoqsWM3GsmSDdYqbkg2BJmAHRMt F06/jZfA7g2BdunSmJUfRE/UJYRCRZxLj2RxGRsOurofYWWEF+9rfxZiz3CpFq9gG1Y+ /RXQ== X-Gm-Message-State: AJaThX6GUQCDMeP4hoIePT9rUjvkhWNPdk1OwuJv+ahGUa73b6CZqo0a TlP+gbR9LbamAgogpx/okX57YqtF X-Received: by 10.28.225.214 with SMTP id y205mr6297064wmg.12.1509991170529; Mon, 06 Nov 2017 09:59:30 -0800 (PST) Received: from moonbase.pars.ee ([2a00:23c4:7c83:f700:2cea:8719:88e1:dc1b]) by smtp.gmail.com with ESMTPSA id 141sm12019600wmr.45.2017.11.06.09.59.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Nov 2017 09:59:29 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Nov 2017 17:59:27 +0000 Message-Id: <20171106175927.4551-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.15.0.403.gc27cc4dac6 Subject: [FFmpeg-devel] [PATCH v3] pngdec: expose gAMA and cHRM chunks as side 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 | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 0d6612ccca..9ce57b7e70 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" @@ -1287,6 +1288,37 @@ 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'): { + AVFrameSideData *sd = av_frame_new_side_data(p, AV_FRAME_DATA_GAMMA, sizeof(AVRational)); + if (!sd) { + ret = AVERROR(ENOMEM); + goto fail; + } + + *((AVRational *)sd->data) = av_make_q(bytestream2_get_be32(&s->gb), 100000); + 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");