From patchwork Mon Mar 4 13:06:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46774 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2791248pzb; Mon, 4 Mar 2024 05:11:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU+rhCcqkUb+iaKHODrMjA3O7kV0zcDZTwONeD/TmOb8HAg4jQdpvNp1C7dsXm0eh0dJ2p0NwQ8wwofpldlneZNukh7IQ4+99n5oA== X-Google-Smtp-Source: AGHT+IGDhZy3J+v443iRHb6tWJhkxiXmNE7LdkecKqi37/1QUh9yA2JGG7FqKUBIDQ10zK+TVr4W X-Received: by 2002:a17:906:d114:b0:a45:1787:aee1 with SMTP id b20-20020a170906d11400b00a451787aee1mr2808899ejz.14.1709557902348; Mon, 04 Mar 2024 05:11:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709557902; cv=none; d=google.com; s=arc-20160816; b=bDqa4Eid8vvT644cmsLtDbAfxaFVOoHzEWzVbtWynXVqYjkRV9+fp1KiShPllE5jxq 002QxD2zP32Al6VG2En6hXdwdZiPUWjpb78/2XYB9ZD2gC+AmvqToNNUD9zIJrvuTfe1 O59zMCeqAA5fNOf2+0qOLCWUY8kve9YJu8MiunNskc3KU52l6GCoCWV+PFo19AG8grOC 40T/JH/pepIcKP1qy/JHzvut+kCgVw2E8feC8XsS3ot65iDfxNTmNecNg4Kyt4Lc9pzS 6mNSfz1imNMeKGU5fOE58J7gDvpT07gw8e+TcgRy3LpkypynzM2kNiJhfirLF/2xACl4 97Rg== 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=9rCi7oXBDf2OgRVDArHDHZOpyR6CCKn9SIrEY/2YMi0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=RP2Mj5vWv+DQzRQ6OrBeDfIKk0yQhmXXmEjHG6BrHxI6GPc5kKvPNBjW8/X2uqFSUC YtIiVHnxnmw5hO6W2E79DcuadE2iVsYe2UHVCkwj+L3ADc/cl1WgDry5DH9jABll5sjE tjCnivYnhxNDynTNW8t2fVFdwvKQR4nHsyiE3iAEV4JQWAKBNryMHXesP7Wzm1j40lHR 3MiM3jDTucwcI0qvHgB12bPgX9ki4P8M+nmBBMDQQlTonmYqqah8bPetq231IwBWkm4P BnPEHd/9DhbhiC6jGoILEZyJpzwRktWuYdO8u5L0kjnaBtRDbtdPvqDbym2iat+9y1MZ SjhA==; 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=hIvImVnW; 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 kl13-20020a170907994d00b00a4581ea669fsi192790ejc.794.2024.03.04.05.11.42; Mon, 04 Mar 2024 05:11:42 -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=hIvImVnW; 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 311A968D4DA; Mon, 4 Mar 2024 15:07:42 +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 C923968D451 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=hIvImVnW; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 895964D79 for ; Mon, 4 Mar 2024 14:07:12 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id RsDbNMY3dhC7 for ; Mon, 4 Mar 2024 14:07:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709557627; bh=tgdk/gGqyYTAocBW3OwID5r4auLUu3OhEhePApN3bHg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=hIvImVnWH5Y4cDbRaf16hiXyDREElJzYEBQJLAz9DX1lloNU/DEW/ebIWlk2Ztwng 7H9K7YeZiVIR4BTiRb2Ps/Vy5AlrOnDdY9sH9UupsErdkRf20eBVCUEvxI3kPGcr3x 6d+KYvwEyy8024bR4bX9n8gYB02kiJUd0pHVcX6DmxFCKw5M4dUdox/VmDgKFHV99A 3INMLoTsfxfQF6CMwhUeDtpumHy6t3WpXcgRdjCIZnpzNmd/0zD+FHxELvRu92BwHC EbwO2zTw15Krs02xTR+0A6fmj5ButDulx+M7NKqPkXgDfxnq01ijqi4ArQL0Cs1sKW 4Asxf8W2oLjQA== 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 A28814D62 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 97CD73A157E 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:31 +0100 Message-ID: <20240304130657.30631-16-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 16/29] avcodec/mjpegdec: 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: i0Gb1X6xYpMp From: Niklas Haas --- libavcodec/mjpegdec.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 81f724d230..43b36d0a8f 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2840,16 +2840,18 @@ the_end: for (i = 0; i < s->iccnum; i++) total_size += s->iccentries[i].length; - sd = av_frame_new_side_data(frame, AV_FRAME_DATA_ICC_PROFILE, total_size); - if (!sd) { + ret = ff_frame_new_side_data(avctx, frame, AV_FRAME_DATA_ICC_PROFILE, total_size, &sd); + if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Could not allocate frame side data\n"); - return AVERROR(ENOMEM); + return ret; } - /* Reassemble the parts, which are now in-order. */ - for (i = 0; i < s->iccnum; i++) { - memcpy(sd->data + offset, s->iccentries[i].data, s->iccentries[i].length); - offset += s->iccentries[i].length; + if (sd) { + /* Reassemble the parts, which are now in-order. */ + for (i = 0; i < s->iccnum; i++) { + memcpy(sd->data + offset, s->iccentries[i].data, s->iccentries[i].length); + offset += s->iccentries[i].length; + } } }