From patchwork Wed Jul 26 04:31:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4459 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp333799vsb; Tue, 25 Jul 2017 21:32:37 -0700 (PDT) X-Received: by 10.223.130.50 with SMTP id 47mr15909880wrb.145.1501043557805; Tue, 25 Jul 2017 21:32:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501043557; cv=none; d=google.com; s=arc-20160816; b=X6vnJXagHXPaJmhMk6lcTjQByK1iHV6mq/6jj3Mz4Tgy0CGwUjXItQ+FYdW3xQLE9d SeYIHz0PrG74Z4Z814OliPyUy9qQiA2B+gTZ67fmJmFKzKKHf708b/Q6eLpRJVMoa5ZQ AH18EpUbEg8HF0QMAm1BoQYG2c611nN5nePJvwk1gvE4RO1gg3doVWYke1kq/ANTV+Fl kiBWFbYeqFEiK5v+ls3UBuRMq04ZPIDv6RGQ4C+vlMYMYqlxDTIR0F4K/QGquJLx0qNn o/PZh0z+stitUd7nKtt9yoUSOCqdCnaOR+YzGsdl579IGPINV83cOmaaNaOEK4MpAQzs WUoQ== 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: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=JKpOdhMx34TzXSTo554OloyPEZNMX5PZovN0d4nxc+4=; b=ESikWMaCF0esp/EEsdX9RCwPwH2H8CFjfTX0cBWDfflOkEEvC59FaUQpfHFaWwyEOr hRuMmJVUxkdGkLvP3iOCHRsbTQkpX9usTChtljIKWJjTwkBMFltXZooYtKIsebPpoNsj yvR7tTje1bWriXLInDLNZ8I8roYU3/ux/seuWfcVILL4x3KuOPHcpMqbHmUahTrn7x2B eSy4EWuTbsFi9M2gI8a19r6eubIlG70t5JWbBFlCU8nJfhaJArXmggbwjyWNEcI6Ex/7 72IyI0Dcpz1el79wGYHpvPv3NGOjY3u0uh0eVVDCtlmtxEguheCV6g0hAR8BD4KBgRHB T+3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=c0rAmrUC; 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 t44si4592923wrc.248.2017.07.25.21.32.35; Tue, 25 Jul 2017 21:32:37 -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.b=c0rAmrUC; 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 3FF5E689210; Wed, 26 Jul 2017 07:32:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E5C568090D for ; Wed, 26 Jul 2017 07:32:25 +0300 (EEST) Received: by mail-qk0-f195.google.com with SMTP id v76so2913865qka.5 for ; Tue, 25 Jul 2017 21:32:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=N/RZSzR04miB3OTKLvOeYUFm71AgPQx5kDawN72FDdg=; b=c0rAmrUCbAdNh52ax7w2vgzSyRwf2RpPoRTLcZubrendwtZcG2X9MS8YC4rjDdO2QZ pmJrPKL0gEoHtzqjAbtpEL2j3N+WHCPHMoZ2QYz9Cr3e9YfWtjbhkz4MIy4WsEGn1sBf wUVkItB5VL2CdTUpFw2nMfi5GQnPLRESxVwT70EkxkfQmKDu3XDIfPi07R7jTMfZF7sl r5pzp/PFrUI9KJk2lE2qGcLd7lIe0PTDkEjz0RZsoW6E0CRfhKGkWy8HZYBCC/w+xPe8 oGZrgMMtCBInOOQwKg5IEHiQLiJZO0Mi5/gWZ+FGeti4eLqgy/gWcxzvkxCF3hqu6BTZ 4wzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=N/RZSzR04miB3OTKLvOeYUFm71AgPQx5kDawN72FDdg=; b=i/io+/wN/ysbFyOsOS9PpxIltHt0iwVveQI/lXIdopUQiQLm2tPMPg2fuwOKId8l+v zLJXEXx1dvZz5R+UP6MU8Uh/rGg3sVvJivhICmaqkxgayGEtw+gfpwrmLG2fyWOkbuay iZJ6tliTAbnp5L4waO1aHEuE+zGkkHmFu62tqwUuhsPtc8h5c+R5qajLaIeP+Y/cEegs tKIpsg/7vCvuqlkxcc+azK3AluPW8cnWaLn6OLSl07DTapHgmkpvdWgvmQzJR75Nbwlv yAnFCehhHDc9I2j556CBtSDYrwFDlPvx8rFXiYeoBDdN4+5/odmIyMQMo9CwVxSE48KU HiTg== X-Gm-Message-State: AIVw113DWSkF9zoAcMHgxslhtLPJ6zHQomrrhIM15FDCq3fowZnxpbRa rw6Bx1M6+rIqhOHX X-Received: by 10.55.48.70 with SMTP id w67mr26004994qkw.207.1501043544054; Tue, 25 Jul 2017 21:32:24 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id r19sm5559944qtr.25.2017.07.25.21.32.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Jul 2017 21:32:23 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jul 2017 01:31:24 -0300 Message-Id: <20170726043124.6296-3-jamrial@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170726043124.6296-1-jamrial@gmail.com> References: <20170726043124.6296-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/webp: add support for ICCP chunks 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Export the raw data as ICC Profile frame side data. Signed-off-by: James Almer --- libavcodec/webp.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/libavcodec/webp.c b/libavcodec/webp.c index a0d4d1812d..efa864a6f1 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -33,10 +33,10 @@ * * @author James Almer * Exif metadata + * ICC profile * * Unimplemented: * - Animation - * - ICC profile * - XMP metadata */ @@ -197,6 +197,7 @@ typedef struct WebPContext { uint8_t *alpha_data; /* alpha chunk data */ int alpha_data_size; /* alpha chunk data size */ int has_exif; /* set after an EXIF chunk has been processed */ + int has_iccp; /* set after an ICCP chunk has been processed */ int width; /* image width */ int height; /* image height */ int lossless; /* indicates lossless or lossy */ @@ -1381,6 +1382,7 @@ static int webp_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, *got_frame = 0; s->has_alpha = 0; s->has_exif = 0; + s->has_iccp = 0; bytestream2_init(&gb, avpkt->data, avpkt->size); if (bytestream2_get_bytes_left(&gb) < 12) @@ -1514,7 +1516,27 @@ exif_end: bytestream2_skip(&gb, chunk_size); break; } - case MKTAG('I', 'C', 'C', 'P'): + case MKTAG('I', 'C', 'C', 'P'): { + AVFrameSideData *sd; + + if (s->has_iccp) { + av_log(avctx, AV_LOG_VERBOSE, "Ignoring extra ICCP chunk\n"); + bytestream2_skip(&gb, chunk_size); + break; + } + if (!(vp8x_flags & VP8X_FLAG_ICC)) + av_log(avctx, AV_LOG_WARNING, + "ICCP chunk present, but ICC Profile bit not set in the " + "VP8X header\n"); + + s->has_iccp = 1; + sd = av_frame_new_side_data(p, AV_FRAME_DATA_ICC_PROFILE, chunk_size); + if (!sd) + return AVERROR(ENOMEM); + + bytestream2_get_buffer(&gb, sd->data, chunk_size); + break; + } case MKTAG('A', 'N', 'I', 'M'): case MKTAG('A', 'N', 'M', 'F'): case MKTAG('X', 'M', 'P', ' '):