* [FFmpeg-devel] [PATCH 2/5] avfilter/vf_showinfo: don't use sizeof(AVStereo3D)
2024-06-26 14:10 [FFmpeg-devel] [PATCH 1/5] avfilter/vf_showinfo: print more Stereo 3D fields James Almer
@ 2024-06-26 14:10 ` James Almer
2024-06-26 14:10 ` [FFmpeg-devel] [PATCH 3/5] avfilter/vf_showinfo: use av_spherical_projection_name() James Almer
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: James Almer @ 2024-06-26 14:10 UTC (permalink / raw)
To: ffmpeg-devel
It's not part of the libavutil ABI.
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavfilter/vf_showinfo.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index 9790c202f5..fdcf9210e7 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -108,14 +108,7 @@ static void dump_spherical(AVFilterContext *ctx, AVFrame *frame, const AVFrameSi
static void dump_stereo3d(AVFilterContext *ctx, const AVFrameSideData *sd)
{
- const AVStereo3D *stereo;
-
- if (sd->size < sizeof(*stereo)) {
- av_log(ctx, AV_LOG_ERROR, "invalid data\n");
- return;
- }
-
- stereo = (const AVStereo3D *)sd->data;
+ const AVStereo3D *stereo = (const AVStereo3D *)sd->data;
av_log(ctx, AV_LOG_INFO, "type - %s", av_stereo3d_type_name(stereo->type));
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 7+ messages in thread* [FFmpeg-devel] [PATCH 3/5] avfilter/vf_showinfo: use av_spherical_projection_name()
2024-06-26 14:10 [FFmpeg-devel] [PATCH 1/5] avfilter/vf_showinfo: print more Stereo 3D fields James Almer
2024-06-26 14:10 ` [FFmpeg-devel] [PATCH 2/5] avfilter/vf_showinfo: don't use sizeof(AVStereo3D) James Almer
@ 2024-06-26 14:10 ` James Almer
2024-06-26 14:10 ` [FFmpeg-devel] [PATCH 4/5] avfilter/vf_showinfo: only print yaw, pitch, and roll if set James Almer
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: James Almer @ 2024-06-26 14:10 UTC (permalink / raw)
To: ffmpeg-devel
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavfilter/vf_showinfo.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index fdcf9210e7..98c5632d52 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -78,16 +78,7 @@ static void dump_spherical(AVFilterContext *ctx, AVFrame *frame, const AVFrameSi
return;
}
- if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR)
- av_log(ctx, AV_LOG_INFO, "equirectangular ");
- else if (spherical->projection == AV_SPHERICAL_CUBEMAP)
- av_log(ctx, AV_LOG_INFO, "cubemap ");
- else if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE)
- av_log(ctx, AV_LOG_INFO, "tiled equirectangular ");
- else {
- av_log(ctx, AV_LOG_WARNING, "unknown\n");
- return;
- }
+ av_log(ctx, AV_LOG_INFO, "%s ", av_spherical_projection_name(spherical->projection));
yaw = ((double)spherical->yaw) / (1 << 16);
pitch = ((double)spherical->pitch) / (1 << 16);
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 7+ messages in thread* [FFmpeg-devel] [PATCH 4/5] avfilter/vf_showinfo: only print yaw, pitch, and roll if set
2024-06-26 14:10 [FFmpeg-devel] [PATCH 1/5] avfilter/vf_showinfo: print more Stereo 3D fields James Almer
2024-06-26 14:10 ` [FFmpeg-devel] [PATCH 2/5] avfilter/vf_showinfo: don't use sizeof(AVStereo3D) James Almer
2024-06-26 14:10 ` [FFmpeg-devel] [PATCH 3/5] avfilter/vf_showinfo: use av_spherical_projection_name() James Almer
@ 2024-06-26 14:10 ` James Almer
2024-06-26 14:10 ` [FFmpeg-devel] [PATCH 5/5] avfilter/vf_showinfo: don't use sizeof(AVSphericalMapping) James Almer
2024-06-28 14:50 ` [FFmpeg-devel] [PATCH 1/5] avfilter/vf_showinfo: print more Stereo 3D fields James Almer
4 siblings, 0 replies; 7+ messages in thread
From: James Almer @ 2024-06-26 14:10 UTC (permalink / raw)
To: ffmpeg-devel
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavfilter/vf_showinfo.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index 98c5632d52..72b91329d2 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -80,10 +80,12 @@ static void dump_spherical(AVFilterContext *ctx, AVFrame *frame, const AVFrameSi
av_log(ctx, AV_LOG_INFO, "%s ", av_spherical_projection_name(spherical->projection));
+ if (spherical->yaw || spherical->pitch || spherical->roll) {
yaw = ((double)spherical->yaw) / (1 << 16);
pitch = ((double)spherical->pitch) / (1 << 16);
roll = ((double)spherical->roll) / (1 << 16);
av_log(ctx, AV_LOG_INFO, "(%f/%f/%f) ", yaw, pitch, roll);
+ }
if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE) {
size_t l, t, r, b;
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 7+ messages in thread* [FFmpeg-devel] [PATCH 5/5] avfilter/vf_showinfo: don't use sizeof(AVSphericalMapping)
2024-06-26 14:10 [FFmpeg-devel] [PATCH 1/5] avfilter/vf_showinfo: print more Stereo 3D fields James Almer
` (2 preceding siblings ...)
2024-06-26 14:10 ` [FFmpeg-devel] [PATCH 4/5] avfilter/vf_showinfo: only print yaw, pitch, and roll if set James Almer
@ 2024-06-26 14:10 ` James Almer
2024-07-01 20:38 ` Stefano Sabatini
2024-06-28 14:50 ` [FFmpeg-devel] [PATCH 1/5] avfilter/vf_showinfo: print more Stereo 3D fields James Almer
4 siblings, 1 reply; 7+ messages in thread
From: James Almer @ 2024-06-26 14:10 UTC (permalink / raw)
To: ffmpeg-devel
It's not part of the libavutil ABI.
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavfilter/vf_showinfo.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index 72b91329d2..c21dc0a10b 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -73,11 +73,6 @@ static void dump_spherical(AVFilterContext *ctx, AVFrame *frame, const AVFrameSi
const AVSphericalMapping *spherical = (const AVSphericalMapping *)sd->data;
double yaw, pitch, roll;
- if (sd->size < sizeof(*spherical)) {
- av_log(ctx, AV_LOG_ERROR, "invalid data\n");
- return;
- }
-
av_log(ctx, AV_LOG_INFO, "%s ", av_spherical_projection_name(spherical->projection));
if (spherical->yaw || spherical->pitch || spherical->roll) {
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [FFmpeg-devel] [PATCH 1/5] avfilter/vf_showinfo: print more Stereo 3D fields
2024-06-26 14:10 [FFmpeg-devel] [PATCH 1/5] avfilter/vf_showinfo: print more Stereo 3D fields James Almer
` (3 preceding siblings ...)
2024-06-26 14:10 ` [FFmpeg-devel] [PATCH 5/5] avfilter/vf_showinfo: don't use sizeof(AVSphericalMapping) James Almer
@ 2024-06-28 14:50 ` James Almer
4 siblings, 0 replies; 7+ messages in thread
From: James Almer @ 2024-06-28 14:50 UTC (permalink / raw)
To: ffmpeg-devel
On 6/26/2024 11:10 AM, James Almer wrote:
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
> libavfilter/vf_showinfo.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
> index 28d8ea76e9..9790c202f5 100644
> --- a/libavfilter/vf_showinfo.c
> +++ b/libavfilter/vf_showinfo.c
> @@ -121,6 +121,16 @@ static void dump_stereo3d(AVFilterContext *ctx, const AVFrameSideData *sd)
>
> if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
> av_log(ctx, AV_LOG_INFO, " (inverted)");
> +
> + av_log(ctx, AV_LOG_INFO, ", view - %s, primary_eye - %s", av_stereo3d_view_name(stereo->view),
> + av_stereo3d_primary_eye_name(stereo->primary_eye));
> + if (stereo->baseline)
> + av_log(ctx, AV_LOG_INFO, ", baseline: %"PRIu32"", stereo->baseline);
> + if (stereo->horizontal_disparity_adjustment.num && stereo->horizontal_disparity_adjustment.den)
> + av_log(ctx, AV_LOG_INFO, ", horizontal_disparity_adjustment: %0.4f",
> + av_q2d(stereo->horizontal_disparity_adjustment));
> + if (stereo->horizontal_field_of_view.num && stereo->horizontal_field_of_view.den)
> + av_log(ctx, AV_LOG_INFO, ", horizontal_field_of_view: %0.3f", av_q2d(stereo->horizontal_field_of_view));
> }
>
> static void dump_s12m_timecode(AVFilterContext *ctx, AVRational frame_rate, const AVFrameSideData *sd)
Will apply set.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 7+ messages in thread