aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Izen <leo.izen@gmail.com>2025-04-12 12:00:52 -0400
committerLeo Izen <leo.izen@gmail.com>2025-08-19 11:26:48 -0400
commit5d4f873ff31f86f9ae1927f37ca0fcb78da70512 (patch)
tree276d5db9f54df002a51f297e9839b480ac3b6f2c
parent1e816ebefee0ef479fa76bd2a1fb9ec5d5e807df (diff)
downloadffmpeg-5d4f873ff31f86f9ae1927f37ca0fcb78da70512.tar.gz
fftools/ffprobe: print EXIF side data size
We don't need to print the tags here because they're added as dict elements to AVFrame->metadata and are printed elsewhere with ffprobe -show_frames. Signed-off-by: Leo Izen <leo.izen@gmail.com>
-rw-r--r--fftools/ffprobe.c2
-rw-r--r--tests/ref/fate/exif-image-embedded1
-rw-r--r--tests/ref/fate/exif-image-jpg1
-rw-r--r--tests/ref/fate/exif-image-tiff1
-rw-r--r--tests/ref/fate/exif-image-webp1
5 files changed, 6 insertions, 0 deletions
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index b8d51071e6..018111318e 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -1342,6 +1342,8 @@ static void print_frame_side_data(AVTextFormatContext *tfc,
print_film_grain_params(tfc, fgp);
} else if (sd->type == AV_FRAME_DATA_VIEW_ID) {
print_int("view_id", *(int*)sd->data);
+ } else if (sd->type == AV_FRAME_DATA_EXIF) {
+ print_int("size", sd->size);
}
avtext_print_section_footer(tfc);
}
diff --git a/tests/ref/fate/exif-image-embedded b/tests/ref/fate/exif-image-embedded
index a6617bd89f..22d4b03d1c 100644
--- a/tests/ref/fate/exif-image-embedded
+++ b/tests/ref/fate/exif-image-embedded
@@ -34,6 +34,7 @@ TAG:ExifIFD/UserComment=AppleMark
[SIDE_DATA]
side_data_type=EXIF metadata
+size=55
[/SIDE_DATA]
[/FRAME]
[FRAME]
diff --git a/tests/ref/fate/exif-image-jpg b/tests/ref/fate/exif-image-jpg
index 5135ae32f8..d847ae7c7f 100644
--- a/tests/ref/fate/exif-image-jpg
+++ b/tests/ref/fate/exif-image-jpg
@@ -199,5 +199,6 @@ TAG:ExifIFD/DigitalZoomRatio= 4000:4000
TAG:ExifIFD/SceneCaptureType= 0
[SIDE_DATA]
side_data_type=EXIF metadata
+size=3297
[/SIDE_DATA]
[/FRAME]
diff --git a/tests/ref/fate/exif-image-tiff b/tests/ref/fate/exif-image-tiff
index 81737cb983..f0c0946c76 100644
--- a/tests/ref/fate/exif-image-tiff
+++ b/tests/ref/fate/exif-image-tiff
@@ -54,5 +54,6 @@ TAG:ResolutionUnit= 3
TAG:Software=ImageMagick 6.5.8-0 2010-02-09 Q16 http://www.imagemagick.org
[SIDE_DATA]
side_data_type=EXIF metadata
+size=403
[/SIDE_DATA]
[/FRAME]
diff --git a/tests/ref/fate/exif-image-webp b/tests/ref/fate/exif-image-webp
index 7c01ae3d66..54c8294362 100644
--- a/tests/ref/fate/exif-image-webp
+++ b/tests/ref/fate/exif-image-webp
@@ -199,5 +199,6 @@ TAG:ExifIFD/DigitalZoomRatio= 4000:4000
TAG:ExifIFD/SceneCaptureType= 0
[SIDE_DATA]
side_data_type=EXIF metadata
+size=9718
[/SIDE_DATA]
[/FRAME]