From patchwork Mon Mar 4 13:06:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46763 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2790118pzb; Mon, 4 Mar 2024 05:10:00 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUPbVwq+kj90HMlhcub1me4ssaQF4XcCwd1NHxeMdlEodQ+imvfZWclQzEvyFScBi4GQ4qvFMT8tR+ZyOU6o/MU2UlXn66EnnD4IA== X-Google-Smtp-Source: AGHT+IHpevGnX7iaaHmuXfG7nWsW/RsmenWrKPdha5iu+nMS4qsvnjF0oyw6v7/QCTgEP05ah+w+ X-Received: by 2002:a17:906:16ca:b0:a45:62bc:6a0d with SMTP id t10-20020a17090616ca00b00a4562bc6a0dmr1226159ejd.31.1709557799884; Mon, 04 Mar 2024 05:09:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709557799; cv=none; d=google.com; s=arc-20160816; b=i9WDmGju2sROBlC7GqxRwA9PbBdUto0nTgoOsqfQkewqSZm5CnMdr4eN91tpZUh2ES Il0FtQE0wQ0VSdVZABHTSbwr7oayusIZ3yLf1gwrtTxNaBt9l4c9hNtKE0CnkHNXavxK UTJSaz0BCXmkXnh/G5y1KILqMvHe7OybBhjrpZdAJlZp9giR860JU9/bEARkNiAY5Qv5 MvkxW5wInv5ptizXU95avdBXiB9Vhx5xKXbCeCxIxfrk4St4r+qBItEP37C8XLzp9jvc phpSTkYj+MpqfkaYJfm/JCN67pufDQp7rfx50looTI7+jKvwJzu5WBsknxy0/a5YNe5Y sMNQ== 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=mLjNayGOoHuOaVMtDJetcElf5qswyC9XDzGCme+HHyg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Eo3vkt0n/Ob1NzoJO2I3BAggjdn8jQ7U0NwDCYUVIKp+e2s6ZeKZS/5E8IudLxX9I5 qWq9UOk35UT/xwphgRjntaCjabaab0gw44PvloP4rS/onM9TuZtrqgWmiG/sW5RXVH2Q gWJAm7aHK9oy+SHX4lRo3WQdUv0GdHAiAEnZaXHlcEW+YvaVfcg55vblgCoqNt7T2L+S RURdboaQlydMWW+IPDFY40dEmAKrt70O6ioXgKYfuvotCosr6XMJp1RGuAISDV4nKk4G PDAI0LKEKJnqujgAIy8XZKD+By9f1Y2xwEPZCG0pcEj9OLcK8wdeqYHi4mWcY9gIe6sA rfhA==; 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=eXsu4RuG; 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 6-20020a170906310600b00a4555d792c6si699945ejx.695.2024.03.04.05.09.59; Mon, 04 Mar 2024 05:09:59 -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=eXsu4RuG; 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 65C7368D49C; Mon, 4 Mar 2024 15:07:30 +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 8184F68D42B for ; Mon, 4 Mar 2024 15:07:14 +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=eXsu4RuG; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 2BFC04D5C for ; Mon, 4 Mar 2024 14:07:10 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id s3FxpK1ZHKO2 for ; Mon, 4 Mar 2024 14:07:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709557626; bh=9T0rIEOgnQqkMrDJmaKHN5Ao8NovfyVVglUps8oVxtM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=eXsu4RuG+jEO+y/fxmoC3krKqyiYgM0aBH+inwv+553KDM6vBxm7WRj3ptGz5XZuM WahEKc3uMyddfzsLQs61iAaUJARGKARjK20lTJB6WgBTMmDklUw6u46BF++pnM64Kj RndRFOXDHNCTI47kd4e3Fj9mlZsaxSs0fGBOeB4VZPMTlDqoPhZmcBmSDYs6d+CjoU hjAA03v5K0jY8He6jU5u056FjM+i9lJFVlK/pbijA9kclX9AOucGIRZ1CZeF/bm1cI ijtV4/2+BrFdKq1WfqwqMerKdVcARYfLVfo16sxO1Cb4gMW2Ivzl1vfKMgHsNfBIhZ l7ZqlA58vnPdg== 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 A2CD74D69 for ; Mon, 4 Mar 2024 14:07:06 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C6E593A15C7 for ; Mon, 4 Mar 2024 14:07:00 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 14:06:35 +0100 Message-ID: <20240304130657.30631-20-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240304130657.30631-1-anton@khirnov.net> References: <20240304130657.30631-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/29] avcodec/webp: 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: iOvA4as5pgzZ From: Niklas Haas --- libavcodec/webp.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 54b3fde6dc..9308ea2b69 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -1500,11 +1500,16 @@ exif_end: "VP8X header\n"); s->has_iccp = 1; - sd = av_frame_new_side_data(p, AV_FRAME_DATA_ICC_PROFILE, chunk_size); - if (!sd) - return AVERROR(ENOMEM); - bytestream2_get_buffer(&gb, sd->data, chunk_size); + ret = ff_frame_new_side_data(avctx, p, AV_FRAME_DATA_ICC_PROFILE, chunk_size, &sd); + if (ret < 0) + return ret; + + if (sd) { + bytestream2_get_buffer(&gb, sd->data, chunk_size); + } else { + bytestream2_skip(&gb, chunk_size); + } break; } case MKTAG('A', 'N', 'I', 'M'):