From patchwork Thu Nov 9 02:32:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 5913 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1494450jah; Wed, 8 Nov 2017 18:32:39 -0800 (PST) X-Google-Smtp-Source: AGs4zMaKg6HvdsJsccRlj9MKSgDkSFznMJ6MAfvEi1XWQqsxOxtjHa7Schw6AUSsvD1608+8YTac X-Received: by 10.28.232.76 with SMTP id f73mr1737373wmh.45.1510194759518; Wed, 08 Nov 2017 18:32:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510194759; cv=none; d=google.com; s=arc-20160816; b=m2gPPsYvEEZWK1DyqibZxa+hy1IWzw4UObWUXGVJYJcmuw44MeyujpjObc/XOSToCV bq9ze8UXIyR9iHEfOoe57K0Ta7ioZR+n3qDMEnV2WreMts6OPawWD4Fz33KLMU02zffb eJuxy2tz3YnRjdjmihw+lo+6Xg7I1yLAcoPp89CMqjutsQ8Rzd/mPCsva/9hypi9rMYy dudEyTdylTAmcvjjSaoIzWGf4A4+92BYJ/IQleAg6y9J+VoY8Zp7wxxKX54c0jfExYF1 dqmUHaUm0zVPHjwja76BjEOZ4nZGmNYIbykoO7zRkYMpshFdbeL6bwiO6RDU+bMtcWQc BELg== 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=d26cw2Xm1TPvsNSEOZ04xa8DEclNSWmyp1nTNRySL8Q=; b=nRUx+0tsmsdLp60CilonDsjHHRNTzHfUQC2LehlCQshUxIm88bpF2cz2VihMT7VBVA 6JOq3elM8xlJE4IIp8KUIMw1w0wQ4etnrgKvinPM1fxoFrbGnLHetRD4fQ2onlGmjUzO ilL7dUittrkIYXRQ0ZuTQKP7hfr5aESh668AaxLc9ueHv62CZH8bQwqlBiF6pChtCsfc LBk7JZwGZJDngGIYjjRP55i8yj6eyzScVnTywj4ob3D2k6XhxuIGABBKaIQGzQsPVmZL LVH7t0SO4x5g1g3B3szuhTUGtByg5gqEygTRrgXN1l9NfrDlbDnxUUKWNEbQa33slV24 wjXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rIM6eKgh; 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 y29si5507864wry.87.2017.11.08.18.32.39; Wed, 08 Nov 2017 18:32: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=rIM6eKgh; 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 08F88689828; Thu, 9 Nov 2017 04:32:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2AA43688287 for ; Thu, 9 Nov 2017 04:32:18 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id r196so14144347wmf.2 for ; Wed, 08 Nov 2017 18:32: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:in-reply-to:references; bh=20bVrElWH9ZIP+g4dJHXLvzqU0ctJxQW5NxdCE0UNhI=; b=rIM6eKghSougjFXZYTEk6Tz2ZqHSlf0sD3XbtZoFZd10661inZF66qdlL0v2kPXNW0 dPDK/JdFwlhw0GUK39wJ+Syi/28OQKyhvumMxpqVMhWfQQTbNdx32OCKA4wyb1dTMYTX Nns9ZaJRwaEkxnVp0dutiPKTn/HJXMQu5mli2JcBy/k5ddkEMqWha2oBRchKDsI6XCuy hzhDmki4YNhU8TBcXBh7cX5RUe1YHhEmM71unlLzz38pPeMB1loW3M0fMMOCGHbJhdWX mDiJzdDZ6L3UpmWXp/BXH6quwQcDceGa4OY659vZzvjaAnsEQxYp3vr8E/YnxTwSDVrl CWXw== 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=20bVrElWH9ZIP+g4dJHXLvzqU0ctJxQW5NxdCE0UNhI=; b=XFq2vefA7eIFsQ//TJcwpCmZ+7bgun6wbZY0rMMnjPXzcikvcqIR8qxDGl1ZYn44nB 9YSTRsIUkEcvWXvW6GdiYObPFprZcdKYcBwgCTjKUFJW325RQaexi0fYwCRmzlWM23n0 ON1lbbnwIGaEQdKrkcY3XlCmbMZF2zG6JHjvGyF347SqOm1JL30tNgN329tZYEVzqrEW 2H2xK7OLIvmEoF5aHLSHffPg0r02QyyanrwFZoBkdEXqtBsYXc6sSPShGa2x2w7t+V9l eQ3vJxiqub6lnfADfodcMiq69ulbwPC2QTAyF9gXzAaMQbq5hZEL4woxCJ1pFO4kyaPs 5Vdg== X-Gm-Message-State: AJaThX4luOpaey+e5sUUAfHXPoSlt6hQFmxHQH5klgqs05vNdp4Q+hlH GFdlE7iMttKe9/92/z7JD4CI/3Hi X-Received: by 10.28.91.65 with SMTP id p62mr1651317wmb.126.1510194750551; Wed, 08 Nov 2017 18:32:30 -0800 (PST) Received: from moonbase.pars.ee ([2a00:23c4:7c83:f700:a434:62f:de2c:265c]) by smtp.gmail.com with ESMTPSA id q3sm3813423wrd.78.2017.11.08.18.32.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Nov 2017 18:32:29 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Nov 2017 02:32:23 +0000 Message-Id: <20171109023223.19727-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.15.0.448.gf294e3d99a In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH v5] 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 | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 0d6612ccca..0a9a248ee7 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,42 @@ 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'): { + AVBPrint bp; + char *gamma_str; + int num = bytestream2_get_be32(&s->gb); + + av_bprint_init(&bp, 0, -1); + av_bprintf(&bp, "%i/%i", num, 100000); + av_bprint_finalize(&bp, (char **)&gamma_str); + if (!gamma_str) + return AVERROR(ENOMEM); + + av_dict_set(&p->metadata, "gamma", gamma_str, 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");