From patchwork Sat Jun 22 23:15:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50094 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1270386vqz; Sat, 22 Jun 2024 16:16:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPFMGJbDOx+Z2kkF+7MImBDkFF4voMGICLrBXAG75pVM/7Vu4P8fscXbRoytiFmbSGpxmkifHbscWx8si8jiacTQQQvFHgPZVNSQ== X-Google-Smtp-Source: AGHT+IGi2vh6HMXlhWgAvZMkxtEY11qreFZvLpvd1qtmMPPiKj4kB8+d/IeXNO9+lbgloGeHJfqT X-Received: by 2002:a50:9342:0:b0:57d:46e3:7e2c with SMTP id 4fb4d7f45d1cf-57d46e37ef5mr1108572a12.3.1719098218576; Sat, 22 Jun 2024 16:16:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719098218; cv=none; d=google.com; s=arc-20160816; b=WIylJ5filHtplK3jCnUC05sqw/+tJ1mijnTP6rDUAf5WUVfK2TgopmePMnsGln8Ngs Z5q1tia5Fm9fF0M9tJMlA3jC5T7TCxNYVhvNcvD4wHvCx1qTzk1v0bWjUejS7kJMnfLb OiNg1UchCmdX3f9pYMSkrBHvsUtCB3VQSgbeIdPGfl+v1RLbHuyXry7EZubDHwEMIk9D 3EfnyQeazHcvPMm2aS94vo/qXsfog+5Tu6nUELyjP9m6riPyM1sFiN7ofbflRGsLPGVa yescpS88dZlKMx/ReClmTm2ChS6Cbg2iZ398kN55R/6lzhKTOujN+40E/OWMV9kTPIow t35w== 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=hqOfhwrFlPb5ep4svFwLDuV9qUD2Fe7bZDZ/XDDc47s=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HG1i8cVaFXOhY/kQXcMQLWsE8QW9zYc+zYIdt/1iEkN+Rnv7S07RWiQsbi673q6Nep fU5ZT+AV74p4N4JAy4BIvkvDucPvD7c77Bx8KtsutfdW7s49ysAwI7Ze0ZPCQCD3J8i3 o+cvZDAYUTKSsqNH2tzpl9xrrBZUpFIfyW3jDogMEOTPiRXKZVy7v2nHMFddEhNLmsTG 1t8pntG/wPxswo2Xa5pD4IxYqgRSreMXJyYOWu54M0XcFW8iEb49hCX6czQy09lTny0W bpdLN6GO3ZowIgmcx6B0uuE0ssadH3fTp1a4LEQ314hZC2rDXh8/h4clJszrz3t4pQqQ KUtg==; 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=nJNeP9Wp; 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-57d30af43b4si2126238a12.537.2024.06.22.16.16.58; Sat, 22 Jun 2024 16:16:58 -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=nJNeP9Wp; 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 C41E068D667; Sun, 23 Jun 2024 02:16:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB3AB68D627 for ; Sun, 23 Jun 2024 02:16:00 +0300 (EEST) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-706524adf91so1364063b3a.2 for ; Sat, 22 Jun 2024 16:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719098158; x=1719702958; 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=1c26zjXPYgvtZibhOFTai69WAKNxXDI7WAPTVfPvRMk=; b=nJNeP9WpOBJ1ntkA9tSc+vKEV8q9BZxR41M9pZ/kvLzf5PKy5ZVLnwtSuvMOuCb5oT vkWJpeZ1IY2VMPIQzIoRLlRHqUYQVCQaDB2D/oGMVCpEOdxNmK4o0gGc+lmy7rq4ztUJ g5L7yIk2PV27cRYPVi/jZzD9mblZpmrWbkuFmBAQZByoJgLGUdyM6Inah4QqETYTCmCj e3YCi6zfZd4jWd1dpqRnk9Jxw/tp9UN0J7qB3QWL8vz+yh2MPciPsAc/NIZY8Er4m99S pz400BGLFwoj5ICatYEa64rxfvCiEBNEyyoDQbpKKyqcAUKsl/MewjSaDoiys0OFj0hj QqoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719098158; x=1719702958; 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=1c26zjXPYgvtZibhOFTai69WAKNxXDI7WAPTVfPvRMk=; b=OU5olkXU8E3t53jC6RNjFTDJdV0aLOqqhtvwga3AEA1TwREEGjz45mmA0gOqCYMR6a GhYNr1nyS0F7jBHk6czpyrQi2pqDuIYKn59DZO/rR3Cr7oJIo1N/QEdlQ0sUfsabut2+ SbwoniesvfnA5P0f+SC6UICU35c0Jkt78xf+2quhK8m9e2q7FWnpbtWQXFtl3HSmchIj 5QvWY21p6Qr1n4Ap7BTgkRjXWRydZhCUW04ei+ZxxAeYdB9N7bYx4JLFsgtdfMWx4Nkf iLR8aCztJVOZoIXRV5Wi80es/wkesOxy38lgFT7xN1KDzWsySCUIhAVqVQeUcJLO5rCy 4Qrw== X-Gm-Message-State: AOJu0Yx4H4SKuwaDNrI0ue120fyaf4k/gDMGnc/YNF3HpnIqu0fkT3Rz ryg8VkF/hDbNKzMNRv/pPPbILSzF8lzsYdvserQJEn2gP27IkPsnfGOHxg== X-Received: by 2002:a05:6a21:271c:b0:1b2:b232:1643 with SMTP id adf61e73a8af0-1bcf443918amr1588310637.10.1719098157610; Sat, 22 Jun 2024 16:15:57 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-706512e000asm3717691b3a.179.2024.06.22.16.15.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 16:15:56 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 20:15:19 -0300 Message-ID: <20240622231520.7410-9-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622231520.7410-1-jamrial@gmail.com> References: <20240622231520.7410-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/10 v3] 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: Zz4Wh6bFYZdr 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 b0930b2936..650b5c2a40 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6334,7 +6334,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); @@ -6698,7 +6698,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); } @@ -6785,7 +6785,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); } @@ -6837,7 +6837,7 @@ static int mov_parse_uuid_spherical(MOVStreamContext *sc, AVIOContext *pb, size_ view = AV_STEREO3D_VIEW_MONO; } - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) goto out; @@ -10039,7 +10039,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;