From patchwork Sat Jun 22 15:31: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: 50079 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1128852vqz; Sat, 22 Jun 2024 08:32:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCULnA1s7Ur7oB2U/gqUUixhEiSPvp3RM2jUEtmWvu2FReYV1ZFNzhgc4zKhHPM1ecRWcq72ClNznMkMVZE0jVJuoY3WcJn/YUJLSw== X-Google-Smtp-Source: AGHT+IEhun/d5X9YQM/cq9l/MfWTd85jZUty82ITXEEcNdd+2/O0KKGYe32YSVwSIOZ/NaeEAJX3 X-Received: by 2002:a17:906:fb0c:b0:a6e:f646:6fdb with SMTP id a640c23a62f3a-a7245c7025emr6563566b.72.1719070331936; Sat, 22 Jun 2024 08:32:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719070331; cv=none; d=google.com; s=arc-20160816; b=NmCR893LM9ls/4OEkpGWnzWTw7vJPPb7aWPTZg3mtvNHPjsu4KrSXOAPmkTtDn0LV4 pId+xI8fUf8juPyVvhl0mcdgI6JIldWK6a3nEt7gQ55O+Q0SxUk5AszyusZuuBnMFrbX F6tc45S8u0DMYMNCPzq9aUoayfbZb0+tP61M8qRDLf96XlFA0+BhKlkGmC02xLSvdZm6 3WXgkfftH1OO7hkIwjHOUCdfcoOb0Uyjp6U1KWGDlvzUnSg5Si61UL6HgwKfsYp2xvrI 4YtweSJGaPNg5xnSPfg59aOXAK/EwSrUdC0sFQPjOKwBrXhW79Xup+/TZ04yzFu1LnSu RUiw== 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=goWByIygY+eer6Ao63MmjLB9xPrfwFT97K6Swm4ZOMI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=VmJ32IV5ValDebSDKXwspBPEIOIgms4uDXkcTVQhDJpc4wj8WDElcBaTyi1jBZk1Oj 0bG3Ldrs0cyYO5j/JIXP7s8GXx8ffk+5EnggqpqF9W3Os4wgCZMalC62zpnntR5Szqj2 1tHK9IgxsL90eF1Aj7E9hCzgtokbX72+/BVecvF3gSVgixciI/ui6SDDDHwOkATnIwo5 Ta7GWDJjfbyurTVqeS+bh/6FM9SrmHU4q2t5NsBQevtoZOyu1PN85FbuGILZ7956Z0yo ZjkhC2NWXZECFkaPiyy1fy/1OE05tm7H4klvm9PW5SO+Mv+ZvUHjOIsciwt4QlA+PCpB MrMw==; 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=jfYPf5IC; 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 a640c23a62f3a-a6fcf565342si194239766b.685.2024.06.22.08.32.11; Sat, 22 Jun 2024 08:32:11 -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=jfYPf5IC; 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 1D07F68D63E; Sat, 22 Jun 2024 18:31:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A74868D607 for ; Sat, 22 Jun 2024 18:31:39 +0300 (EEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-70656b43fd4so1126645b3a.0 for ; Sat, 22 Jun 2024 08:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719070297; x=1719675097; 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=FkX+aRQoxUDPhIxWajQ8kYlXitnC8CdmqqX+0DiEgoU=; b=jfYPf5ICKEAVwGNCGX/3rxzEhkebiQQmMvj/X6Ngp6hd0dD+fnW0zT7sd2/X8kjlSv sBLCpyvS7a5/gMshlMOshej4r2xm/y3681eyxTzcQjmmCG+650lNgNuy4vBLUkQOqgc0 fozkpgP1vniHGKADve/PjQTX+v++SRMkShXQFqk/4p4dLAAhBS9r9720W3rRNaiaF5L1 MWRms/2ZbefrdA7nGgjb02/OSH5iuDZ6sgcucqg0R11/EpWcYLHj362GhyFvUooyg4qD YO0+FELxrorc36MSPl9oIfYitX7vfG8AM7rThxxYBBCqubYLQicoffZcQu24O50icKRe 5TCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719070297; x=1719675097; 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=FkX+aRQoxUDPhIxWajQ8kYlXitnC8CdmqqX+0DiEgoU=; b=PnuvYesqdQZEZ37CRYDKZyjkCbPWJ9EdHKcYXT07VffDPOYIAb3aPy/QZWDN8eoByt aWU4pmutGfQ6R68cnVBVjW9cNzFOkqgIjUgZxqH5/mK56ovvdZBYLJtxharSyvWE416E gKZMTN2OA2zvLpA/rfWC72xe+JN778a4W6VctPTVdBTYdXJJ+0FBkqp69z4oqMi4DvGn Wp6B76FdUicVKRzvC6S7hj2zWzYdv9qmtQIDSYgeyMABi7V5cpPTvVazQMlEwA2yZREm OUhBfxgQ2+cenJaLn56j4dUVi9j2iLLKs++6Y5umJhre1CamKABOzuk8DnrZZbU72sgk 5Daw== X-Gm-Message-State: AOJu0Yxei+MM9KppaUdquUmWe2qFh2dMST7H5aa+td26R9tdjAMBthVr OHmKoKtqPHu4CZaKZM07mEza0nDayJykiyMrcDLrowvTtk8GIUTuF+Sg8A== X-Received: by 2002:a05:6a20:3514:b0:1b6:a7c5:4fac with SMTP id adf61e73a8af0-1bcf7fc2c7dmr115205637.38.1719070295955; Sat, 22 Jun 2024 08:31:35 -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.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 08:31:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:31:19 -0300 Message-ID: <20240622153122.6220-5-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 5/8 v2] fftools/ffprobe: infer AVStereo3D.view when it's not explicit 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: ENnHbPT7gDxl Signed-off-by: James Almer --- Better infer it than not printing it, following the logic from 5140d8334e3b. fftools/ffprobe.c | 6 +++++- tests/ref/fate/matroska-stereo_mode | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index d7ba980ff9..397ea848fc 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2542,9 +2542,13 @@ static void print_pkt_side_data(WriterContext *w, print_int("rotation", rotation); } else if (sd->type == AV_PKT_DATA_STEREO3D) { const AVStereo3D *stereo = (AVStereo3D *)sd->data; + enum AVStereo3DView view = stereo->view; print_str("type", av_stereo3d_type_name(stereo->type)); print_int("inverted", !!(stereo->flags & AV_STEREO3D_FLAG_INVERT)); - print_str("view", av_stereo3d_view_name(stereo->view)); + if (stereo->type != AV_STEREO3D_VIEW) + view = (stereo->type == AV_STEREO3D_2D) ? + AV_STEREO3D_VIEW_MONO : AV_STEREO3D_VIEW_PACKED; + print_str("view", av_stereo3d_view_name(view)); print_str("primary_eye", av_stereo3d_primary_eye_name(stereo->primary_eye)); print_int("baseline", stereo->baseline); print_q("horizontal_disparity_adjustment", stereo->horizontal_disparity_adjustment, '/'); diff --git a/tests/ref/fate/matroska-stereo_mode b/tests/ref/fate/matroska-stereo_mode index e35425ae76..26c325b20e 100644 --- a/tests/ref/fate/matroska-stereo_mode +++ b/tests/ref/fate/matroska-stereo_mode @@ -132,7 +132,7 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=side by side inverted=0 -view=monoscopic +view=packed primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 @@ -152,7 +152,7 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=top and bottom inverted=1 -view=monoscopic +view=packed primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 @@ -170,7 +170,7 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=interleaved lines inverted=1 -view=monoscopic +view=packed primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 @@ -189,7 +189,7 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=interleaved columns inverted=1 -view=monoscopic +view=packed primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1