From patchwork Sat Jun 22 15:31:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50081 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1128993vqz; Sat, 22 Jun 2024 08:32:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUWHgFelAQeIUVzNHRoSPJE1kI5yaozKayf+P0lNie+26YM7qMMhjxN6JvRA2zhlax9J5/9FHZjUBaMOH/cG+V3G7SK5sJQ32YMpg== X-Google-Smtp-Source: AGHT+IF7iWLPac90FzjWo5Y6oDRUevpNEdNcadZYDeZcOUoQJ6QNU3hqQH4g4CqmuMfWPeRuE2Qs X-Received: by 2002:a50:a417:0:b0:57c:9c5d:d195 with SMTP id 4fb4d7f45d1cf-57d4bdc9e02mr168569a12.27.1719070349525; Sat, 22 Jun 2024 08:32:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719070349; cv=none; d=google.com; s=arc-20160816; b=aQ2CgEXOCvfIQNvJQwwi13Gm18Frry5allMBSNEy/7HR0gY96XCnlDRFpKSE+aoROT jXtt3/QSMy489KwEhK60gVmNk07axRr8ZoXpWpb8t0exDrELJD8mZq/FbMWQPU08A6Sp kA06LqEaaCEQ9nyCZV8/CEY6U0iyvhcu5Q2DWylBsezgYmb8joXdHxkY+zGb9UEtOgmu K5orwQXTThGZlgw1ablRZTp2A0n+6i7weAwvv4rXGROgRzy/+7A9FJ2FKcTTXINRHqGB 5umxcoVon5SMSdmfIF8jZ9G98tDimxWvDUvASCECq6nAhbIB2nAGmummeJ2DTa8FV+Z6 5L7Q== 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=yLN/DTNTg/CmtP1lmyqgLEhufK/WLR6PRhWL7VX53+8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=nV7dRsVFXlJXVO6HTXPSiAaOUi2yTz8t4c3bzeAxLV2k80agw4labRIfFb3EGL9lbs 9ArextwyPLJbuCBT332IpZGr9v4jnQS9o4STumvy3po9frtIIE0Uw7SzRe22BO5oWinw g6UzbnLMI+CWLL11o/reTCyYT3lbu7pHrsnnsUB8yc4S6FTusnqWNVF7t6WMOrk9k0sA fTzPn5PuANvQZiAwnVu1HU5jzmG6tXd2XdhMkMsrtb8KZ9qdR614YHSliJeJF3X1CHot YrSYj6gBq8YkRDfOHC/lc2zCFJAKcqppkXb+wd20zhPud5F72vt69kvmPbdDrx7pvEb8 aQ9Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=UrGGAJNS; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57d30af3948si1777523a12.584.2024.06.22.08.32.28; Sat, 22 Jun 2024 08:32:29 -0700 (PDT) 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=@gmail.com header.s=20230601 header.b=UrGGAJNS; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5121868D499; Sat, 22 Jun 2024 18:31:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF55168D630 for ; Sat, 22 Jun 2024 18:31:41 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-70667943931so455850b3a.0 for ; Sat, 22 Jun 2024 08:31:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719070299; x=1719675099; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=l67hT/5zUzPy87UImTiPB9M3Y/l0EQgISl0PO4Qn2jc=; b=UrGGAJNSzcxyp1PZG2FZo8GlnbyJT3kw75JJQTVk89glYx/axCNzOt4eup2R6wCwp8 oA66N5BMIxoa0Soq/IjLR2FujpRHGr+x0wEV93ZHob3fjftChTqCVU0RcLN7Ke6aEV+a MJklW5y9HshssowVd7WYg/CgW4HB/6/0xospXGjXMW8H8gSqedKyFQsseaNLesv1zYbX BmtncQntwv81Yv0dEPMk8Rf/uw5fWDBX8CY7RhJBlkBa6vOJgXRTdYc02TDV46XYhUbR npE6UcV24WN0XyfKByJsm2wmYc5ixNYuGaFJbqXFNvhxlVlEPQb1rb0x+qYPkkEJ6C4W rOXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719070299; x=1719675099; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l67hT/5zUzPy87UImTiPB9M3Y/l0EQgISl0PO4Qn2jc=; b=KqUuh4lKnLDLpPmFV85xweP715ZG596E781RlV/Au7w8WlZTGEfzfwu5k9EFUiLDD9 3Acfvk2MQSbzyM3HA5rPOtiSst5pXhpXopvU+CqCZ6rvmyNP8PB3CYUI6hQAIgMPs9ma 9e/n3sIqljlMv9qaGh/wxxZKV1I6lhRjvylEgAeU8LdK/zvmaY7TL96q1c0846l0FJgl LxRRmpTsUqQyZyxnGlpzCKRTvMFJe8hHeqofVg3Tcd/JzYD4Uy6+MuKFL6bOPekbL87p cMnvtVCP2uA4gWDAov4Rr0D4proI82OdFnOb0+Uk4XiizQ4z8b/HWmSn/UZjfojGHTum quBw== X-Gm-Message-State: AOJu0YyeMW6QQnyzaZIaLckbbDd5eAko3CSrwAVLwNV1PePGCoPVQY0h dxIwal5zfFSS/5PpuFTQoz/DkyCS7Q8t6M56psaz2yEZT9T3V3hJmk+bUA== X-Received: by 2002:aa7:88c6:0:b0:705:e5da:8293 with SMTP id d2e1a72fcca58-706745be181mr238114b3a.12.1719070299115; Sat, 22 Jun 2024 08:31:39 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7066ac98fc9sm1164709b3a.193.2024.06.22.08.31.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 08:31:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:31:21 -0300 Message-ID: <20240622153122.6220-7-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622153122.6220-1-jamrial@gmail.com> References: <20240622153122.6220-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/8 v2] avformat/mov: don't use sizeof(AVStereo3D) 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: 7JZhaywt+X5N It's not part of the libavutil ABI. Signed-off-by: James Almer --- libavformat/isom.h | 1 + libavformat/mov.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index 35b767a52c..a0498f45e5 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -247,6 +247,7 @@ typedef struct MOVStreamContext { int32_t *display_matrix; AVStereo3D *stereo3d; + size_t stereo3d_size; AVSphericalMapping *spherical; size_t spherical_size; AVMasteringDisplayMetadata *mastering; diff --git a/libavformat/mov.c b/libavformat/mov.c index 9b2ce1f167..07c0ec3ec4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6332,7 +6332,7 @@ static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) return AVERROR(ENOMEM); @@ -6695,7 +6695,7 @@ static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom) } if (!sc->stereo3d) { - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) return AVERROR(ENOMEM); } @@ -6782,7 +6782,7 @@ static int mov_read_hfov(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (!sc->stereo3d) { - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) return AVERROR(ENOMEM); } @@ -6831,7 +6831,7 @@ static int mov_parse_uuid_spherical(MOVStreamContext *sc, AVIOContext *pb, size_ else mode = AV_STEREO3D_2D; - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) goto out; @@ -10032,7 +10032,7 @@ static int mov_read_header(AVFormatContext *s) if (sc->stereo3d) { if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, AV_PKT_DATA_STEREO3D, - (uint8_t *)sc->stereo3d, sizeof(*sc->stereo3d), 0)) + (uint8_t *)sc->stereo3d, sc->stereo3d_size, 0)) return AVERROR(ENOMEM); sc->stereo3d = NULL;