From patchwork Mon Sep 25 19:28:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 5263 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp2983740jaa; Mon, 25 Sep 2017 12:33:40 -0700 (PDT) X-Received: by 10.28.184.141 with SMTP id i135mr1294736wmf.143.1506368020099; Mon, 25 Sep 2017 12:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506368020; cv=none; d=google.com; s=arc-20160816; b=wSUbiknqbZOyg2qabrNULzVXN8MgRN3PE7VmGv8vITfWtglNjgqQS/wdO36SbPMiqc b0n8d4PeXmwvZr8DYVVAbpRI7IgoYfVYSV/RlMTKqAmKowXCmDFxXgjMIFQBFTVS4e2I DACEaBtVOE7tIVxW33GOuKtX2IHG3rw/zKEBqj0TB3avZWCxHE0B9X7DrC1v1hJJnfFH TT0ftw3A5Y7qHA8Oa4Zncn+kpN+9hxkfqzHl3RsxaZvuldjzGnOOhAKISZtus+ZtzLSf CWqYWP4foZbLC+pJVSMZQJt64uTDuJc084QAaDbZ09MS5LH1gPVeseaIFdC+8p/RIERA l3bA== 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=r+W2mtVyKI6C7EJJ9aUStMgvZxF9zu+T/Z74arFKBl0=; b=m6M3Sz2VqHdhgXquWo2C7LuGuyIYfscXn5pxMO9X00+J/9BOSNGCi5WBPsM3SLXp0o GeL4aj1UI7PgMLSHqj0Co6CrIos2TWmxgWHdn+oUAGKJ8qrwmLIhGnWdl0aM/MXihm63 Pmb6t2izbs2zvlyz2lWzhoV0mJ5/XK45xHmdtgx+xAzfJn7ZBRlouOtulXsT92LKMu9R znpcE2z0eFBGvuveo86pe92WZ7a28oRf554oWbQylzb4aB3tI+udgmYZeWrYI/vKe2cF JrVyAjtMgDbfFOZJhFFZK4IGhh1EsHTR2wzQEVLJCcM5+UhlWZWrcSMeVHJSt9NhxDg7 fsGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=GY7MD1YR; 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 c9si5575828wrd.426.2017.09.25.12.33.39; Mon, 25 Sep 2017 12:33:40 -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=GY7MD1YR; 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 37ED0689911; Mon, 25 Sep 2017 22:33:27 +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 77B9768974E for ; Mon, 25 Sep 2017 22:33:21 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id u48so437045wrf.4 for ; Mon, 25 Sep 2017 12:33:33 -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=b8hsVwB/unS7SxIBuwofkLF2AAB/0qbjzm0Q8VSmupo=; b=GY7MD1YRok0SELlwJd/1wUxTiWORmxmY3nGsI7q3vBTZIP/727yt/Av1qAQ7eVCcix 3JfF/rfdJ4TbHKvZYBISkwt38mNTbm6I2Ltucf2RXIBulhn+qB5nPbQsLhRvuHtUOYEG 8shnet34DOH25hyFthRUcJjN2qDmKJYHCmmprtEhs+83XrkJuw9RbtiBWpQM4X+PbGdw zyrPKw9t1P/R0F5ZDxh1VvSlAoaKedQA7RBjJnHyxiTQU2cKjuAKdav82B2rqznrsLm3 8sP5sE4pRUA3FysdNYMEjLgoab0BOc2i+WeNoGT4hcxSZS7QcWB2fn7uWFUWoM52WFGw USxQ== 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=b8hsVwB/unS7SxIBuwofkLF2AAB/0qbjzm0Q8VSmupo=; b=agbFOmLxYHnvScu1W+sog5ONznUqPPYAEq6v5gdivl6g3Dxl5b+VLBmBHPlj3rUyQK UgQ1U5VeDMrF57aR7wLKIqT2AmkRiUDAZAZ3csGZKgX+SC5QhZKiVbwWCjkBgTZBxrqg HvmusUfHvrsxBPVOUIpN5QUKLyWaT6N3qNdPF1qaNXhCeudGO6MLDUgov0nWImXb8aI/ 2ZW6zl+AcSyLLqnhlopG6aseLAWqPYXqak1u5IFrJV2iPt+0mR1KAY2FPXp9TUiBIKXS 6wkXuWbH1ianPPRM5nlDYsOM3J6ozg743H7jYeqv0lfSeo+3YKgxzap04RuwXeJMm2Tm XqQw== X-Gm-Message-State: AHPjjUg0ZXr+Dwk/NgKAkDcS997GrTS3x1qEJRJiQQI3+2VQvM7BX4X4 Uqwf2H3ZsZT1PwJ9+HSAqtHWnMZe X-Google-Smtp-Source: AOwi7QCnHEJcYXxmpi5Ok1o2pibZmnbKPePyfTaRHjjzPoeRQHalC9N6ykquA+ErwWUIHz7yg8CWOg== X-Received: by 10.223.143.110 with SMTP id p101mr6670872wrb.182.1506367693638; Mon, 25 Sep 2017 12:28:13 -0700 (PDT) Received: from skyhide.pars.ee ([2a00:23c4:7c83:f700:8c35:bd55:201f:6aad]) by smtp.gmail.com with ESMTPSA id s3sm11378155wrc.24.2017.09.25.12.28.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Sep 2017 12:28:12 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Sep 2017 20:28:08 +0100 Message-Id: <20170925192809.1379-2-atomnuker@gmail.com> X-Mailer: git-send-email 2.14.1.821.g8fa685d3b7 In-Reply-To: <20170925192809.1379-1-atomnuker@gmail.com> References: <20170925192809.1379-1-atomnuker@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/3] 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 | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 0d6612ccca..2d005f90fc 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,53 @@ 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].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'): { + AVFrameSideData *sd = av_frame_new_side_data(p, AV_FRAME_DATA_GAMMA, sizeof(AVRational)); + AVRational *gamma = (AVRational *)sd->data; + if (!sd) { + ret = AVERROR(ENOMEM); + goto fail; + } + + gamma->num = bytestream2_get_be32(&s->gb); + gamma->den = 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");