From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 94AF84B139 for ; Wed, 29 May 2024 21:47:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 87DD468D535; Thu, 30 May 2024 00:47:04 +0300 (EEST) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF6D068D306 for ; Thu, 30 May 2024 00:46:56 +0300 (EEST) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-65c5a29f7f0so195728a12.1 for ; Wed, 29 May 2024 14:46:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717019215; x=1717624015; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7/x3EgNX13l6KoxEzRe85lBfTqzkwjHwar0Cl0ghdhY=; b=Xq2QBfmqgFN+FgnLrUglUmrkMmgpx6PUB1FdM/+8lYmN6dM7k1y16lUYhcPbZ6rpjH lKORCFnOQBePR1OnuoKBksKeYk1SRziLY3qh7em+ju0GXHwKgBVIZ3K10nZ7hyehwp6n gl4fngKPuo28kGaG0dZlOUEjnlJn7NxLwF+48pMLwt3ImkmoqTwryX1e4p+peX1bkNeh 2V08V3h0owmn+DFNM3hlWQy8YQuJ9VNkQDLhTAmhWs0Qu8R7Hn2puw2I87txDEDSpWKc SH/QnzoMQZupTWhDW9VlI306iNWDqu1vD0eXRYSXuKLDI4GvoejdBT3IuazC4Bb8SReK 00cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717019215; x=1717624015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7/x3EgNX13l6KoxEzRe85lBfTqzkwjHwar0Cl0ghdhY=; b=p9+EpPBcbQaQpOvoYnKfMmsLOTTNzMoWRouRCwjrXDjQYH5nzXYLv8dJjeKxT48Op/ 2DS8DJu9aRdgN9JXCZIqVi4mbyUf/55RMGpLbbfRbrQB5schlQ5quSYSGg79z5hDfiM2 qge4XzMqoRe/nZERVDdmwB/BbWwKFfm0SmsSN7QzO3lu3ES2JD5BCOaTaSLvtrOko9bx p540GrO7S9qB3k07NQqy99Z/WAxiWNg4Z9QH8gRS1yitXXqUmTxsAywluKMKGrxgrEKA 22Qm8NCY5hgeADbj/JjeFXyCsuh7Hj7XDes8lmvxVmL5FQOtAMdDAWxeDjAZOFBVO65f SbpQ== X-Gm-Message-State: AOJu0YwwwX5ujeeRl5+iE5BokjnXQgD7AYfeN5DyL4P3RacmAOX7IXa+ IRKa8yn7o7F2Qecrjp58QfsNRk8LeTbeuVfjNUscpyaLxjLYtd9GgqW4uA== X-Google-Smtp-Source: AGHT+IHywBOqlT9W+CTVmLhlg70tJEDen+3elcDS7ymmpASNnMA63XEPrlSKAAQvurJyFVH3yrP6wg== X-Received: by 2002:a17:90a:65ca:b0:2bd:820b:7863 with SMTP id 98e67ed59e1d1-2c1abc1d9c2mr370655a91.18.1717019214686; Wed, 29 May 2024 14:46:54 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c1a77bab2fsm288094a91.51.2024.05.29.14.46.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 14:46:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 May 2024 18:46:31 -0300 Message-ID: <20240529214632.9843-5-jamrial@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240529214632.9843-1-jamrial@gmail.com> References: <20240529214632.9843-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] fftools/ffmpeg: support applying container level cropping X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- fftools/ffmpeg.h | 7 +++++++ fftools/ffmpeg_demux.c | 16 ++++++++++++++++ fftools/ffmpeg_filter.c | 11 +++++++++++ fftools/ffmpeg_opt.c | 3 +++ 4 files changed, 37 insertions(+) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index fe75706afd..f908e16549 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -155,6 +155,7 @@ typedef struct OptionsContext { SpecifierOptList hwaccel_devices; SpecifierOptList hwaccel_output_formats; SpecifierOptList autorotate; + SpecifierOptList apply_cropping; /* output options */ StreamMap *stream_maps; @@ -239,6 +240,7 @@ enum IFilterFlags { IFILTER_FLAG_AUTOROTATE = (1 << 0), IFILTER_FLAG_REINIT = (1 << 1), IFILTER_FLAG_CFR = (1 << 2), + IFILTER_FLAG_CROP = (1 << 3), }; typedef struct InputFilterOptions { @@ -254,6 +256,11 @@ typedef struct InputFilterOptions { * accurate */ AVRational framerate; + unsigned crop_top; + unsigned crop_bottom; + unsigned crop_left; + unsigned crop_right; + int sub2video_width; int sub2video_height; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 1ca8d804ae..4178b8f840 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -66,6 +66,7 @@ typedef struct DemuxStream { int have_sub2video; int reinit_filters; int autorotate; + int apply_cropping; int wrap_correction_done; @@ -1000,11 +1001,20 @@ int ist_filter_add(InputStream *ist, InputFilter *ifilter, int is_simple, ist->filters[ist->nb_filters - 1] = ifilter; if (ist->par->codec_type == AVMEDIA_TYPE_VIDEO) { + const AVPacketSideData *sd = av_packet_side_data_get(ist->st->codecpar->coded_side_data, + ist->st->codecpar->nb_coded_side_data, + AV_PKT_DATA_FRAME_CROPPING); if (ist->framerate.num > 0 && ist->framerate.den > 0) { opts->framerate = ist->framerate; opts->flags |= IFILTER_FLAG_CFR; } else opts->framerate = av_guess_frame_rate(d->f.ctx, ist->st, NULL); + if (sd && sd->size == sizeof(uint32_t) * 4) { + opts->crop_top = AV_RL32(sd->data + 0); + opts->crop_bottom = AV_RL32(sd->data + 4); + opts->crop_left = AV_RL32(sd->data + 8); + opts->crop_right = AV_RL32(sd->data + 12); + } } else if (ist->par->codec_type == AVMEDIA_TYPE_SUBTITLE) { /* Compute the size of the canvas for the subtitles stream. If the subtitles codecpar has set a size, use it. Otherwise use the @@ -1059,6 +1069,7 @@ int ist_filter_add(InputStream *ist, InputFilter *ifilter, int is_simple, return AVERROR(ENOMEM); opts->flags |= IFILTER_FLAG_AUTOROTATE * !!(ds->autorotate) | + IFILTER_FLAG_CROP * !!(ds->apply_cropping) | IFILTER_FLAG_REINIT * !!(ds->reinit_filters); return ds->sch_idx_dec; @@ -1241,6 +1252,9 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) ds->autorotate = 1; MATCH_PER_STREAM_OPT(autorotate, i, ds->autorotate, ic, st); + ds->apply_cropping = 1; + MATCH_PER_STREAM_OPT(apply_cropping, i, ds->apply_cropping, ic, st); + MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, ic, st); if (codec_tag) { uint32_t tag = strtol(codec_tag, &next, 0); @@ -1362,6 +1376,8 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) ds->dec_opts.flags |= DECODER_FLAG_BITEXACT * !!o->bitexact; + av_dict_set_int(&ds->decoder_opts, "apply_cropping", ds->apply_cropping, 0); + /* Attached pics are sparse, therefore we would not want to delay their decoding * till EOF. */ if (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 12cca684b4..a31fa1be7f 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1701,6 +1701,17 @@ static int configure_input_video_filter(FilterGraph *fg, AVFilterGraph *graph, desc = av_pix_fmt_desc_get(ifp->format); av_assert0(desc); + if ((ifp->opts.flags & IFILTER_FLAG_CROP) && + !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) { + char crop_buf[64]; + snprintf(crop_buf, sizeof(crop_buf), "w=iw-%d-%d:h=ih-%d-%d", + ifp->opts.crop_left, ifp->opts.crop_right, + ifp->opts.crop_top, ifp->opts.crop_bottom); + ret = insert_filter(&last_filter, &pad_idx, "crop", crop_buf); + if (ret < 0) + return ret; + } + // TODO: insert hwaccel enabled filters like transpose_vaapi into the graph ifp->displaymatrix_applied = 0; if ((ifp->opts.flags & IFILTER_FLAG_AUTOROTATE) && diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 910e4a336b..0c50ce16ba 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1732,6 +1732,9 @@ const OptionDef options[] = { { "autoscale", OPT_TYPE_BOOL, OPT_PERSTREAM | OPT_EXPERT | OPT_OUTPUT, { .off = OFFSET(autoscale) }, "automatically insert a scale filter at the end of the filter graph" }, + { "apply_cropping", OPT_TYPE_BOOL, OPT_PERSTREAM | OPT_EXPERT | OPT_INPUT, + { .off = OFFSET(apply_cropping) }, + "apply frame cropping" }, { "fix_sub_duration_heartbeat", OPT_TYPE_BOOL, OPT_VIDEO | OPT_EXPERT | OPT_PERSTREAM | OPT_OUTPUT, { .off = OFFSET(fix_sub_duration_heartbeat) }, "set this video output stream to be a heartbeat stream for " -- 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".