From 049dfe3f652f3f79d15bbe72c10ed6888beee6d7 Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Thu, 30 May 2024 19:55:53 +0100 Subject: [PATCH] fftools/ffprobe: Print more Stereo 3D info from side data 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..a814cb5ade 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.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); } 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