From patchwork Wed Jun 29 10:12:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 36527 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp207173pzh; Wed, 29 Jun 2022 03:13:58 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s3rTlYr5BP9ehCbl+kZPVATPngTmdcAGEACtTbabDyhqRqezXoROGVdFJzhBcYr34rwZdk X-Received: by 2002:a05:6402:2743:b0:437:d467:4a57 with SMTP id z3-20020a056402274300b00437d4674a57mr3176157edd.235.1656497638755; Wed, 29 Jun 2022 03:13:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656497638; cv=none; d=google.com; s=arc-20160816; b=C1MaHhW3GdtNOxT6y4YnakRHApnMW9oMQ6dPzz2YTJGEpiTu1AqispHaGGGZt5F76g e+SHyhDN7PPMbGoBmbUjU3cc0sqvlicjMDJBYXduL2PUi+jZIj/LG4h+YOsAczOnkxfm OMS770RluCMx68rL4+xxL6S2TgZ0Hvu5cERXIod/Yq5AIfs3erJv4mGApNkIsw2n1UXh gYVLttdeouE9jBsIKdGVW8BENpJwtceJogewKdHeJbafA0DIM4UFz0cTksfxAke6ciuI pg+sNa5iMkKgWkhnIXJGFD5Zq8t5SLaYoYY1aXhvitBtBy1teNisnuelSFt4jTzNr1nZ ZCtQ== 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=HwnaEoCA+STvEPZyk8cS5dkjn3uqZj3/97u77FdcnLQ=; b=jCUWOzCULx26zgSEzZ1OB1U6xz2N/lLoXrkW52dQ6CTAkrwzcw5avkAO/279hm/bET ujRNM9qUmShcFeMTHBmYxE8vj9dtVUGRHwPLQDkLdhGCXpuXQZVWpgWaRy00gkTaAF5a 4IkDBx/QR8PWlBjdNocjuYT/wOIorYf6AdCJLBtRly1awAVXYYgoJsb/U4zCkvhxTu7U PWpm7aEY0NNmxMus4ZmtsvJQb3amhcXInNtLh8QgCK8eUySpTfDVwjG4BvBMxfFDtnHm q5u24g/bl+cQELerWM9ZomjfcQduUHxeyA2IcEu4LZtcLjG9JsZWeS/TIeSQS0BWpgef tGVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=aAERpOMi; 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 hc39-20020a17090716a700b00711da366315si1097690ejc.717.2022.06.29.03.13.58; Wed, 29 Jun 2022 03:13:58 -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=aAERpOMi; 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 A876A68B74E; Wed, 29 Jun 2022 13:13:08 +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 5CFF668B6EA for ; Wed, 29 Jun 2022 13:13:01 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id BEAB24A7F3; Wed, 29 Jun 2022 12:12:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1656497578; bh=+xt5UOJPIdZ7NhtmtaQcLpwIIkd+qYvKhYL3k3PsuME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aAERpOMi5OBqdBqEMZwrjQb5bkqaM5MR+FfNiGthkDhdJqktQExigZ8P9ZiHDDU7g qodabIVLFobhTN9oBIhy1/5yOJnp1ibsuE2v3T4jKJUNm3GdeWTc/2UWw8s+niOPNn XF7yuDnnOAz3PTebzLlLe/N3On8d0hcPHw7mHMrg= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Jun 2022 12:12:50 +0200 Message-Id: <20220629101251.13236-6-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629101251.13236-1-ffmpeg@haasn.xyz> References: <20220629101251.13236-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/6] 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: 3p3h2QtjZ/t5 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 d1414c599b..e81a7fb4d5 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->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.