From patchwork Mon Jan 16 12:09:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 2224 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.84.70 with SMTP id i67csp1275329vsb; Mon, 16 Jan 2017 04:15:44 -0800 (PST) X-Received: by 10.28.69.91 with SMTP id s88mr11365155wma.18.1484568944687; Mon, 16 Jan 2017 04:15:44 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w2si6690634wrb.207.2017.01.16.04.15.44; Mon, 16 Jan 2017 04:15:44 -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; 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 D453D689A6B; Mon, 16 Jan 2017 14:15:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48CCB680387 for ; Mon, 16 Jan 2017 14:15:14 +0200 (EET) Received: by mail-lf0-f67.google.com with SMTP id v186so12364431lfa.2 for ; Mon, 16 Jan 2017 04:15:24 -0800 (PST) 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=u2twaOiu61jP/aACeSWFZKRfhaqprg0+9oFXkjQEjZY=; b=TTgNxy1laBi/iEDEA9csZL5IwT0Y1fMcyKi2Rdmtk7zuDZ5RlzzAe+EzkIvbC+a8zX 5VhyhaZNBIFQW9rtbB1iu8sodzivMfYPx6zrOk5b4yakOmcYDG/a3vb/SwzudvaPJf47 nBJHNRWqhkgbz7quKJiX+xU2IHHPPQv1ftY4kSVoVv2RhViCtesQWslHuBaOD4n26Lrs 2o4Aubc4M47QetF1058ZEk5iU+cIO6waJnpSHPi9/hU1yMXDaGZ71A2k+QeOsG1ynoUL hQrYdtblT8F5k90S12RdrQLFQgPKZvXe1YNei4sFmGLGIyixjFDabEYQlIoXMc131w71 M8kQ== 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=u2twaOiu61jP/aACeSWFZKRfhaqprg0+9oFXkjQEjZY=; b=PrUCSKcepIhE9KQVoWwdTWZQE0jVrIvf92jqCno7b+jEJf/+9K1l4C+D3R1CwWbNJ7 +nCeUwgxMi/np7IEZhRK3q6L5hMEHiPCp3Re9Fmbmh3Yjwf4SR8tSsG6WmO/LNznOVdP woOmbWoUwgp0jKG1ZBzUJH5wPP3MgQh7wvc0CZVSDku2Y+e6j9LDB15grbn2IKYLYtiv I3cy+qFK006OH91Plu8frQOP/ojW4emd3zxbixW+TfWOxg4B2pnWYtteMsySPTNBR1qU AGeGmu4OL8R2vy3iDoWI39UUG/HdLGhlU2+WXIn1jqKNhFE+ylAizbbTZp0IX2zzcTQX Z9Nw== X-Gm-Message-State: AIkVDXKPtN73mMbkgU1+eWh2hid8/SZ482F7P1uPP8ABoOSTEnc8bJGBa2y3WFzEnxnMAw== X-Received: by 10.25.32.149 with SMTP id g143mr10036356lfg.7.1484568572967; Mon, 16 Jan 2017 04:09:32 -0800 (PST) Received: from localhost.localdomain ([37.244.231.82]) by smtp.gmail.com with ESMTPSA id v26sm7048600ljd.9.2017.01.16.04.09.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jan 2017 04:09:31 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jan 2017 13:09:17 +0100 Message-Id: <20170116120917.3973-2-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170116120917.3973-1-onemda@gmail.com> References: <20170116120917.3973-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/exr: export writer info into frame metadata 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" Signed-off-by: Paul B Mahol --- libavcodec/exr.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 0c2e5d2..034920f 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1303,8 +1303,9 @@ static int check_header_variable(EXRContext *s, return var_size; } -static int decode_header(EXRContext *s) +static int decode_header(EXRContext *s, AVFrame *frame) { + AVDictionary *metadata = NULL; int magic_number, version, i, flags, sar = 0; int layer_match = 0; @@ -1577,6 +1578,14 @@ static int decode_header(EXRContext *s) } continue; + } else if ((var_size = check_header_variable(s, "writer", + "string", 1)) >= 0) { + uint8_t key[256] = { 0 }; + + bytestream2_get_buffer(&s->gb, key, FFMIN(sizeof(key) - 1, var_size)); + av_dict_set(&metadata, "writer", key, 0); + + continue; } // Check if there are enough bytes for a header @@ -1612,6 +1621,8 @@ static int decode_header(EXRContext *s) return AVERROR_INVALIDDATA; } + av_frame_set_metadata(frame, metadata); + // aaand we are done bytestream2_skip(&s->gb, 1); return 0; @@ -1631,7 +1642,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, bytestream2_init(&s->gb, avpkt->data, avpkt->size); - if ((ret = decode_header(s)) < 0) + if ((ret = decode_header(s, picture)) < 0) return ret; switch (s->pixel_type) {