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++]; } From patchwork Thu Aug 1 02:14:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50845 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:12d6:0:b0:489:2eb3:e4c4 with SMTP id 205csp856256vqs; Wed, 31 Jul 2024 19:14:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVm8RWE2689wUdNT2XXtm8EI/R3um/SoUXwfc9+oa+nBp9NvX0zi0lzVEkuvrUTRXqVBZP5mQEdEylfSScSxXE2@gmail.com X-Google-Smtp-Source: AGHT+IEQJI2kejmwi2tXWHDyirsPQ7zix1JecVC9/V1hi1Up5iefpiCfeGis7Tcr8oHnWN6XfqMF X-Received: by 2002:a2e:b019:0:b0:2ef:2378:87b1 with SMTP id 38308e7fff4ca-2f153399756mr5757311fa.34.1722478452446; Wed, 31 Jul 2024 19:14:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722478452; cv=none; d=google.com; s=arc-20160816; b=FnhM1DkmiAYcBzt/hIKOV829lSvFNIJmFiGdRaAl++4Wmj61eeNwVCk9KR+hlW00V7 QEqTPXVKJ0TyEMeQ0doN2Tq2DLaQVBk1MyAgHoCHH03GWxnTriJUR4hPXAh4V24BBkHf 9jInPfJptwT+cIwAP+kGLnU8ecmT6F8etC6kuH6Bz65bmgt/Ruath2xBi6UWNcNKUbPl DcVr19icBVjq5RwcRFPpGzO0JBtcHXUfe29iYJArDjzsdzrLmqwp7HpiG4QDl7LFF/gR 1SKNeFz0q10To71RMEl3t1NmVse5R/fVM6PT9gC0/j2U2yce3m3UIUL3gd/RKjUw+QLd ALCg== 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=aJsqq7sO3tCrmcUIzd6GOXmSFF6xdC7Q5rw7EjgjhKQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=tZ8gjDVZbP0DH1MGR2tEkhC6oCsXdRAgdYBJTOqg9ea1FNB8/In0lNadd/1NcA5fHN /t7AftrlWGCBO+Gv0CeMDVJu92AjzN4vYkKX37L/Mwb6hCB8Oq+Jz+J+/HNSt6Un9NDE DT6zPq0vhhi+a7s3v/Lzz3m95FFJSiX9NMNEmumi3SYKih6daROJQMKRUSQSgr1KfhJH AhQhbfFTqsyJlOL9WDE1o30vsmKFHoDd6WKvOPKlIrLd8nnPxL+Dx49DhOsiqFkBnU57 CgRcYMfjap0TbEhEEpVg6igYq/mEFofK2DHf43MfJyu2Mp9wp/Asx3MKQKn52GrFVXwg UVhQ==; 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=VHpXdqSv; 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 4fb4d7f45d1cf-5affb03b244si7474685a12.111.2024.07.31.19.14.11; Wed, 31 Jul 2024 19:14:12 -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=VHpXdqSv; 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 49A2D68D93C; Thu, 1 Aug 2024 05:14:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17EA668D8D6 for ; Thu, 1 Aug 2024 05:13:53 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1fed72d23a7so47652495ad.1 for ; Wed, 31 Jul 2024 19:13:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722478431; x=1723083231; 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=af7wxP2MqrM3oOi2fQsAeagkQTv+qVD4CdaVSlKfCLI=; b=VHpXdqSvbLINAtpBpVVI5pX8OYb9ZMftq0k9ReBgZM2Hlt5NsGRyIxe5u5cX62plK+ WzoSwq7ZxL1O5LAExsbyHch21nhIkqGto+8jUMFXOEwd8uNmW7jhQeYhkk3rGTRQeBCT 9AJNTVoeK4rNoK9LK/2fuxa8soTP9T32bRcOjvnJp6FFqZAhA7ep+ZKQOpMQQObfLfqL WPTo7Wp0Wg8+FUR2TN9wAxVRU+GSAl+Ny/XleX3ZGunW0D07ZwmVPmK6w3xdhq9qDkBM c1zPKoXv853l9UTWe8G00TATQgX/JeGG0zp4tDavRkQ7SHyKPbKXgqcsZHHuSVVsmBF2 7OTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722478431; x=1723083231; 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=af7wxP2MqrM3oOi2fQsAeagkQTv+qVD4CdaVSlKfCLI=; b=cRT/rrg/KvpjAvAucOQhQDnj4/APNRvoT6hP1ebGKegLFu0viUnnJD8ssWtxrO3kM2 E6GJjRm+MOjlrHbsi//Y9sxJJVgvWDS1BsZv6BmiiYrEjhYXBVWYBL/Oyzbs81Z+IF8S ouawsSidBnQMdWt+akLtyCzKyHsYj8bIUgA2URQSotMzukVLm5lmwUuowMtpuPCDYntK R5JA0z06JFoVSFY4gUdCUaWUQjhAvMClgQRXFOGGFsZScrHGCETp0vqMK7GRlW9aKfhH YluWvQmDN4QHkn+HRcueTHa+HG4SbRMQRNsRQh4Sk15Ko/e2nND0pTX/cNBUN73N+sgI luog== X-Gm-Message-State: AOJu0YzUvd7CXr017/Pc1p33j9NiVNe10vbAN4AojZ4ADCftzG8hVQhv 4rc63WtatvEC8DeY1kCpEnmWfUoagi/yFy/wQD28DmY6kpA3RMy5SM0IRQ== X-Received: by 2002:a17:903:1cf:b0:1fd:95ac:5089 with SMTP id d9443c01a7336-1ff4d2427a0mr13847905ad.53.1722478430525; Wed, 31 Jul 2024 19:13:50 -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.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 19:13:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jul 2024 23:14:10 -0300 Message-ID: <20240801021410.5061-2-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240801021410.5061-1-jamrial@gmail.com> References: <20240801021410.5061-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] fate/mov: add an IAMF+video muxing test 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: 7VGDP7GYB+Ry Signed-off-by: James Almer --- tests/fate/mov.mak | 11 + tests/ref/fate/mov-mp4-iamf-5_1_4-h264 | 568 +++++++++++++++++++++++++ 2 files changed, 579 insertions(+) create mode 100644 tests/ref/fate/mov-mp4-iamf-5_1_4-h264 diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index d12980815f..a7ea503844 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -262,6 +262,17 @@ fate-mov-mp4-iamf-ambisonic_1: CMD = transcode wav $(SRC) mp4 "-auto_conversion_ -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -map [MONO0] -map [MONO1] -map [MONO2] -map [MONO3] -c:a flac -t 1" "-c:a copy -map 0" \ "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" +FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER H264_PARSER) += fate-mov-mp4-iamf-5_1_4-h264 +fate-mov-mp4-iamf-5_1_4-h264: tests/data/asynth-44100-10.wav tests/data/filtergraphs/iamf_5_1_4 tests/data/streamgroups/audio_element-5_1_4 tests/data/streamgroups/mix_presentation-5_1_4 +fate-mov-mp4-iamf-5_1_4-h264: SRC = $(TARGET_PATH)/tests/data/asynth-44100-10.wav +fate-mov-mp4-iamf-5_1_4-h264: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filters \ + -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/iamf_5_1_4 \ + -/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-5_1_4 \ + -/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-5_1_4 \ + -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -streamid 6:6 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [TOP_FRONT] -map [TOP_BACK] -map 1:v:0 -c:a flac -c:v copy -t 1" "-c:a copy -c:v copy -map 0" \ + "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" \ + "-i $(TARGET_SAMPLES)/h264/intra_refresh.h264" + FATE_FFMPEG += $(FATE_MOV_FFMPEG-yes) FATE_FFMPEG_FFPROBE += $(FATE_MOV_FFMPEG_FFPROBE-yes) diff --git a/tests/ref/fate/mov-mp4-iamf-5_1_4-h264 b/tests/ref/fate/mov-mp4-iamf-5_1_4-h264 new file mode 100644 index 0000000000..53a0b28832 --- /dev/null +++ b/tests/ref/fate/mov-mp4-iamf-5_1_4-h264 @@ -0,0 +1,568 @@ +5a29ac3ccba1d2860b80a2b662b29266 *tests/data/fate/mov-mp4-iamf-5_1_4-h264.mp4 +126671 tests/data/fate/mov-mp4-iamf-5_1_4-h264.mp4 +#extradata 0: 34, 0xafa70d5e +#extradata 1: 34, 0xafa70d5e +#extradata 2: 34, 0xaf7b0d5c +#extradata 3: 34, 0xaf7b0d5c +#extradata 4: 34, 0xafa70d5e +#extradata 5: 34, 0xafa70d5e +#extradata 6: 189, 0x738b56ad +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: flac +#sample_rate 0: 44100 +#channel_layout_name 0: stereo +#tb 1: 1/44100 +#media_type 1: audio +#codec_id 1: flac +#sample_rate 1: 44100 +#channel_layout_name 1: stereo +#tb 2: 1/44100 +#media_type 2: audio +#codec_id 2: flac +#sample_rate 2: 44100 +#channel_layout_name 2: mono +#tb 3: 1/44100 +#media_type 3: audio +#codec_id 3: flac +#sample_rate 3: 44100 +#channel_layout_name 3: mono +#tb 4: 1/44100 +#media_type 4: audio +#codec_id 4: flac +#sample_rate 4: 44100 +#channel_layout_name 4: stereo +#tb 5: 1/44100 +#media_type 5: audio +#codec_id 5: flac +#sample_rate 5: 44100 +#channel_layout_name 5: stereo +#tb 6: 1/1200000 +#media_type 6: video +#codec_id 6: h264 +#dimensions 6: 320x240 +#sar 6: 0/1 +0, 0, 0, 4608, 1399, 0x6e89566e +1, 0, 0, 4608, 1399, 0x6e89566e +2, 0, 0, 4608, 1396, 0x0dcb5677 +3, 0, 0, 4608, 1396, 0x0dcb5677 +4, 0, 0, 4608, 1399, 0x6e89566e +5, 0, 0, 4608, 1399, 0x6e89566e +6, 0, 0, 48000, 3299, 0xac71660d +6, 48000, 48000, 48000, 131, 0x3c963e3d, F=0x0 +6, 96000, 96000, 48000, 3398, 0x5bdd9447, F=0x0 +0, 4608, 4608, 4608, 1442, 0x6c3c5b13 +1, 4608, 4608, 4608, 1442, 0x6c3c5b13 +2, 4608, 4608, 4608, 1439, 0xc46b5ac5 +3, 4608, 4608, 4608, 1439, 0xc46b5ac5 +4, 4608, 4608, 4608, 1442, 0x6c3c5b13 +5, 4608, 4608, 4608, 1442, 0x6c3c5b13 +6, 144000, 144000, 48000, 147, 0xc50d446d, F=0x0 +6, 192000, 192000, 48000, 3702, 0xaca23a84, F=0x0 +6, 240000, 240000, 48000, 148, 0xe9144a44, F=0x0 +0, 9216, 9216, 4608, 1380, 0xc497571b +1, 9216, 9216, 4608, 1380, 0xc497571b +2, 9216, 9216, 4608, 1377, 0x5b2a55fe +3, 9216, 9216, 4608, 1377, 0x5b2a55fe +4, 9216, 9216, 4608, 1380, 0xc497571b +5, 9216, 9216, 4608, 1380, 0xc497571b +6, 288000, 288000, 48000, 3513, 0x40cad814, F=0x0 +6, 336000, 336000, 48000, 187, 0x95f85d04, F=0x0 +0, 13824, 13824, 4608, 1383, 0x48e9510f +1, 13824, 13824, 4608, 1383, 0x48e9510f +2, 13824, 13824, 4608, 1380, 0x045550d3 +3, 13824, 13824, 4608, 1380, 0x045550d3 +4, 13824, 13824, 4608, 1383, 0x48e9510f +5, 13824, 13824, 4608, 1383, 0x48e9510f +6, 384000, 384000, 48000, 3815, 0xa3a079c0, F=0x0 +6, 432000, 432000, 48000, 149, 0x1c304190, F=0x0 +6, 480000, 480000, 48000, 4179, 0x521c2566, F=0x0 +0, 18432, 18432, 4608, 1572, 0x9a514719 +1, 18432, 18432, 4608, 1572, 0x9a514719 +2, 18432, 18432, 4608, 1568, 0xa2bc45f4 +3, 18432, 18432, 4608, 1568, 0xa2bc45f4 +4, 18432, 18432, 4608, 1572, 0x9a514719 +5, 18432, 18432, 4608, 1572, 0x9a514719 +6, 528000, 528000, 48000, 131, 0x924b3d0c, F=0x0 +6, 576000, 576000, 48000, 3715, 0x66924207, F=0x0 +6, 624000, 624000, 48000, 97, 0x4fae2dc3, F=0x0 +0, 23040, 23040, 4608, 1391, 0x74ac5014 +1, 23040, 23040, 4608, 1391, 0x74ac5014 +2, 23040, 23040, 4608, 1388, 0x96c85007 +3, 23040, 23040, 4608, 1388, 0x96c85007 +4, 23040, 23040, 4608, 1391, 0x74ac5014 +5, 23040, 23040, 4608, 1391, 0x74ac5014 +6, 672000, 672000, 48000, 4037, 0x7f30cdbb, F=0x0 +6, 720000, 720000, 48000, 117, 0x33b32f9e, F=0x0 +0, 27648, 27648, 4608, 1422, 0x2f9d47c5 +1, 27648, 27648, 4608, 1422, 0x2f9d47c5 +2, 27648, 27648, 4608, 1419, 0x4d4d466a +3, 27648, 27648, 4608, 1419, 0x4d4d466a +4, 27648, 27648, 4608, 1422, 0x2f9d47c5 +5, 27648, 27648, 4608, 1422, 0x2f9d47c5 +6, 768000, 768000, 48000, 4345, 0xc9487619, F=0x0 +6, 816000, 816000, 48000, 135, 0x60753f29, F=0x0 +6, 864000, 864000, 48000, 132, 0xd9334003, F=0x0 +0, 32256, 32256, 4608, 1768, 0x2a044b99 +1, 32256, 32256, 4608, 1768, 0x2a044b99 +2, 32256, 32256, 4608, 1765, 0xacb84b24 +3, 32256, 32256, 4608, 1765, 0xacb84b24 +4, 32256, 32256, 4608, 1768, 0x2a044b99 +5, 32256, 32256, 4608, 1768, 0x2a044b99 +6, 912000, 912000, 48000, 2149, 0xc5f717a1, F=0x0 +6, 960000, 960000, 48000, 121, 0x44993b1a, F=0x0 +0, 36864, 36864, 4608, 1534, 0xb0b35a3f +1, 36864, 36864, 4608, 1534, 0xb0b35a3f +2, 36864, 36864, 4608, 1531, 0x996458aa +3, 36864, 36864, 4608, 1531, 0x996458aa +4, 36864, 36864, 4608, 1534, 0xb0b35a3f +5, 36864, 36864, 4608, 1534, 0xb0b35a3f +6, 1008000, 1008000, 48000, 71, 0x285f20a5, F=0x0 +6, 1056000, 1056000, 48000, 1511, 0x3d78f484, F=0x0 +6, 1104000, 1104000, 48000, 59, 0x7b6a18a6, F=0x0 +0, 41472, 41472, 2628, 926, 0xc26a5eae +1, 41472, 41472, 2628, 926, 0xc26a5eae +2, 41472, 41472, 2628, 923, 0xa7225edf +3, 41472, 41472, 2628, 923, 0xa7225edf +4, 41472, 41472, 2628, 926, 0xc26a5eae +5, 41472, 41472, 2628, 926, 0xc26a5eae +6, 1152000, 1152000, 48000, 59, 0xe4841b1f, F=0x0 +[STREAM_GROUP] +index=0 +id=0x1 +nb_streams=6 +type=IAMF Audio Element +[COMPONENT] +nb_layers=4 +audio_element_type=0 +default_w=10 +[SUBCOMPONENT] +channel_layout=stereo +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=5.1 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=5.1.2 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=5.1.4 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +name=demixing_info +nb_subblocks=1 +type=1 +parameter_id=998 +parameter_rate=44100 +duration=4608 +constant_subblock_duration=4608 +[PIECE] +subblock_duration=4608 +dmixp_mode=1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +TAG:language=und +TAG:handler_name=SoundHandler +TAG:vendor_id=[0][0][0][0] +[STREAM] +index=0 +id=0x0 +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +[/STREAM] +[STREAM] +index=2 +id=0x2 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +[/STREAM] +[STREAM] +index=3 +id=0x3 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +[/STREAM] +[STREAM] +index=4 +id=0x4 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +[/STREAM] +[STREAM] +index=5 +id=0x5 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +[/STREAM] +[/STREAM_GROUP] +[STREAM_GROUP] +index=1 +id=0x2 +nb_streams=6 +type=IAMF Mix Presentation +[COMPONENT] +nb_submixes=1 +[SUBCOMPONENT] +en-us=Mix_Presentation +[/SUBCOMPONENT] +[SUBCOMPONENT] +nb_elements=1 +nb_layouts=4 +default_mix_gain=256/256 +[PIECE] +stream_id=1 +default_mix_gain=0/256 +headphones_rendering_mode=0 +[SUBPIECE] +en-us=Scalable_Submix +[/SUBPIECE] +[SUBPIECE] +name=element_mix_config +nb_subblocks=0 +type=0 +parameter_id=100 +parameter_rate=48000 +duration=0 +constant_subblock_duration=0 +[/SUBPIECE] +[/PIECE] +[PIECE] +name=output_mix_config +nb_subblocks=0 +type=0 +parameter_id=100 +parameter_rate=48000 +duration=0 +constant_subblock_duration=0 +[/PIECE] +[PIECE] +sound_system=stereo +integrated_loudness=256/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=5.1 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=5.1.2 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=5.1.4 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +TAG:language=und +TAG:handler_name=SoundHandler +TAG:vendor_id=[0][0][0][0] +[STREAM] +index=0 +id=0x0 +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +[/STREAM] +[STREAM] +index=2 +id=0x2 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +[/STREAM] +[STREAM] +index=3 +id=0x3 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +[/STREAM] +[STREAM] +index=4 +id=0x4 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +[/STREAM] +[STREAM] +index=5 +id=0x5 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +DISPOSITION:multilayer=0 +[/STREAM] +[/STREAM_GROUP]