From patchwork Fri Feb 23 13:58:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46493 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp997585pze; Fri, 23 Feb 2024 06:41:38 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXXpiNUM4GEre6td/6uueU4TGWzhtJ9RXeScj7fzlaMjdsNLJYDE2gXeDy5sBIvriO5IB20MZkNGiQQMQuwLEyIfZuo+L1NPV5MfA== X-Google-Smtp-Source: AGHT+IE1sMwkFsLWhpfnJMmLI+GZdV2DJofNQ7ib24f5r/5ojkb8xAY0I3AmNC7umxJt5R/C77bL X-Received: by 2002:a17:906:c419:b0:a3e:f929:8149 with SMTP id u25-20020a170906c41900b00a3ef9298149mr10313ejz.35.1708699298513; Fri, 23 Feb 2024 06:41:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708699298; cv=none; d=google.com; s=arc-20160816; b=JTCeEmapUElCQ2ddMINru2PZJ5bCClT14MvBA5pzfSnmN0HSf0dQg6DBhm9smlsiTc K2e5IebRP2XW15iFiDM9BqODWtxcBaH1HoJalDi2uF3ISfgBhIloSbfIG3eOgA2WmbFT iLtCwX1bV3yVuXSABsjt1X06QWV/O7K2DV1/qkopyQzsPHdXUiOP0Y4uulin0tmjGcU6 RdeS9PP774nD+hSK/fI1XDeTEvhycqioWu4ds3ev8DATGchOeWZMfNx9DhXAUY1GyX7B ElrXFHLNRdrZAv+g8kaANsUOrC66S8TZFlLDsrpzcEKAMDmUEDumVK7idHFH4vajI4Hy mXfg== 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=Na6mo8i0TdlSNY7FeNm4w+7WPKqceNjSxkM+k8RNyJg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=RTbgG/nYEN5du+sU2/H9AvJJRG7Yf0XpviYXDxyYki1qQ1vG+ipAMullrmmTDett1m pfiJqe7CCjrQ2p8zss29R4g87+4FLOYp4zHG2pSDhigJ+7169w6NoUngGNostCbgQTjp gDqwcBIjqLVyx+MChgjbmmWObaXMNPsD4xFo00lJ4bhGgnMYxS0/NX0EBxtI9n53u5ti kIh8s9SlaUQ0qbzWauF+ic4uA4FqlAFBF+mwMc/5lSqCVcV+6yRZt5LXQbcQs3WZD7fu wFpYdTOFajtBbw2z1n3fQfrFGPa10faX12+dRtgbh46/O1wWG00fWX3J5bOWKLPv3W6d VndA==; 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="hfq9DN/+"; 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 ho9-20020a1709070e8900b00a3e48268848si5803323ejc.450.2024.02.23.06.41.38; Fri, 23 Feb 2024 06:41:38 -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="hfq9DN/+"; 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 2D97268C6D5; Fri, 23 Feb 2024 16:41:28 +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 CC82268C66F for ; Fri, 23 Feb 2024 16:41:20 +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=hfq9DN/+; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 668B54D22 for ; Fri, 23 Feb 2024 15:41:20 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id E0crx6GZOw39 for ; Fri, 23 Feb 2024 15:41:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1708699279; bh=DJfLlaeuoxLKxjUOmHwZSJbJyXOS/iO4msJB3PJRKWo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=hfq9DN/+HnJfUMDfQ4X7qFg303gwQ5y7sKPAkhz82Z8rd5MfULwGeA+d7jUF1RrQJ 9VPEZxXdkt9wCDSztPZt0klTzr9jEpuVu4BG0YP+2RQmICWZ6ulvOtfexfO63U5XJT T8YyBzVJTTKagZ3h/ZW9x3BQH9HBPOQ9mcRkQmrEqBs40eo+w2k4d8vQc6RtHHPt8C yRYi+j/ReL4es7tIbY/D0XpwAU5ZMv43VDVe9TlEaBdpYT+cGtgd+9vLfmzXau0Tbp FndB4q72CyEc/iVwUzP91BG5LZ/+jJV4l6zpMvM3is5oSarjvguvOO4fe9/UWlIeJ4 qtS5zDDgRpLDA== 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 C47F84D03 for ; Fri, 23 Feb 2024 15:41:19 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 77C183A2743 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:57 +0100 Message-ID: <20240223143115.16521-36-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 35/38] 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: on6dyfUGcxlU 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); + } } } }