From patchwork Mon Sep 23 20:43:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vectronic X-Patchwork-Id: 15236 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BAE38448F7F for ; Mon, 23 Sep 2019 23:51:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 99677689E77; Mon, 23 Sep 2019 23:51:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2F516882F7 for ; Mon, 23 Sep 2019 23:51:22 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id a6so11462116wma.5 for ; Mon, 23 Sep 2019 13:51:22 -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 :mime-version:content-transfer-encoding; bh=HvcEJvc9j8ZVeiKTJDZaSxmyKwwkjyOnHAcXhuaZWqY=; b=HjaZdjVV6/qiT+W7DD/lZvZvR6NdLCuicUvp+4ALeMU/6/BYf9ssszkvPAck9QNPnd XWmRx5c2BjB5806p5Agz4YIdnJropueqg6gk4YhW5FTHAYT+tA0pYFKWxkdp4TCGlOWg c5Es6FuCGFhznRUIw5tQkdbK4oUYgBaP1WnbQFcy6DKgUgJVgsEDtGqRLJ8BFMaLnejH ovcJ1jwpq5jAZXHtgfDrMF9HPMUq39NcOwspU060bkkdvVJM7Is0q3iW3pcmH0EQznOD qfPyh2SMLTqeIvQazhcQF5IJ16rIhvuVCHs5BOdgA7UrQWuSeGqOmEpRZJEOZ4+FT18h lvcA== 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:mime-version:content-transfer-encoding; bh=HvcEJvc9j8ZVeiKTJDZaSxmyKwwkjyOnHAcXhuaZWqY=; b=Mq+hMAqRm0nPqPgQnVyoTPUQ8Eoa0Xq0TgvnDnkbNLIiKFC8L2VTkFnP5cUbsY02z5 Q+23/CB5NTkLfWxoXZ61csIzeZf+IM+87Ei6Ot67JI0wYvkXAhgOoC55dJanlxf5sWlq 4i7JL74FSDD27/YYB3La3FV3kNo3uTxHQjL0NSVmBPXi7ZAMr6za0czlNX49CSSw/q1U kL42JxuyPCC5G0J6QXh585KCFtJiDh13SjADAYQzsxsdD8qLNGSWbIYyfXu/l14XP3ET QO9XnxpBdpiUaSio4aLdTrrNzG9aNueXq0A5deie8x86HNr8wScCoDkMz9mVV+ROb56h QkPA== X-Gm-Message-State: APjAAAWhAk+C0psudzxYxwWSRqi6hPXMDrXr4b+Y6KlqNgvzJuvZUdz1 YaipxXY19aoPwGbsRo7LZY4HKV4gm8I= X-Google-Smtp-Source: APXvYqwisTAmFvOU+K/zn3WgnCSE/ht5VTV/7bTyPvIKTaJ5wnCZiBTsB8bxfh8kV4nR8oYt1J/2hQ== X-Received: by 2002:a1c:5fd6:: with SMTP id t205mr1048355wmb.124.1569271394863; Mon, 23 Sep 2019 13:43:14 -0700 (PDT) Received: from mechagodzilla.chapatronic.net (cpc76904-dals22-2-0-cust471.20-2.cable.virginm.net. [81.106.45.216]) by smtp.gmail.com with ESMTPSA id x6sm17664592wmf.35.2019.09.23.13.43.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Sep 2019 13:43:14 -0700 (PDT) From: vectronic To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Sep 2019 21:43:02 +0100 Message-Id: <20190923204306.96618-2-hello.vectronic@gmail.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20190923204306.96618-1-hello.vectronic@gmail.com> References: <20190923204306.96618-1-hello.vectronic@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] API: add AV_PKT_DATA_ICC_PROFILE to AVPacketSideDataType 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: vectronic Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: vectronic --- libavcodec/avcodec.h | 6 ++++++ libavcodec/avpacket.c | 1 + libavcodec/decode.c | 1 + libavformat/dump.c | 3 +++ 4 files changed, 11 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c91ee4af5b..7d341f85a6 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1407,6 +1407,12 @@ enum AVPacketSideDataType { */ AV_PKT_DATA_AFD, + /** + * ICC profile data consisting of an opaque octet buffer following the + * format described by ISO 15076-1. + */ + AV_PKT_DATA_ICC_PROFILE, + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 858f827a0a..efcc167d12 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -394,6 +394,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_ENCRYPTION_INIT_INFO: return "Encryption initialization data"; case AV_PKT_DATA_ENCRYPTION_INFO: return "Encryption info"; case AV_PKT_DATA_AFD: return "Active Format Description data"; + case AV_PKT_DATA_ICC_PROFILE: return "ICC Profile"; } return NULL; } diff --git a/libavcodec/decode.c b/libavcodec/decode.c index a9ea5a51e6..ee12dd0129 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1750,6 +1750,7 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA }, { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, { AV_PKT_DATA_A53_CC, AV_FRAME_DATA_A53_CC }, + { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, }; if (pkt) { diff --git a/libavformat/dump.c b/libavformat/dump.c index 56814ff7d2..220f404d65 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -446,6 +446,9 @@ static void dump_sidedata(void *ctx, AVStream *st, const char *indent) case AV_PKT_DATA_CONTENT_LIGHT_LEVEL: dump_content_light_metadata(ctx, &sd); break; + case AV_PKT_DATA_ICC_PROFILE: + av_log(ctx, AV_LOG_INFO, "ICC Profile"); + break; default: av_log(ctx, AV_LOG_INFO, "unknown side data type %d (%d bytes)", sd.type, sd.size);