RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffprobe: always print all Stereo3D fields 

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 <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-06-18 15:44:24 -03:00
parent 3a5202d026
commit 5140d8334e
6 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fftools/ffprobe.c
View File

@ -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));

3
tests/ref/fate/matroska-spherical-mono
View File

@ -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

6
tests/ref/fate/matroska-spherical-mono-remux
View File

@ -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

12
tests/ref/fate/matroska-stereo_mode
View File

@ -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]

3
tests/ref/fate/matroska-vp8-alpha-remux
View File

@ -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]

3
tests/ref/fate/mov-spherical-mono
View File

@ -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