From patchwork Thu Aug 1 02:14:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50844 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:12d6:0:b0:489:2eb3:e4c4 with SMTP id 205csp856204vqs; Wed, 31 Jul 2024 19:14:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUKtDvhF0petfa7Y82AKpwtQPBF5rMQb9HX1Omq0ez+wM0SjlIxpz5M8DJqBgHtRWVRFP4VL2hC9ca/DuFvHjUvi0tx3rAM6mW8hQ== X-Google-Smtp-Source: AGHT+IHRiroLLN1CmMiivzyPaCBvb16E9inmchbbLSYo2uquULIV2c1qVW2JtngdBtQAuYHr60u/ X-Received: by 2002:a2e:2e14:0:b0:2f0:32f1:896d with SMTP id 38308e7fff4ca-2f153100ae9mr6356531fa.23.1722478443430; Wed, 31 Jul 2024 19:14:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722478443; cv=none; d=google.com; s=arc-20160816; b=kk1d+h8LueSFOk0vswAmEHT9wLzq4abLG8aG1dUabCcXensXsDkzLrDcGQAHC6wXpt N1RY+OPa0hoyatTj2pGqRMYp5n6ayhWkmv/jKdyhZcwW0KSWxhwFRpdNpg6B4/dQwKpT clEH4M1qxjHi+XTBkin/8rjmWCM+PPlzxUVF1BahXkMcPs0iRoSlDbI6DsyvGPy8Hi0U mgdGPz9y/hJVxvaEN7Nc8UFBbnUMsOpJPmEuC7VkMtwRk8Vifjfi08qeaBjvye2o6cU/ 50W2srW0G6NKgVXXXQOk4YNgraIKbWoeV3ilakq+f3OlufSAQPai6096G2m26pRhSbCr sPnw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=LBkYaaG7z4+En/oKvnnWtejlgWaqx1iXSIwlCf619PM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=tukXQDGEDx7HoKVQQRHHhyUHtZs8F4wSWY8DwVFRJ4I4lC9oL4aG01cv9dy9VTrkXT /2HEaAiGKKzI4vFtN78fZyfxYbdwZVsLNzE/LzTysNW0pEVuZ9S4Tn4fWOxBCAZM9198 XPG6zMc5rf+a9VRs7QVSL5svddpn1FQ5Xno45jp4pUQh12vMT0fPx0FI+DiDZz9yuFTm Uq9/RLskjD9Qf6hhJz/MdyOYAi2LB4qKq381MK0oAhOsYqS3wX6KQbaMe30UN+TKXM5p Poe9AGh6IBm7oVWsa4WWu04gyv1P39uc2yRDcbMHEgkyw7j8qHv+GDYbMdsL25FdpTTV tCBg==; 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=gw22s1XS; 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; dara=fail header.i=@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 38308e7fff4ca-2f03d1520e9si40383661fa.367.2024.07.31.19.14.02; Wed, 31 Jul 2024 19:14:03 -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=gw22s1XS; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2557668D932; Thu, 1 Aug 2024 05:13:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EA7168D506 for ; Thu, 1 Aug 2024 05:13:51 +0300 (EEST) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1fc569440e1so58086345ad.3 for ; Wed, 31 Jul 2024 19:13:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722478429; x=1723083229; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=GMYFZWDWgH+feESa/ecDCrvkD+mCd8Zi8APskGjcX2A=; b=gw22s1XS3/A71XSFf5xDm96PNpqjfHCfVPpPf1GpFYacWnBdRnpemmCx5FD+s6kYhx jeEfIs2FLzSniW4XQv9fjLDWGBQtsCdRZ5n2gDFWMeb2DnaTHvXdeWsShD+L8JcPmED1 6HGV0TG3OpNbUccTFnDepJnlRq+HzK9MjShcmd5tehWI3ykUpRTNJrGDwx/WnmIb/+KA +jJ6z+ZwBAhOeJ16nMYrUHBAWTOseCxvICbdx3x2s1RKKOpgLlC/BSpF5HqVYtNhMJdc zgJPM7z/yiwCx8Gw6wnak0rIOwaD76qptsDzv9KyHeHgV5o8AbkcgDlRXmjyFxf3uEK3 bRgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722478429; x=1723083229; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GMYFZWDWgH+feESa/ecDCrvkD+mCd8Zi8APskGjcX2A=; b=BiTVCeTK392GwSwEzYwyFKQClHQ07x4zqudFwTTTSD18/TJ3b24kqBuDo7OY7900Ub gyXhirU7W97ANIwwlHToVK1/MxtAn2KDr4uDiGVj26yF9z9y23MfS94xUHF6AGtZ5oxn VCA7523hPgMbUURHgNSHB61KrA6ID4EJWeA+6w5fzkhZmHL8rOijNf9IAk5PxFFvyoe4 3h/4/KQwnSx6gGPFSwqJrfHuD5HDr0uWFBKYOpiRSdNSVEvDCQf1nO+tkPulYGr3nAJ9 O52bINhg55RMYjF90Dx3QO60vEcrhIrQ59Ljkrf5pkTNnDjJFCouq+sWYFnLHN/lgfjL cKCQ== X-Gm-Message-State: AOJu0Yx21Y/5jOT8MPEFgVqlznut3hoy1rtwrxIFapk1bE1kKcK6sRGv 9b581XfKij4veFEQzPNYHxjGfDEV+2tVPcpYywVKMJ4ToZIhxsQ/qMO7OA== X-Received: by 2002:a17:902:db0e:b0:1fb:8620:c0bd with SMTP id d9443c01a7336-1ff4ce89994mr14117905ad.15.1722478428386; Wed, 31 Jul 2024 19:13:48 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fed7fdadb5sm126817315ad.286.2024.07.31.19.13.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 19:13:47 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jul 2024 23:14:09 -0300 Message-ID: <20240801021410.5061-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mov: ensure the IAMF track is the first 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: dv7d9twX4blG Fixes crashes when muxing video tracks alongside IAMF ones. Signed-off-by: James Almer --- libavformat/movenc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index ae49582a1a..87ec368d52 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -7536,6 +7536,7 @@ static int mov_init_iamf_track(AVFormatContext *s) if (!track->iamf) return AVERROR(ENOMEM); + track->first_iamf_idx = INT_MAX; for (int i = 0; i < s->nb_stream_groups; i++) { const AVStreamGroup *stg = s->stream_groups[i]; switch(stg->type) { @@ -7558,6 +7559,11 @@ static int mov_init_iamf_track(AVFormatContext *s) return ret; } + if (track->first_iamf_idx != 0) { + av_log(s, AV_LOG_ERROR, "The IMAF track must be the first track\n"); + return AVERROR(EINVAL);; + } + track->tag = MKTAG('i','a','m','f'); ret = avio_open_dyn_buf(&track->iamf_buf); @@ -7830,8 +7836,11 @@ static int mov_init(AVFormatContext *s) for (int j = 0, i = 0; j < s->nb_streams; j++) { AVStream *st = s->streams[j]; - if (st != st->priv_data) + if (st != st->priv_data) { + if (!i) + i++; // IAMF track is the first one continue; + } st->priv_data = &mov->tracks[i++]; }