From patchwork Sat Jun 22 03:37:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp894125vqz; Fri, 21 Jun 2024 20:37:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXceV536/LCtbdAzQ4IpzxLxOkkPIQp/n4OXgt6FKv8FbGNLcGo4h4y2ltKIZOiGv0Mb1FjfFLQBfvh7LSGvka4bBHqwdsBpmgLeQ== X-Google-Smtp-Source: AGHT+IFQ3UCyaa/uA3F48749Ej6yrCv9JNnFtsI6+QZp7rdQc5knbCqio0DfDSIY8adS80CVj/Lt X-Received: by 2002:a2e:a176:0:b0:2ec:165a:2254 with SMTP id 38308e7fff4ca-2ec3cfff3a4mr57102231fa.44.1719027443058; Fri, 21 Jun 2024 20:37:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719027443; cv=none; d=google.com; s=arc-20160816; b=mFeS19U9ow/+rXEYrxAnBI0eastf7dp7nkDJumD5EraOQkwAyBAd8Xdhdzz7WR6Z6m pXemGr98JiNcgbRILygIv14d8ULnUQjBEpltNvX/ES/CvIgkYk39lQB8pIb03nXXmvui B0SWuxD1lhZX5YJB1R4hsZP5D2SBe/pn+A42RIo8XBszOIzm7Kp8+iCplmvMF3ZyAaes J8L0N7rNxvdN+tIxUwY9lv3Zt2LK4b+EbrWOkM90DJu1XkaqUX7r38uN9qFGHE+o8SG7 WBQwEQechAZ5NFW561rzDCtVrJG4BI3V3FWevnJHEoy6vv3geTcLOFE5T0w6JsZPCnP/ G5dA== 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=sXssqj5btseGmkgGSWYWsUjaQGis6fqT3U9NrtQoUjg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=C5e3WMMys7cfUjoTcK0sSmDf+jHHbcC2j+iMqyWtqvkcdbuW4wqLKx5+3x7hEnVX5x RX1pfrjbpPU+XhPysJ1db5Pi4ZycCUn/LNud3cj7uIzrblxxaJBYxe3Pb59/u43Aageu ONkyOqt09hegWwg095urxwF9xQZrRA6VnOWcD3bIv7/OXLJ4/SrN9v08Yb7U7qxsPEwC 3ttgfYhONCYyTs7qv9EX16LT70miIgwvQ7KnOaFcx+KWCwMYkVFkgeWXtWXF8VxurGHL W8v1SyxD21/A47qErWdiqVThR4QG/Pg725IQJYHYIfDp5MJV0/2lsx0NU9hq75gK9iY2 CvIQ==; 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=TNJu4pHF; 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-57d30af4355si1288555a12.499.2024.06.21.20.37.22; Fri, 21 Jun 2024 20:37:23 -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=TNJu4pHF; 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 B718568D470; Sat, 22 Jun 2024 06:37:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C555B68D470 for ; Sat, 22 Jun 2024 06:37:12 +0300 (EEST) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-6e7b121be30so2022175a12.1 for ; Fri, 21 Jun 2024 20:37:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719027430; x=1719632230; 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=4/O60/QjjfWXZSSJo2duXpmVwDgTg2XwYtdEoR6XjIc=; b=TNJu4pHFzjEjYy8Zv5C8JYUr5F1057n8VfCwTZ2HT8zJFZIS6nbHMtZgCy9X9AB7dj 3doYMhuGKNvFPLR3Cm7RBxSGo1hr8O7HSEGhS3TDw3gv9TTT2rouc47rW/3hlv6an1Ld 2NeYB5VKffJunYDlom8bTNaHd2T8hi6aBiodQ89U9p+dW+YF0Ar1bmnrutL90GnS2HvU YeGNKfCpLijsPQhGKSH6xK7ZPwHgSgME+Andea/SoVsZtILQ/mAQ5vkrk86PobC2fyU9 Nwx2fbgSgXyeJsRk/rre+PRbHXoYGwc+efm0ezTFr72bpWs0OmJPwyqEjbCdMiZQjwVJ IoRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719027430; x=1719632230; 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=4/O60/QjjfWXZSSJo2duXpmVwDgTg2XwYtdEoR6XjIc=; b=v3Ldx453Y9p2yPL/na7Cr6Yn7zRWJhd9OUABoK3DDHxSTInOesJiUN60j01AESNxfd KH4dMe8etIiut4XMPOg1045ryojLi/4OUAEbtg4fM/NhCYh3GSlf/0Wc/u0W2+TAC55J UaHzf8WMgG+8mgvN98Tz3MWbKBeSWJN2fuAIIL2LrM1dwB8stpYIIkSjjrqb0ckD5CM5 W6Y8nUmQ0IH6W3J3menDs9/0aGOq15xF7GYN7pFCUPayX7K2/7JteZ4WtRt4ac2paIHR M+NKQSFV4JW1idTGZ20twowNbDK+RcZt+VIYj5jvfeMBg4p3R/DRcnATpq8WLqN9l3w/ UylA== X-Gm-Message-State: AOJu0YysNzbaw1MYRCMr5vECrtKDyATmCyHV0KKlr9x/03FPI4TGpXHq iReTYkXDOZ3zoBExB7gvqjDjQ0ou7PZR9QTkDzd0eLHoZ0r5OZUjJdY2qQ== X-Received: by 2002:a05:6a20:2a2f:b0:1b8:6ed5:a92 with SMTP id adf61e73a8af0-1bcbb655bb8mr9541982637.39.1719027429652; Fri, 21 Jun 2024 20:37:09 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f9ebbb29e7sm21495935ad.261.2024.06.21.20.37.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 20:37:09 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 00:37:01 -0300 Message-ID: <20240622033701.8987-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622012531.5523-1-jamrial@gmail.com> References: <20240622012531.5523-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/8] fftools/ffprobe: only print AVStereo3D.view when it's defined 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: B1rjAapi7ERi Signed-off-by: James Almer --- fftools/ffprobe.c | 3 ++- tests/ref/fate/matroska-spherical-mono | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index d7ba980ff9..f9124ad5d7 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2544,7 +2544,8 @@ static void print_pkt_side_data(WriterContext *w, const AVStereo3D *stereo = (AVStereo3D *)sd->data; 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) + print_str("view", av_stereo3d_view_name(stereo->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-spherical-mono b/tests/ref/fate/matroska-spherical-mono index aa17e9c624..254bb9903f 100644 --- a/tests/ref/fate/matroska-spherical-mono +++ b/tests/ref/fate/matroska-spherical-mono @@ -3,7 +3,6 @@ side_data_type=Stereo 3D type=2D inverted=0 -view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1