From patchwork Thu Jul 28 14:50:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 37023 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp326604pzb; Thu, 28 Jul 2022 07:51:02 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vitypBh7BfvCc+rAHIIr7+yDiEqOj/4Ih4ob/9tRCHaUYudK4XCN/0Zn5QKZQeaKZDbnrN X-Received: by 2002:a17:907:94d1:b0:72f:10c:bb3c with SMTP id dn17-20020a17090794d100b0072f010cbb3cmr21102940ejc.532.1659019862350; Thu, 28 Jul 2022 07:51:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659019862; cv=none; d=google.com; s=arc-20160816; b=ijxFI7NVihrss/zfURVcSHRfhD5Gmr6IqnmMf+eOUCHuoBZKS4K+iFzxl0yClRSn3c EZQLwjg94wsa0vtL+kS6oz6I3PoUT5DnYe4elSHYOISm2FhaFu0J6hWup/fiOrUW5sZE GP8Ewdm48cOJ1vLz3jzrQh+UlFvajCpxdT517LGZ88D35wNUiISTnaE57SBdw0yk3lYf zsRtPV9LKzuiLOxU5fBX8PadJEciO2XU0aj+hVZ/ubWnJ+2dXUhnxBwiRX9Psv8FA4wz FYvdIVOLEv4Vh+DhzKperGs6oSNK/REVNJRIIamGFrVq/AsKd2pRsqwU3qXBe3uXbYp/ IFKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=cIpTxC6Th/EfcRPrZImAwn9Lwdx6vG9jNipyHD5wbdM=; b=XI5TDXqzJUyMpNDbPq7BA9C5u9eIT9tL6lszjGmjA4XZaB8jJxCN7jjcZI3W3OPBLe iesp5rVhq+SfvW6jNZorOIA81R+tR4FAKQNfhGbW8c9UzZ+kCoSmIhIfWdQhgLCIwxTb zn69cVWOdkkjQ0Gn3u+MC0QgnDiTjVUlfgRfyDhyXIygwvuX85TOcnarUmX+KarcTLFA LDW9RKdeB501fT5eIbd+mtB2o+gLKLhq0luauByoDRO1BsVrsEw3mkPESYjMEr0R+wUM j6f72EV8q+03E973wMD9qdQp6vXXk1U2ydCCbhfVLD2JUCbDSiwvqQmYCCPoqYIckkDE QIqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=bUYRjT3Y; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dn20-20020a17090794d400b00704dc5420adsi954339ejc.38.2022.07.28.07.51.02; Thu, 28 Jul 2022 07:51:02 -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=@haasn.xyz header.s=mail header.b=bUYRjT3Y; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B05C68B9DC; Thu, 28 Jul 2022 17:50:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2907F68B9A6 for ; Thu, 28 Jul 2022 17:50:12 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 4BF834AAF8; Thu, 28 Jul 2022 16:50:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1659019807; bh=hMLzAeafXOLsxjCxKHs6OfrRPBp3s6Tt3Q9/28blPfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bUYRjT3Y7IsTaV4WdE68phM8AZvIZh9j3s/IE20iwMEW8699YEFX5TmcffFaFuqQF P9IXWIPjrEmO0kST3uUtgfBoVRF2FiGzaw03dhBCit1ZA7zICV9bqbVsNgsVftCCye SRjkHJfZL31Kd3yFfeSmBK3ryWZPyWWE78IKCEIM= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jul 2022 16:50:00 +0200 Message-Id: <20220728145002.102600-6-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728145002.102600-1-ffmpeg@haasn.xyz> References: <20220728145002.102600-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 5/7] avcodec/decode: parse ICC profiles X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: i30rZhVLLYfM From: Niklas Haas Implementation for the decode side of the ICC profile API, roughly matching the behavior of the existing vf_iccdetect filter. Closes: #9673 Signed-off-by: Niklas Haas --- libavcodec/decode.c | 61 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 8922222271..92958745df 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -49,10 +49,6 @@ #include "internal.h" #include "thread.h" -#if CONFIG_LCMS2 -# include "fflcms2.h" -#endif - static int apply_param_change(AVCodecContext *avctx, const AVPacket *avpkt) { int ret; @@ -508,6 +504,54 @@ FF_ENABLE_DEPRECATION_WARNINGS return ret < 0 ? ret : 0; } +#if CONFIG_LCMS2 +static int detect_colorspace(AVCodecContext *avctx, AVFrame *frame) +{ + AVCodecInternal *avci = avctx->internal; + enum AVColorTransferCharacteristic trc; + AVColorPrimariesDesc coeffs; + enum AVColorPrimaries prim; + cmsHPROFILE profile; + AVFrameSideData *sd; + int ret; + if (!(avctx->flags2 & AV_CODEC_FLAG2_ICC_PROFILES)) + return 0; + + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_ICC_PROFILE); + if (!sd || !sd->size) + return 0; + + if (!avci->icc.avctx) { + ret = ff_icc_context_init(&avci->icc, avctx); + if (ret < 0) + return ret; + } + + profile = cmsOpenProfileFromMemTHR(avci->icc.ctx, sd->data, sd->size); + if (!profile) + return AVERROR_INVALIDDATA; + + ret = ff_icc_profile_read_primaries(&avci->icc, profile, &coeffs); + if (!ret) + ret = ff_icc_profile_detect_transfer(&avci->icc, profile, &trc); + cmsCloseProfile(profile); + if (ret < 0) + return ret; + + prim = av_csp_primaries_id_from_desc(&coeffs); + if (prim != AVCOL_PRI_UNSPECIFIED) + frame->color_primaries = prim; + if (trc != AVCOL_TRC_UNSPECIFIED) + frame->color_trc = trc; + return 0; +} +#else /* !CONFIG_LCMS2 */ +static int detect_colorspace(av_unused AVCodecContext *c, av_unused AVFrame *f) +{ + return 0; +} +#endif + static int decode_simple_receive_frame(AVCodecContext *avctx, AVFrame *frame) { int ret; @@ -528,7 +572,7 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) { AVCodecInternal *avci = avctx->internal; const FFCodec *const codec = ffcodec(avctx->codec); - int ret; + int ret, ok; av_assert0(!frame->buf[0]); @@ -542,6 +586,13 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) if (ret == AVERROR_EOF) avci->draining_done = 1; + /* preserve ret */ + ok = detect_colorspace(avctx, frame); + if (ok < 0) { + av_frame_unref(frame); + return ok; + } + if (!(codec->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS) && IS_EMPTY(avci->last_pkt_props)) { // May fail if the FIFO is empty.