From patchwork Sat Oct 7 16:25:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44205 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp510455pzb; Sat, 7 Oct 2023 09:26:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5gLfGR4B1b6TKQM7R7I0bCtHg8hTb1unpWr1msAWWL4V2+oVH86iH2xLSmqHrbxMWLE8X X-Received: by 2002:a50:fa95:0:b0:52c:92e3:1d12 with SMTP id w21-20020a50fa95000000b0052c92e31d12mr9590772edr.11.1696695964660; Sat, 07 Oct 2023 09:26:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696695964; cv=none; d=google.com; s=arc-20160816; b=zki9y3YSSxE5DVmrlB3gxxXZYUrD1vEW8SqJrW/sNIHgPCnE7FDmp0dOJhWfxJcHi3 tMk8Eo4/+d2v21l2PVW9xsx85KnONMgM285ZeORjNjnZU74HvCKSvRBGjt7D92gF7uGQ 5l2wEsbh6hmoAa0Rm9zbAWL4tbLS+MPDsfivtmh27M3sdz4XuHMMvZ6UDKEA8DOgLQgS CBbNXFtnzelCXh6t4RdaHQurZHx50fFzGS1Kcuxd2EEOoLSb7ofzQryYsLW5xAvmezHk RUxw50Bmsmj7u1xA++tD1ROoP/thz6LO5YS9ps5RBoA+B3FsGhBysKWP2CRU9GrQuDQ0 8mwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=TzJ4FaHaynFXygAn8SfVF6rOR9FfQbFcGO5EpSltbqE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Bd4qnV+qseeJolof49LKcQ4xHVqbwVjYwU/2c/Cqh/ljzG397rAngKs7pEtVXtrQrx 4xS688PrtzIu2Po+Da1sfNyxM2TBgMw+nHUxRtxNG07bi7EH4XtNHlDhDUUzZfVyLuKh TU12plRU+CObvbHlG4tAZ/GgJ+r6R65m5b8llhqH9INN8JGL7Z81vEuZVNAZyE5pNIJO wBAB5F2lJiDRe94r5MGqTQG+AwEPEh+1Xv0RthTak4Aq8m2PEZaRNAxqgVNk7rweTQBI ACL7EF7xzDin6OFj2C0ExvCWMjbaiNC9h5JFrj7Lc3VYL5QpDCh74ZK0us1+uGRQwY3c Qyag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=gU3DYArb; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a24-20020aa7d918000000b0053406d40a32si2620729edr.606.2023.10.07.09.26.04; Sat, 07 Oct 2023 09:26:04 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=gU3DYArb; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 10E3868CC11; Sat, 7 Oct 2023 19:25:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 908EF68CB7D for ; Sat, 7 Oct 2023 19:25:08 +0300 (EEST) Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-564af0ac494so2210933a12.0 for ; Sat, 07 Oct 2023 09:25:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696695906; x=1697300706; 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=IzfIzxB/grH6ZVjOC7RIENUvxHG+NpMTKGWEw4n9JcY=; b=gU3DYArbD3/EvR8aiyN9mgEjDABUEdV8zlcXcCgUBNuJAsJK77DffCl+HgxjsqQFM9 3rMElP/k+q0WBrAPZfAAVAmb8xEAVzoTTy6S+jTC+zZc97j3MgJhFcFwMdGd5ZyMiuUS 2bk9AXXwxvf6qvw2d+b8Flid1Qciw36++NRI/0fT/FOHxGtBx4vX8jksfPCCtHhd6mhi QeWGfhy+MQ57VeaGnI+1aEEqtlcSXIcmKuZPjr8Ofy5Et+lJtyk1uY7sevh5xb3uRqgJ MKI3zB6zVNjY+fqn4WFNGLcYnJuoCrfNSbCAzEoe1X2iDJxGR3zU4xegr0fKAoA+Eu4i y6sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696695906; x=1697300706; 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=IzfIzxB/grH6ZVjOC7RIENUvxHG+NpMTKGWEw4n9JcY=; b=Wr7kJsKZ3FxnQu373hg7OjAA+/new5QBIbWUWuDBOvdV7dIq7r93qF4KofMYBGfAvL MRTbkPn3sOHz/UjZIE0dDAaWhq2F43PlvBRbD+sFmzdpgQwzFsvtSKHVJxkSO+XQ0vMC YVlrbyCLHzEoGtDGeYTUKXFl5zXYHO+9lsQghFk9wF5rqdka1TNKXIyAqDQ4q5Jqv+CB P9uF8EgGmTaEb/wWuvfd0M7ljWw/XqdKPfq0TYJyyx4GHi+h8M1NtUU0w9phk6404Zkg hIEgGhBfymDpZYWs1/JVgij1p88dRz10Xoq65eujq6ou5Xjre79RbvixhLGVbrPI+Q9B CKkw== X-Gm-Message-State: AOJu0YxSFfP1hIR4nNLU74H0GkcVgFPpePMyO4zVe1f1pXDtVzQu7C07 4eEnmotIgNzRE1dX2Q1VkRacVau8rrw= X-Received: by 2002:a17:90a:850b:b0:274:3d7d:e793 with SMTP id l11-20020a17090a850b00b002743d7de793mr10286348pjn.47.1696695906321; Sat, 07 Oct 2023 09:25:06 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id 30-20020a17090a191e00b002792b7182dcsm7883180pjg.49.2023.10.07.09.25.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 09:25:05 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Oct 2023 13:25:02 -0300 Message-ID: <20231007162503.1057-7-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231007162503.1057-1-jamrial@gmail.com> References: <20231007162503.1057-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/7] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hxDKEejdv0Zr Signed-off-by: James Almer --- fftools/ffmpeg.h | 3 +++ fftools/ffmpeg_demux.c | 6 ++++++ fftools/ffmpeg_enc.c | 24 +++++++++++++----------- fftools/ffmpeg_filter.c | 23 +++++++++++++++++++++++ fftools/ffmpeg_opt.c | 3 +++ 5 files changed, 48 insertions(+), 11 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index b059ecbb9f..94ada9d586 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -155,6 +155,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; @@ -352,6 +354,7 @@ typedef struct InputStream { #endif int autorotate; + int apply_cropping; int fix_sub_duration; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index c71edf01a5..53fe584959 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}; @@ -1068,6 +1069,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 be35465c28..27dd28172c 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -467,17 +467,19 @@ int enc_open(OutputStream *ost, AVFrame *frame) if (ist) { int i; for (i = 0; i < ist->st->codecpar->nb_coded_side_data; i++) { - AVPacketSideData *sd_src = &ist->st->codecpar->coded_side_data[i]; - if (sd_src->type != AV_PKT_DATA_CPB_PROPERTIES) { - AVPacketSideData *sd_dst = av_packet_side_data_new(&ost->par_in->coded_side_data, - &ost->par_in->nb_coded_side_data, - sd_src->type, sd_src->size, 0); - if (!sd_dst) - return AVERROR(ENOMEM); - memcpy(sd_dst->data, sd_src->data, sd_src->size); - if (ist->autorotate && sd_src->type == AV_PKT_DATA_DISPLAYMATRIX) - av_display_rotation_set((int32_t *)sd_dst->data, 0); - } + AVPacketSideData *sd_dst, *sd_src = &ist->st->codecpar->coded_side_data[i]; + if (sd_src->type == AV_PKT_DATA_CPB_PROPERTIES) + continue; + if (ist->apply_cropping && sd_src->type == AV_PKT_DATA_FRAME_CROPPING) + continue; + sd_dst = av_packet_side_data_new(&ost->par_in->coded_side_data, + &ost->par_in->nb_coded_side_data, + sd_src->type, sd_src->size, 0); + if (!sd_dst) + return AVERROR(ENOMEM); + memcpy(sd_dst->data, sd_src->data, sd_src->size); + if (ist->autorotate && sd_src->type == AV_PKT_DATA_DISPLAYMATRIX) + av_display_rotation_set((int32_t *)sd_dst->data, 0); } } diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index b71a84185a..d17b9fc45a 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" @@ -1381,6 +1382,28 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, desc = av_pix_fmt_desc_get(ifp->format); av_assert0(desc); + if (ist->apply_cropping) { + 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 (sd->data && 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) + 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; + } + } + // TODO: insert hwaccel enabled filters like transpose_vaapi into the graph if (ist->autorotate && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) { const AVPacketSideData *sd = NULL; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 304471dd03..1ef131aa3a 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1737,6 +1737,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" },