From patchwork Fri Feb 23 13:58:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46486 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp994665pze; Fri, 23 Feb 2024 06:35:55 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUuLKO8ik8U1nU1agPyfNphfDZ4Rdsen3njsRevtl31fNgBb8Resuu0/Rf4zdp/4kjL/U9vThCZKrpM+rnCkxbAOhcb0jvNCL3gXg== X-Google-Smtp-Source: AGHT+IHXzciV5C0kS6TxyvNhL3cCNtmBEMKqywdsYbXdfmqxQhZp93fhYewTqBzoQXqivhAwEqX1 X-Received: by 2002:aa7:c502:0:b0:565:5ce1:280 with SMTP id o2-20020aa7c502000000b005655ce10280mr35300edq.3.1708698955456; Fri, 23 Feb 2024 06:35:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708698955; cv=none; d=google.com; s=arc-20160816; b=JICFyTDK6b/VpakhK2uErXbL4Vn9atfsp6bkMSO+9T4aG99kjUVQ5UISzWDCDvABPo 2V2C4ivDJoBgOKWb4PNdC4+OA7N3C11rD7ZcYF2Kjz3UDgkUtUT9Dh6aOeUrw70fmEOO JmPge2uz8HvQj5VnqPu81zaj+PGbzUbWdgP8YH/IQeGLmyNQYlXVXH5al9UKuGPew1yy Akav+HHOLrW6ZZOWs5H+nP4j3RlxL+V82s67pUJpIKeGYnQLGr2nrMWqTuDj/ANvYZFy a7jRl5XIrDSKdH9yErQb+b0ZU3u81QNmb0DkkAI7oIyACHH39qenfTqTaBl/vlmd4S8/ M8IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=Y5ObnE06Iw1zm11A8lEwP2XJK84yKCLPyuOIHowzi4E=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=iwVOraGJjoEbywp7mYsgZYrygIHf5UIfVAdMlVW/KxzyiqBSlKbSofaaf5LBJk5BQc xIKs14dXzCsJca3m2iL4Pr++0or/neJBb9+Bycs1RAYDeXd4vsYA/GIU9lHWgIQtUPVU Fdn46P2E7RBBmkuqFRYRTL39t8efSE20AvNGjih39NgsvM0y0hOYDZjZX+rL6tHCtRmH eDAZ88bPMMWDy8Q8ojx3RmcHmudRZov3FoZHGEuRqueSKHEdDK+nzzIpWGwkVpJny4SM ZsKVhhPwjVqLTXk9P8hkOFXRAgPtQhwHeoE7bUh0MMYkQpQbftFoupcVjVr2CCPCklKc 2sgQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=ZLLmPgqc; 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 t9-20020a056402524900b00564f9cfbf3esi2463427edd.204.2024.02.23.06.35.55; Fri, 23 Feb 2024 06:35:55 -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=@khirnov.net header.s=mail header.b=ZLLmPgqc; 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 351E668CBDF; Fri, 23 Feb 2024 16:32:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38B1D68C5EE for ; Fri, 23 Feb 2024 16:31:36 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=ZLLmPgqc; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id C765B4D64 for ; Fri, 23 Feb 2024 15:31:34 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id hErfsOvaGn1M for ; Fri, 23 Feb 2024 15:31:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1708698688; bh=pVG5oHMAOiVSxlX9abUs9QVjHky50WMFO4ncQI0sOXI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZLLmPgqc3PtMaBJrO8A9/vVwCRkd7iDr0O5tkExHBd/0RCt+r5H24PglqpE01IWmT EYBDPMPR03GmUjtoAkOH2USZaTRiPjjwBuITRk/GOiU4e+Ye98ARQ7/2GouwOS/iRg 6Yc32E0vvqF6Z+uOPHRt/hVHjwaSJrSa4R5HNJuFfwMoPSnar78kOwDTKrvRjFI1Rb jood9juAV3ocT7OWITFC3GRjsEtUhvGntlCmDyxjFXHUWPTeaPuQK/m6jlFUPZLjrZ WMzv34wEMF7Z8rrPl/bfP8B9MkSh3+thhHOt/lg5oWGYGurUtTP0oL0HQqZqAM31BS Hb4phIHgD3MLw== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id D2E734D56 for ; Fri, 23 Feb 2024 15:31:27 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 19E8B3A25D3 for ; Fri, 23 Feb 2024 15:31:23 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2024 14:58:49 +0100 Message-ID: <20240223143115.16521-28-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240223143115.16521-1-anton@khirnov.net> References: <20240223143115.16521-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 27/38] avcodec/pngdec: respect side data preference 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YJtcTKaBPL5G From: Niklas Haas --- libavcodec/pngdec.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 026da30c25..8f409c74b8 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -660,6 +660,7 @@ static int decode_phys_chunk(AVCodecContext *avctx, PNGDecContext *s, static int populate_avctx_color_fields(AVCodecContext *avctx, AVFrame *frame) { PNGDecContext *s = avctx->priv_data; + int ret; if (s->have_cicp) { if (s->cicp_primaries >= AVCOL_PRI_NB) @@ -678,11 +679,15 @@ static int populate_avctx_color_fields(AVCodecContext *avctx, AVFrame *frame) avctx->color_range = frame->color_range = AVCOL_RANGE_UNSPECIFIED; } } else if (s->iccp_data) { - AVFrameSideData *sd = av_frame_new_side_data(frame, AV_FRAME_DATA_ICC_PROFILE, s->iccp_data_len); - if (!sd) - return AVERROR(ENOMEM); - memcpy(sd->data, s->iccp_data, s->iccp_data_len); - av_dict_set(&sd->metadata, "name", s->iccp_name, 0); + AVFrameSideData *sd; + ret = ff_frame_new_side_data(avctx, frame, AV_FRAME_DATA_ICC_PROFILE, + s->iccp_data_len, &sd); + if (ret < 0) + return ret; + if (sd) { + memcpy(sd->data, s->iccp_data, s->iccp_data_len); + av_dict_set(&sd->metadata, "name", s->iccp_name, 0); + } } else if (s->have_srgb) { avctx->color_primaries = frame->color_primaries = AVCOL_PRI_BT709; avctx->color_trc = frame->color_trc = AVCOL_TRC_IEC61966_2_1;