Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 6/6] fftools/ffplay: support applying container level cropping
Date: Wed, 29 May 2024 18:46:32 -0300
Message-ID: <20240529214632.9843-6-jamrial@gmail.com> (raw)
In-Reply-To: <20240529214632.9843-1-jamrial@gmail.com>

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

diff --git a/fftools/ffplay.c b/fftools/ffplay.c
index 1d0511b254..47e2865abb 100644
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@@ -32,6 +32,7 @@
 
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
@@ -346,6 +347,7 @@ static const char **vfilters_list = NULL;
 static int nb_vfilters = 0;
 static char *afilters = NULL;
 static int autorotate = 1;
+static int apply_cropping = 1;
 static int find_stream_info = 1;
 static int filter_nbthreads = 0;
 static int enable_vulkan = 0;
@@ -1947,6 +1949,28 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
     last_filter = filt_ctx;                                                  \
 } while (0)
 
+    if (apply_cropping) {
+        const AVPacketSideData *sd = av_packet_side_data_get(is->video_st->codecpar->coded_side_data,
+                                                             is->video_st->codecpar->nb_coded_side_data,
+                                                             AV_PKT_DATA_FRAME_CROPPING);
+
+        if (sd && sd->size == sizeof(uint32_t) * 4) {
+            char crop_buf[64];
+            int top    = AV_RL32(sd->data +  0);
+            int bottom = AV_RL32(sd->data +  4);
+            int left   = AV_RL32(sd->data +  8);
+            int right  = AV_RL32(sd->data + 12);
+
+            if (top < 0 || bottom < 0 || left < 0 || right < 0)  {
+                ret = AVERROR(EINVAL);
+                goto fail;
+            }
+
+            snprintf(crop_buf, sizeof(crop_buf), "w=iw-%d-%d:h=ih-%d-%d", left, right, top, bottom);
+            INSERT_FILT("crop", crop_buf);
+        }
+    }
+
     if (autorotate) {
         double theta = 0.0;
         int32_t *displaymatrix = NULL;
@@ -3691,6 +3715,7 @@ static const OptionDef options[] = {
     { "scodec",             OPT_TYPE_STRING, OPT_EXPERT, { &subtitle_codec_name }, "force subtitle decoder", "decoder_name" },
     { "vcodec",             OPT_TYPE_STRING, OPT_EXPERT, {    &video_codec_name }, "force video decoder",    "decoder_name" },
     { "autorotate",         OPT_TYPE_BOOL,            0, { &autorotate }, "automatically rotate video", "" },
+    { "apply_cropping",     OPT_TYPE_BOOL,            0, { &apply_cropping }, "apply container level frame cropping", "" },
     { "find_stream_info",   OPT_TYPE_BOOL, OPT_INPUT | OPT_EXPERT, { &find_stream_info },
         "read and decode the streams to fill missing information with heuristics" },
     { "filter_threads",     OPT_TYPE_INT,    OPT_EXPERT, { &filter_nbthreads }, "number of filter threads per graph" },
-- 
2.45.1

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

  parent reply	other threads:[~2024-05-29 21:47 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-29 21:46 [FFmpeg-devel] [PATCH 1/6] avcodec/packet: add a decoded frame cropping side data type James Almer
2024-05-29 21:46 ` [FFmpeg-devel] [PATCH 2/6] avformat/dump: print Frame Cropping side data info James Almer
2024-05-29 21:46 ` [FFmpeg-devel] [PATCH 3/6] avformat/matroskadec: export cropping values James Almer
2024-06-01 11:24   ` Kacper Michajlow
2024-07-05 20:51     ` James Almer
2024-05-29 21:46 ` [FFmpeg-devel] [PATCH 4/6] avformat/matroskaenc: support writing " James Almer
2024-05-29 21:46 ` [FFmpeg-devel] [PATCH 5/6] fftools/ffmpeg: support applying container level cropping James Almer
2024-05-30  1:01   ` Lynne via ffmpeg-devel
2024-05-30  1:04     ` James Almer
2024-05-31  1:13       ` Lynne via ffmpeg-devel
2024-05-30 22:57   ` Michael Niedermayer
2024-05-30 23:22     ` [FFmpeg-devel] [PATCH 1/2 v2] " James Almer
2024-06-25 10:25       ` Anton Khirnov
2024-06-25 12:38         ` James Almer
2024-06-25 13:12           ` Anton Khirnov
2024-06-25 13:23             ` Paul B Mahol
2024-06-25 13:54               ` Anton Khirnov
2024-06-25 10:19   ` [FFmpeg-devel] [PATCH 5/6] " Anton Khirnov
2024-07-02 16:49     ` [FFmpeg-devel] [PATCH 5/6 v3] " James Almer
2024-07-02 17:55       ` Anton Khirnov
2024-07-02 18:43         ` James Almer
2024-07-02 19:00           ` Anton Khirnov
2024-05-29 21:46 ` James Almer [this message]
2024-05-30  1:02 ` [FFmpeg-devel] [PATCH 1/6] avcodec/packet: add a decoded frame cropping side data type Lynne via ffmpeg-devel
2024-05-30  1:08   ` James Almer
2024-06-25 18:13 ` Andreas Rheinhardt
2024-06-25 18:17   ` James Almer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240529214632.9843-6-jamrial@gmail.com \
    --to=jamrial@gmail.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git