From patchwork Tue Jun 18 19:03:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50000 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp2761204vqg; Tue, 18 Jun 2024 12:03:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXM5/MJMWZJ/3nYj4M/DsANtyG/XkrREQpGalSCjISOM4ZJWxLjPLsMewm7DFCSao3Gn4jgXqAh4oA2X41nXNCHTAZ5TtheE9DYSg== X-Google-Smtp-Source: AGHT+IH9amahj1m7bGwm+qQoyMR+xlbuRSIAHz+h/PP6Kv8ZuIB1THmutUOPSYn+B61HqJ8yXAlm X-Received: by 2002:a50:f69b:0:b0:57d:3b8:85e6 with SMTP id 4fb4d7f45d1cf-57d07ebc187mr282929a12.39.1718737424353; Tue, 18 Jun 2024 12:03:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718737424; cv=none; d=google.com; s=arc-20160816; b=kGL6ZkaWThRuDSuw3B+KQMW1+Z/qSReNt5fh5viGWT3Kfhzo7zWBZEMDXeddJomTrO diB4W3phbTijvPtuXcTN81UbUcZ9a/18gIKEcqKPOBrubI0LRpeuZawwebFT34KtrUF0 Q1/qCI4QJV/7yxCt90xtYW7+ValjUDpzXkM0yWXTR8FnW8PLvYDtj/hVzQPTSRt8WBvD KVZIOqV7Y7jIdYLaeXCCjU3mZijorRzV/Q0M5+EkGfPSMgqDQs+fptjfQlPgGmw2QP7I uAgPsBo0Y6KRcKrv+gsgH+aM9D4+Nbc5sRRAV/7OPT19lI/9QN7BMD5m/eui8MzADevv KXvA== 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=zaiVIy8sl0b9Bo2sp74E+4YRPjMsiOq8W8BsAhrzPEk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=OuKl86wfKR5z2HGFupoPSf9p69SRwbBjisUCJsJrUKg9f1FIscrmBIhycqPDB5gBGi W8Ea3oQ870zvhfsqwDVBoYB/eUs+BRktCNOE6LCIl7Cxc1hnlz92qG+ijUMhqM3oQVgL GAod4o5cAAlKbVHq/Z8EsAQkiwUKHDi64ooploFFbAVOsDBmC2LWCeMdYKW9rH9K8TVA z96FNSSCRKQVxUMVJ21cBTrvbj0RsuLa/uWDR+A2juMfgLibGQOUk6V6W1CjGEJt60kq NFGAC/+Bl3oiXPGe+duHEP14yETo/W2MhEj69UckuTzeQXShiyncZUW0f1t0u1v+j164 JiJw==; 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="BZ/gmnjU"; 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-57cb7447b61si5561974a12.444.2024.06.18.12.03.44; Tue, 18 Jun 2024 12:03:44 -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="BZ/gmnjU"; 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 221F468D62E; Tue, 18 Jun 2024 22:03:42 +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 8971368D62E for ; Tue, 18 Jun 2024 22:03:33 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-7041e39a5beso4279066b3a.3 for ; Tue, 18 Jun 2024 12:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718737411; x=1719342211; 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=bVGL0iDHZ3W6YKKzJbFrVHGVXbvth9I7yKiJZBU8kOI=; b=BZ/gmnjU26rXqkn3qxtcMbAKdd448yvQvnmQWVZG4RGA2znwazDwNLjNNjtVKUxr5t f96HOZCD/KcRERMthVJTpAe08OUBmHijN7p1TTiRUPx4K7CUaA2tkmfDUSkcd/H6Su3K l1So++ROwuLkN5ssaXcqOoyyxVuw5haKVY6wmeTRVnVW4GUdk2ct2RZgJzE1aACO4QZC tdXM1ETwOuhOxviFUcHY2CAgCm6llJv3Y2V/ZUXtMOd4YU19+Q8qkHTPKrOrKBwpw0xh OGVNaE8c8zk+v0/1grSD1QzKSphWPKepvlqr1XMgYMVkcq2RaNWDkNYWEgTU7S1yf3vY nDYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718737411; x=1719342211; 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=bVGL0iDHZ3W6YKKzJbFrVHGVXbvth9I7yKiJZBU8kOI=; b=wG9+hHrF+O2fEkm59Kfw60SZ+ju1P2FClHVZTXkthjQL0SMclTd2QEDNAfVGXmn0eX A0bdWKZbgcQb6rlcMwndgsGGnTpCmWszU5I+3imCcHMb7Kq/So5deiN9dCGeGcX1IYnd HclYM2yzbKtBE5A05d9yieUVndkQK7wtmqeyz0gp3Ny+fFLn4whe112BwO9rU0wn1h5Z tJHivkgOvZ0LNslKP6CiuW/GsPue6GgqqGpKu1v+hGUXml3/6YJMGZtcY6bTnjbBlUI6 aH778ZOBia0sTRdoTkzxGpPs89kIQnal9FB4s3BCY6nlhsbibOSSm+8IOPkOevM5Kvdg AA/w== X-Gm-Message-State: AOJu0Yz/NiJcHRM8i9T92F7kBn4Ys3hBrNOY+7j70tfTASMmExkn5GNh j1uKeVng4YY8wIl0K83UfFNM1znoSvrsaFzq6unaSdzGbVJmgkqUmZU9bg== X-Received: by 2002:a05:6a00:4f05:b0:704:24fb:11b8 with SMTP id d2e1a72fcca58-70629c147c5mr545980b3a.7.1718737411230; Tue, 18 Jun 2024 12:03:31 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-705ccb92c89sm9255253b3a.213.2024.06.18.12.03.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jun 2024 12:03:30 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Jun 2024 16:03:12 -0300 Message-ID: <20240618190312.3848-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] ffprobe: always print all Stereo3D fields 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: T0hZkqlUXxPp ffprobe is meant to generate parseable output, and if a field is present, it should be printed even if it has a default value. Signed-off-by: James Almer --- fftools/ffprobe.c | 9 +++------ tests/ref/fate/matroska-spherical-mono | 3 +++ tests/ref/fate/matroska-spherical-mono-remux | 6 ++++++ tests/ref/fate/matroska-stereo_mode | 12 ++++++++++++ tests/ref/fate/matroska-vp8-alpha-remux | 3 +++ 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index a814cb5ade..d7ba980ff9 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2546,12 +2546,9 @@ static void print_pkt_side_data(WriterContext *w, print_int("inverted", !!(stereo->flags & AV_STEREO3D_FLAG_INVERT)); print_str("view", av_stereo3d_view_name(stereo->view)); print_str("primary_eye", av_stereo3d_primary_eye_name(stereo->primary_eye)); - if (stereo->baseline) - print_int("baseline", stereo->baseline); - if (stereo->horizontal_disparity_adjustment.num && stereo->horizontal_disparity_adjustment.den) - print_q("horizontal_disparity_adjustment", stereo->horizontal_disparity_adjustment, '/'); - if (stereo->horizontal_field_of_view) - print_int("horizontal_field_of_view", stereo->horizontal_field_of_view); + print_int("baseline", stereo->baseline); + print_q("horizontal_disparity_adjustment", stereo->horizontal_disparity_adjustment, '/'); + print_int("horizontal_field_of_view", stereo->horizontal_field_of_view); } else if (sd->type == AV_PKT_DATA_SPHERICAL) { const AVSphericalMapping *spherical = (AVSphericalMapping *)sd->data; print_str("projection", av_spherical_projection_name(spherical->projection)); diff --git a/tests/ref/fate/matroska-spherical-mono b/tests/ref/fate/matroska-spherical-mono index 08b94e455b..c52ca8e7ee 100644 --- a/tests/ref/fate/matroska-spherical-mono +++ b/tests/ref/fate/matroska-spherical-mono @@ -5,6 +5,9 @@ type=2D inverted=0 view=packed primary_eye=none +baseline=0 +horizontal_disparity_adjustment=0/0 +horizontal_field_of_view=0 [/SIDE_DATA] [SIDE_DATA] side_data_type=Spherical Mapping diff --git a/tests/ref/fate/matroska-spherical-mono-remux b/tests/ref/fate/matroska-spherical-mono-remux index 0ca77c8074..10b92d5f2e 100644 --- a/tests/ref/fate/matroska-spherical-mono-remux +++ b/tests/ref/fate/matroska-spherical-mono-remux @@ -29,6 +29,9 @@ type=2D inverted=0 view=packed primary_eye=none +baseline=0 +horizontal_disparity_adjustment=0/0 +horizontal_field_of_view=0 [/SIDE_DATA] [SIDE_DATA] side_data_type=Spherical Mapping @@ -55,6 +58,9 @@ type=2D inverted=0 view=packed primary_eye=none +baseline=0 +horizontal_disparity_adjustment=0/0 +horizontal_field_of_view=0 [/SIDE_DATA] [SIDE_DATA] side_data_type=Spherical Mapping diff --git a/tests/ref/fate/matroska-stereo_mode b/tests/ref/fate/matroska-stereo_mode index 13bce13cb8..a1aab1e38e 100644 --- a/tests/ref/fate/matroska-stereo_mode +++ b/tests/ref/fate/matroska-stereo_mode @@ -134,6 +134,9 @@ type=side by side inverted=0 view=packed primary_eye=none +baseline=0 +horizontal_disparity_adjustment=0/0 +horizontal_field_of_view=0 [/SIDE_DATA] [/STREAM] [STREAM] @@ -151,6 +154,9 @@ type=top and bottom inverted=1 view=packed primary_eye=none +baseline=0 +horizontal_disparity_adjustment=0/0 +horizontal_field_of_view=0 [/SIDE_DATA] [/STREAM] [STREAM] @@ -166,6 +172,9 @@ type=interleaved lines inverted=1 view=packed primary_eye=none +baseline=0 +horizontal_disparity_adjustment=0/0 +horizontal_field_of_view=0 [/SIDE_DATA] [/STREAM] [STREAM] @@ -182,6 +191,9 @@ type=interleaved columns inverted=1 view=packed primary_eye=none +baseline=0 +horizontal_disparity_adjustment=0/0 +horizontal_field_of_view=0 [/SIDE_DATA] [/STREAM] [STREAM] diff --git a/tests/ref/fate/matroska-vp8-alpha-remux b/tests/ref/fate/matroska-vp8-alpha-remux index e54304cafd..ea8a089cec 100644 --- a/tests/ref/fate/matroska-vp8-alpha-remux +++ b/tests/ref/fate/matroska-vp8-alpha-remux @@ -37,5 +37,8 @@ type=2D inverted=0 view=packed primary_eye=none +baseline=0 +horizontal_disparity_adjustment=0/0 +horizontal_field_of_view=0 [/SIDE_DATA] [/STREAM]