[FFmpeg-devel] [PATCH 1/2] avformat/mov: don't export frame cropping stream side data when the clap box is a no-op

[FFmpeg-devel] [PATCH 1/2] avformat/mov: don't export frame cropping stream side data when the clap box is a no-op

[James Almer]

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/mov.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index ce95842ce5..20efc74f00 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1262,6 +1262,9 @@ static int mov_read_clap(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     bottom = st->codecpar->height - 1 - bottom;
     right  = st->codecpar->width  - 1 - right;
 
+    if (!(left | right | top | bottom))
+        return 0;
+
     if ((left + right) >= st->codecpar->width ||
         (top + bottom) >= st->codecpar->height)
         return AVERROR_INVALIDDATA;
-- 
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".

[FFmpeg-devel] [PATCH 2/2] fftools/ffmpeg_filter: use the correct specifier for crop arguments

[James Almer]

Signed-off-by: James Almer <jamrial@gmail.com>
---
 fftools/ffmpeg_filter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 097bd2ed48..b562e8417c 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -1703,7 +1703,7 @@ static int configure_input_video_filter(FilterGraph *fg, AVFilterGraph *graph,
 
     if ((ifp->opts.flags & IFILTER_FLAG_CROP)) {
         char crop_buf[64];
-        snprintf(crop_buf, sizeof(crop_buf), "w=iw-%d-%d:h=ih-%d-%d:x=%d:y=%d",
+        snprintf(crop_buf, sizeof(crop_buf), "w=iw-%u-%u:h=ih-%u-%u:x=%u:y=%u",
                  ifp->opts.crop_left, ifp->opts.crop_right,
                  ifp->opts.crop_top, ifp->opts.crop_bottom,
                  ifp->opts.crop_left, ifp->opts.crop_top);
-- 
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".

[FFmpeg-devel] [PATCH 3/3] fftools/ffmpeg_demux: don't insert the crop filter if frame cropping side data defines no cropping

[James Almer]

Signed-off-by: James Almer <jamrial@gmail.com>
---
 fftools/ffmpeg_demux.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index 528e02149f..6f7d78c896 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -1014,7 +1014,8 @@ int ist_filter_add(InputStream *ist, InputFilter *ifilter, int is_simple,
             opts->crop_bottom = AV_RL32(sd->data +  4);
             opts->crop_left   = AV_RL32(sd->data +  8);
             opts->crop_right  = AV_RL32(sd->data + 12);
-            if (ds->apply_cropping && ds->apply_cropping != CROP_CODEC)
+            if (ds->apply_cropping && ds->apply_cropping != CROP_CODEC &&
+                (opts->crop_top | opts->crop_bottom | opts->crop_left | opts->crop_right))
                 opts->flags |= IFILTER_FLAG_CROP;
         }
     } else if (ist->par->codec_type == AVMEDIA_TYPE_SUBTITLE) {
-- 
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".

Re: [FFmpeg-devel] [PATCH 3/3] fftools/ffmpeg_demux: don't insert the crop filter if frame cropping side data defines no cropping

[Anton Khirnov]

Quoting James Almer (2024-07-18 04:03:30)
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  fftools/ffmpeg_demux.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
> index 528e02149f..6f7d78c896 100644
> --- a/fftools/ffmpeg_demux.c
> +++ b/fftools/ffmpeg_demux.c
> @@ -1014,7 +1014,8 @@ int ist_filter_add(InputStream *ist, InputFilter *ifilter, int is_simple,
>              opts->crop_bottom = AV_RL32(sd->data +  4);
>              opts->crop_left   = AV_RL32(sd->data +  8);
>              opts->crop_right  = AV_RL32(sd->data + 12);
> -            if (ds->apply_cropping && ds->apply_cropping != CROP_CODEC)
> +            if (ds->apply_cropping && ds->apply_cropping != CROP_CODEC &&
> +                (opts->crop_top | opts->crop_bottom | opts->crop_left | opts->crop_right))

Looks ok

-- 
Anton Khirnov
_______________________________________________
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".