From patchwork Mon Jun 17 13:41:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 49974 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1952983vqg; Mon, 17 Jun 2024 06:42:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW6N+6wWqUv04xKbe0NsNQLerzPw7cPI5dGYhcKOf1rLdu7pVQuvDxQ8Uj4osDZICeUD9yHa4MWNKaN+ef8J+MUS/bp0JlZNsM6xg== X-Google-Smtp-Source: AGHT+IGiTmutaGVF2npU3PBvKQ6295sYlYcz7a/KqB6jFFpkn6gNtf+Wm4eV8ue96iX2yDxrT3g5 X-Received: by 2002:a50:9354:0:b0:57c:6f0a:bc57 with SMTP id 4fb4d7f45d1cf-57cbd7c4ef0mr6741776a12.36.1718631751567; Mon, 17 Jun 2024 06:42:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718631751; cv=none; d=google.com; s=arc-20160816; b=Ucbjf0IvGl08MyBJSOxZj6Wx61+7o859IB49df8qs10eMy/Q4fF/aOh7acCrSfxJDZ GWB4habwK3bI2GU/hTbsUWOsOyOmhhs2h+tDC1FgZ5/RazMq7zPfqRC7J3QEruzzFsZT fiKgNRmUB1tbI543WZKbad45b6kQgE+WHa3SYGpzmw9GkttN/RPbx755Ul8aMomAWbzW 2fhje9S5Xqd5m/YxSK9VO9RRPTRsLEt8GsZQhdd/w5Ddrz+LRsOPiBK0AT+D8ZbD1bSL zJFM+2FKiWytRCDe153ODyrhjMnyOsCKguz6EbutOIaz48a0Tmdv8mwsFcU1cTHxbH85 PHBg== 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=cma9KPLASzpbJwOD8ZoOIQ87X3BoUjAlFlAYbT9Nkp4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=TpX3v+zxYaENxPRi9hPDpu/P0ZExkzi3CxzPFCSc9ARCC4lrlr2ZUAnsX9SIRCFE90 1mDo4+X3eNK1E4HjFbNag599SB8eG8xZ1+rPCydiDM3Jp8rVkisQIKzIoK6fBU2a9fAq hIKXB1cQxTHr472+g0bP05MMA3rFA/OxESPvMgfuxHugduzVn+BrxHIH6cNoni47X0Jf tpNZFyyATBtqR0lYaOUD5eAl6ZM3OnMFgsFezef4CUnkdClTGxA8yjL24dLO9q/4XaLk z5wxljwwFrWuBz/FM4ZbLoxm/dRKluvtqwYPZQpP+rLLi5NX8JRwzVUqX8m5dWq0gRlf ElqQ==; 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=iXmuAg1I; 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-57cb72d69b1si4679164a12.110.2024.06.17.06.42.30; Mon, 17 Jun 2024 06:42:31 -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=iXmuAg1I; 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 81BBD68D781; Mon, 17 Jun 2024 16:42:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 756C868D771 for ; Mon, 17 Jun 2024 16:41:55 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-35f2d723ef0so3692417f8f.1 for ; Mon, 17 Jun 2024 06:41:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718631714; x=1719236514; 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=NS9vrMwN9pvW3LCmi7okYMKbXrzDDau5E4L98MhHDv0=; b=iXmuAg1IugClg4Jypu1yO9oVZvQBRtKBc6WkXdEOvky9hoiu5ZeYAtd1UEtHmVXxkL 8nFuWE4fO2FGqdrl0DWbhFKwdKJ3dalFz6ce74qV/TleW7OCtd/wcGZpevF6GzZu1AXL cybhOXXIQnSsYTvwAZNmG0Ych2JZ2OBiQ9DkYbPhe20QkSBhMV155LIeftHjBdPwIBtO ptAggTMszRJT3UjtBop+e4RSnzOH8MgouQW9nhh0GX++Gk93YrPHzFZfHW7N3ztS1MH0 C2N/GDMqVlaatxGufS3zx1SrtMFCaiScfTRukRvRHSA5171WUFN6uEZvefVvzU8oSr23 YQqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718631714; x=1719236514; 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=NS9vrMwN9pvW3LCmi7okYMKbXrzDDau5E4L98MhHDv0=; b=DEBLGqGlq/rJ/W04I61DZIMFT5BJzVaFG2U1yY1xXV7PbqFJ7zeeWV/8aC4JqI2Xzr aOZ7dnZFv9nD8/bqWyJsjap2Fj2/RgwCdozm5xw3sSycNsC1lMBQq33KTXdzxFm/c3gR Y68MzxdvPzJLbix9I8kVlBgDMSwDOCdWu+h77vzrWowJJyBY3H/4fXxqWBTEGP8eMLWB lIS5q4J4aN1Axmy8CsaznVmYZpDYeN2Kf6B5Xod1W9i+/M6MVRMcu59LTDUcpEHkOUFx NyFw4WJ9P8ayDcmV4uCqKg0MP7MYLLgtnMslFi4ZUPgRzh40CreE2N1EV9BRt66j1vG3 FCng== X-Gm-Message-State: AOJu0YzAoxQz/yv+BS+fzA5pV9HqIzHBBHjKBiL9n31Oj+VYwji0R8LA udGrAMR7urKtV3FtNo6nHfzHTZNGaWCCoz0apyH5fQLdcFpSGbKxCimQkg== X-Received: by 2002:a5d:6e03:0:b0:35f:1ed3:fe8c with SMTP id ffacd0b85a97d-3607a77fcbfmr7601463f8f.53.1718631714147; Mon, 17 Jun 2024 06:41:54 -0700 (PDT) Received: from localhost.localdomain (0540dce9.skybroadband.com. [5.64.220.233]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3607509c790sm11915391f8f.38.2024.06.17.06.41.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 06:41:53 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jun 2024 14:41:39 +0100 Message-ID: <20240617134141.224614-4-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240617134141.224614-1-derek.buitenhuis@gmail.com> References: <20240617134141.224614-1-derek.buitenhuis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/5] fftools/ffprobe: Print more Stereo 3D info from side data 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: wEW8aK7x/bNe Signed-off-by: Derek Buitenhuis --- fftools/ffprobe.c | 8 ++++++++ tests/ref/fate/matroska-spherical-mono | 2 ++ tests/ref/fate/matroska-spherical-mono-remux | 4 ++++ tests/ref/fate/matroska-stereo_mode | 8 ++++++++ tests/ref/fate/matroska-vp8-alpha-remux | 2 ++ tests/ref/fate/mov-spherical-mono | 2 ++ 6 files changed, 26 insertions(+) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 2d38e5dfdc..082cec8a64 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2544,6 +2544,14 @@ 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)); + 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) + print_int("horizontal_disparity_adjustment", stereo->horizontal_disparity_adjustment); + if (stereo->horizontal_field_of_view) + 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 bd57d94514..08b94e455b 100644 --- a/tests/ref/fate/matroska-spherical-mono +++ b/tests/ref/fate/matroska-spherical-mono @@ -3,6 +3,8 @@ side_data_type=Stereo 3D type=2D inverted=0 +view=packed +primary_eye=none [/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 6fcda14822..0ca77c8074 100644 --- a/tests/ref/fate/matroska-spherical-mono-remux +++ b/tests/ref/fate/matroska-spherical-mono-remux @@ -27,6 +27,8 @@ DISPOSITION:forced=1 side_data_type=Stereo 3D type=2D inverted=0 +view=packed +primary_eye=none [/SIDE_DATA] [SIDE_DATA] side_data_type=Spherical Mapping @@ -51,6 +53,8 @@ DISPOSITION:forced=0 side_data_type=Stereo 3D type=2D inverted=0 +view=packed +primary_eye=none [/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 739b789fea..13bce13cb8 100644 --- a/tests/ref/fate/matroska-stereo_mode +++ b/tests/ref/fate/matroska-stereo_mode @@ -132,6 +132,8 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=side by side inverted=0 +view=packed +primary_eye=none [/SIDE_DATA] [/STREAM] [STREAM] @@ -147,6 +149,8 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=top and bottom inverted=1 +view=packed +primary_eye=none [/SIDE_DATA] [/STREAM] [STREAM] @@ -160,6 +164,8 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=interleaved lines inverted=1 +view=packed +primary_eye=none [/SIDE_DATA] [/STREAM] [STREAM] @@ -174,6 +180,8 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=interleaved columns inverted=1 +view=packed +primary_eye=none [/SIDE_DATA] [/STREAM] [STREAM] diff --git a/tests/ref/fate/matroska-vp8-alpha-remux b/tests/ref/fate/matroska-vp8-alpha-remux index f6c24dead6..e54304cafd 100644 --- a/tests/ref/fate/matroska-vp8-alpha-remux +++ b/tests/ref/fate/matroska-vp8-alpha-remux @@ -35,5 +35,7 @@ DISPOSITION:still_image=0 side_data_type=Stereo 3D type=2D inverted=0 +view=packed +primary_eye=none [/SIDE_DATA] [/STREAM] diff --git a/tests/ref/fate/mov-spherical-mono b/tests/ref/fate/mov-spherical-mono index bd57d94514..08b94e455b 100644 --- a/tests/ref/fate/mov-spherical-mono +++ b/tests/ref/fate/mov-spherical-mono @@ -3,6 +3,8 @@ side_data_type=Stereo 3D type=2D inverted=0 +view=packed +primary_eye=none [/SIDE_DATA] [SIDE_DATA] side_data_type=Spherical Mapping