From patchwork Mon Mar 4 13:06:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46767 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2790530pzb; Mon, 4 Mar 2024 05:10:39 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWqmkV+dvskcN52CAtoCC1UNP2X51yMnnugcBlmzil+SwElKUhZiTaAVKKq3Qr3dm/uaMIa6csyXVqReYUxk9tRpdxXIanatObnvQ== X-Google-Smtp-Source: AGHT+IENGTLWnzTUXG4gayi6Ww444c8MPkRbocttK4JGasYZqTIsuf6I3nMHqNOz4r33NUU0L6dD X-Received: by 2002:a17:907:11c1:b0:a43:4ce5:db5c with SMTP id va1-20020a17090711c100b00a434ce5db5cmr6464688ejb.16.1709557839101; Mon, 04 Mar 2024 05:10:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709557839; cv=none; d=google.com; s=arc-20160816; b=akjnQF1NuMFPJfVqk5NE0f9SualV8u/opMEVDsveJ3hI4tN2LTRwMQT1jpjMbhXsaK 3efM5mXVacdFAug6+OqxjLJ8VnanrQkrGztYUC7zustSSUkU6DQRfBxaxGDZMN31yRco 7WqOIk9IFUwgYdIrO5enpRyM58LdOIaW1rRv0JZZEqcQXWdZ/to6/VAeyFkwVsG/p+n0 /e6hcNTHQb0xxXC3j5Uv/TsnIVa/CLzxI93d7+nBTpdt5KltIHbNS0ZNK7zaZ5rynMLQ ajyvxgQgWCVC1zLShH5hj64PgFc6bJAfFVuUQQkOxFdVIEho/LoPUHcUk9AKU5nXvD26 ezqg== 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=wN3M+W1ZszJKnrD1yVwmR1j5yepeGwTvA8AbktcKATc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=URPpWiPUO5hOCb4Cblake6E76L83r/pw8EzG6boaG7yBq08lgGldhxcoZNnW3OCspk RWoFGPR58kkSE7yUshXf0UXJ9lu6YeBw3D1r3bpr1Gf94ECEp0IIyjESSuMVknWtROm6 86u8DjinWLbpLYOe0E7M+ex7rOmYw917/ZR3xMY4qhDmgNQWgjE3UDNWpa5CjdtEXJRz u969KZT2/pi6JzowWpblvil83dOgj3worH4shKu5Q9iwfyrwz943URshdpTHLYJbZOGR gqBbYsf6ayOKPQALmUf5C58DWNTew1qsbuQSwgZn4MAL1AjMovZ60r1Jq+ziUmb9pG1I Zf6A==; 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=lPGH9Etp; 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 w3-20020a17090652c300b00a43ecf0b173si3929706ejn.762.2024.03.04.05.10.38; Mon, 04 Mar 2024 05:10:39 -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=lPGH9Etp; 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 7901168D4AF; Mon, 4 Mar 2024 15:07:34 +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 8C9F368D436 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=lPGH9Etp; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 252A44D72 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 O_cc2DM5lk43 for ; Mon, 4 Mar 2024 14:07:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709557627; bh=NFXHTreqfSwBFCpoTsuf9pyIKEChk3DV4zB2m2oHtJk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=lPGH9EtpJwUyh92L6Xh8JFgoe2PqMw5R5ClvZlfLNKIo8goHa0puyUTw2COx7rBxj arRKKnrkfgCkHQUUf8vtB2NYb2iqCyqU3RwyM1QzPBzVVSxv0XEQ7txfm4ZrtHxLSy YZRW28Macucr8mD4NrAb7W8KOsk5ePpw8XonoRjhJVTQ6bO0Hg8lRw9TbeVbTE2ay3 q3TP63pf8YO7FHpZAbUYEDZgULiH6Rli2Oz+5PfYkJv2tSBC4Wsqqho+7a2W0YhJjc p+DL4FWtayVd3U8I8bLOJ49KhmpA97cSVy9anFa8TwXCmB5aIThKN4fKIHlbsVvFfC 5FXcv0fsKyKWg== 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 27CA94D79 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 190F33A17AC for ; Mon, 4 Mar 2024 14:07:01 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 14:06:41 +0100 Message-ID: <20240304130657.30631-26-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 26/29] avcodec/mjpegdec: use ff_frame_new_side_data 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: YWyidWPYuTg6 From: Niklas Haas For consistency, even though this can't (yet) be overriden at the packet level. --- libavcodec/mjpegdec.c | 66 ++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 43b36d0a8f..4ef565fe2d 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2865,42 +2865,44 @@ the_end: if (orientation >= 2 && orientation <= 8) { int32_t *matrix; - sd = av_frame_new_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX, sizeof(int32_t) * 9); - if (!sd) { + ret = ff_frame_new_side_data(avctx, frame, AV_FRAME_DATA_DISPLAYMATRIX, sizeof(int32_t) * 9, &sd); + if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Could not allocate frame side data\n"); - return AVERROR(ENOMEM); + return ret; } - matrix = (int32_t *)sd->data; + if (sd) { + matrix = (int32_t *)sd->data; - switch (orientation) { - case 2: - av_display_rotation_set(matrix, 0.0); - av_display_matrix_flip(matrix, 1, 0); - break; - case 3: - av_display_rotation_set(matrix, 180.0); - break; - case 4: - av_display_rotation_set(matrix, 180.0); - av_display_matrix_flip(matrix, 1, 0); - break; - case 5: - av_display_rotation_set(matrix, 90.0); - av_display_matrix_flip(matrix, 1, 0); - break; - case 6: - av_display_rotation_set(matrix, 90.0); - break; - case 7: - av_display_rotation_set(matrix, -90.0); - av_display_matrix_flip(matrix, 1, 0); - break; - case 8: - av_display_rotation_set(matrix, -90.0); - break; - default: - av_assert0(0); + switch (orientation) { + case 2: + av_display_rotation_set(matrix, 0.0); + av_display_matrix_flip(matrix, 1, 0); + break; + case 3: + av_display_rotation_set(matrix, 180.0); + break; + case 4: + av_display_rotation_set(matrix, 180.0); + av_display_matrix_flip(matrix, 1, 0); + break; + case 5: + av_display_rotation_set(matrix, 90.0); + av_display_matrix_flip(matrix, 1, 0); + break; + case 6: + av_display_rotation_set(matrix, 90.0); + break; + case 7: + av_display_rotation_set(matrix, -90.0); + av_display_matrix_flip(matrix, 1, 0); + break; + case 8: + av_display_rotation_set(matrix, -90.0); + break; + default: + av_assert0(0); + } } } }