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 356EC47046 for ; Tue, 25 Jul 2023 17:10:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4FCCF68C872; Tue, 25 Jul 2023 20:09:58 +0300 (EEST) Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D15868C5B8 for ; Tue, 25 Jul 2023 20:09:52 +0300 (EEST) Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-1bbafe6fd8fso93503fac.3 for ; Tue, 25 Jul 2023 10:09:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690304990; x=1690909790; 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=Y8YTVEG2IWJYyzsGYJ3EUf9pALaN+SSUdJaq2NqKaHQ=; b=TQDOMRAruIGeW7/Xj5RM8EODir0XyOzJBpkAAj3WaiB9R0NflY8+sdZZAfSjZGSPgh hmF0GxNKEGxKfMETqAUAWS8ukM/ZcskV/7rvbeByWBX35VUjWziGgvG++kDfAJGaQCyc l21mZvInfnlKMY1nzdKHq1EQ7a/jiNYcarjvnQlrzWGaCpCKh7sx9noNdGDqFuAdGjdv vM+47RscxD7Q7p7OVCJYCSkjQSbXwPG++/ifz/2zW8gFTJZLTh5OQkvNJkT1rekfIu9r wqEWQ5MJSWmCaB8c0xdnx4e2/OLUkLe1xYuFdx6vCmt381gTmnSmpy2GcFszOSsG79m6 wMhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690304990; x=1690909790; 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=Y8YTVEG2IWJYyzsGYJ3EUf9pALaN+SSUdJaq2NqKaHQ=; b=LRYeSkY+WZNiUSv4MIW9sUfRspuz4r07Rg5Ld9z8L88v99+ubV1ZBRYFvFuUI73t/F ZUoYueicJJTNPV9mfdVwPzdAVNRW57JSwH00TP2C+oz3FzNlA5ZVOBtfATqc3+TUNZfh 9KTdV6yaP+Te6oaExjGCmNvPxzPPRTWwGG5aP359JYfFj2grMAS1HACDKE0SWTF+rP44 4mU7hRPtEA07dHldsQBJ4FzkIFV6NPj027PPQ5HJx+vHCg9gK+whJ83nPSch/F7+RBrW HbJPgBDP+vXEWJfPLq/FSbng3ybFX7YVCV1m1lW8akri7k078RtTYKhVF6ggQxsiTgGV 3O2w== X-Gm-Message-State: ABy/qLYvoB1f/5j8EA0S9WYAsKo24M0ar9KmbJeWgUvTUbbP6VETUhSL S65/4JEJLNe93/Kn1Gskrf1kA5WkLYo= X-Google-Smtp-Source: APBJJlF4Wdz+5gur9+SBOlt9lTO1t0pmlVet6U/NOy6HWCVs0x3DqlFTYONLyA5HfrAg/ct3wt/Hew== X-Received: by 2002:a05:6870:d1c9:b0:1bb:5af8:701f with SMTP id b9-20020a056870d1c900b001bb5af8701fmr9714576oac.23.1690304990143; Tue, 25 Jul 2023 10:09:50 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id q7-20020a056870e60700b001b3652adccdsm5576207oag.21.2023.07.25.10.09.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 10:09:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jul 2023 14:09:39 -0300 Message-ID: <20230725170939.3285-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719222043.59743-1-jamrial@gmail.com> References: <20230719222043.59743-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/5] 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 --- Now inserting a filter into the graph. fftools/ffmpeg.h | 3 +++ fftools/ffmpeg_demux.c | 6 ++++++ fftools/ffmpeg_enc.c | 19 +++++++++++-------- fftools/ffmpeg_filter.c | 22 ++++++++++++++++++++++ fftools/ffmpeg_opt.c | 3 +++ 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index d53181e427..bb6d510f10 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -154,6 +154,8 @@ typedef struct OptionsContext { int nb_hwaccel_output_formats; SpecifierOpt *autorotate; int nb_autorotate; + SpecifierOpt *apply_cropping; + int nb_apply_cropping; /* output options */ StreamMap *stream_maps; @@ -347,6 +349,7 @@ typedef struct InputStream { int top_field_first; int autorotate; + int apply_cropping; int fix_sub_duration; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 48edbd7f6b..1209cf2046 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -48,6 +48,7 @@ static const char *const opt_name_hwaccels[] = {"hwaccel", NULL static const char *const opt_name_hwaccel_devices[] = {"hwaccel_device", NULL}; static const char *const opt_name_hwaccel_output_formats[] = {"hwaccel_output_format", NULL}; static const char *const opt_name_autorotate[] = {"autorotate", NULL}; +static const char *const opt_name_apply_cropping[] = {"apply_cropping", NULL}; static const char *const opt_name_display_rotations[] = {"display_rotation", NULL}; static const char *const opt_name_display_hflips[] = {"display_hflip", NULL}; static const char *const opt_name_display_vflips[] = {"display_vflip", NULL}; @@ -1085,6 +1086,11 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) ist->autorotate = 1; MATCH_PER_STREAM_OPT(autorotate, i, ist->autorotate, ic, st); + ist->apply_cropping = 1; + MATCH_PER_STREAM_OPT(apply_cropping, i, ist->apply_cropping, ic, st); + + av_dict_set_int(&o->g->codec_opts, "apply_cropping", ist->apply_cropping, 0); + MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, ic, st); if (codec_tag) { uint32_t tag = strtol(codec_tag, &next, 0); diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 96424272bf..cd30986344 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -448,14 +448,17 @@ int enc_open(OutputStream *ost, AVFrame *frame) int i; for (i = 0; i < ist->st->nb_side_data; i++) { AVPacketSideData *sd = &ist->st->side_data[i]; - if (sd->type != AV_PKT_DATA_CPB_PROPERTIES) { - uint8_t *dst = av_stream_new_side_data(ost->st, sd->type, sd->size); - if (!dst) - return AVERROR(ENOMEM); - memcpy(dst, sd->data, sd->size); - if (ist->autorotate && sd->type == AV_PKT_DATA_DISPLAYMATRIX) - av_display_rotation_set((int32_t *)dst, 0); - } + uint8_t *dst; + if (sd->type == AV_PKT_DATA_CPB_PROPERTIES) + continue; + if (ist->apply_cropping && sd->type == AV_PKT_DATA_FRAME_CROPPING) + continue; + dst = av_stream_new_side_data(ost->st, sd->type, sd->size); + if (!dst) + return AVERROR(ENOMEM); + memcpy(dst, sd->data, sd->size); + if (ist->autorotate && sd->type == AV_PKT_DATA_DISPLAYMATRIX) + av_display_rotation_set((int32_t *)dst, 0); } } diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 925b5116cc..8cadb4732c 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -31,6 +31,7 @@ #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" #include "libavutil/display.h" +#include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/pixfmt.h" @@ -1418,6 +1419,27 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, return ret; } + if (ist->apply_cropping && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) { + size_t cropping_size; + uint8_t *cropping = av_stream_get_side_data(ist->st, AV_PKT_DATA_FRAME_CROPPING, &cropping_size); + + if (cropping && cropping_size == sizeof(uint32_t) * 4) { + char crop_buf[64]; + int top = AV_RL32(cropping + 0); + int bottom = AV_RL32(cropping + 4); + int left = AV_RL32(cropping + 8); + int right = AV_RL32(cropping + 12); + + if (top < 0 || bottom < 0 || left < 0 || right < 0) + return AVERROR(EINVAL); + + snprintf(crop_buf, sizeof(crop_buf), "w=iw-%d-%d:h=ih-%d-%d", left, right, top, bottom); + ret = insert_filter(&last_filter, &pad_idx, "crop", crop_buf); + if (ret < 0) + return ret; + } + } + snprintf(name, sizeof(name), "trim_in_%d_%d", ist->file_index, ist->index); if (copy_ts) { diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index dc6044120a..30bb919cb6 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1733,6 +1733,9 @@ const OptionDef options[] = { { "autorotate", HAS_ARG | OPT_BOOL | OPT_SPEC | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(autorotate) }, "automatically insert correct rotate filters" }, + { "apply_cropping", HAS_ARG | OPT_BOOL | OPT_SPEC | + OPT_EXPERT | OPT_INPUT, { .off = OFFSET(apply_cropping) }, + "Apply frame cropping instead of exporting it" }, { "autoscale", HAS_ARG | OPT_BOOL | OPT_SPEC | OPT_EXPERT | OPT_OUTPUT, { .off = OFFSET(autoscale) }, "automatically insert a scale filter at the end of the filter graph" }, -- 2.41.0 _______________________________________________ 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".