From patchwork Wed May 29 21:46:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 49368 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp940726vqu; Wed, 29 May 2024 14:47:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWmE4sJsdOkk4g0v+eB5vF7KP3kehZqAswLD5/R4c0lHQeou8h+KIKJqQBwwO178VyKAEmL9uEu+1K8eXtJsEBHZqvqyK3wihzFig== X-Google-Smtp-Source: AGHT+IE1wuOOf6MDMpYAFE2ABYy/rzmAX3LAUy+LSV+K1bObXw3eK4mhcH3co2ovkPQqvkQvfy/w X-Received: by 2002:a17:907:8687:b0:a64:25dd:9781 with SMTP id a640c23a62f3a-a65e8e2f3edmr22076066b.1.1717019266259; Wed, 29 May 2024 14:47:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717019266; cv=none; d=google.com; s=arc-20160816; b=ALTgIb9P33A4dfvZQnJCvnPhMsDfIpJIRB0U4orywUJCGuA1agitGnINUBtELN8GcC BqlM6Xr2w8XhUWDy6ZQ+RmzZYxOT4FdNgckh5nC2KCMJ6Czgx2EMNgWeL5zLv3dncaMI MpQnJPOgDGIekiEYaqCbdmsoEq8+XQlEPNfgVS4oDdnTI1wbK5mfIaFOe3ogxAlp0L/J Lu/Who5A1pqJEkE0+E2vSt1HB0uZIu3wGE4jXeU1JkAAqxtmlaSe7veOb9jMe9yHAEsa 7EUhHPPOjgYGesVbNLwxXpE4L2/w8PpYTH/mJhqKaMFmGxDLFYwTgjW0Dkm3pPbGVJin j5lw== 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=Z+Kg4/NuJYa46tVKkiBgEuvDTnnTxU2s/NW8UqvVzCE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=0OB7uGB48Rr+3qRDMARZn9vBHKAL5/8XpcFWnagPcfHknxMecLAYodVRnVaJEAawNA pM1sAYLwp20jrTkx4bni4hnSegwuKI8WikMAASNrOQFdAXhkcFejx4RTCJDdeVhTuBa9 gtskHzyCE46NJCYc2PTSlDkNgQY8jJ7rlSBVBkMr2FteyCxzdZRZFwgcsGWVgnQ/EX8P 6O513gN1pzpwA165hnm2uxLEwjm8JLFNLSOcvEL+Iyw4LeOlFgGShLtuUicAIhqtULkT NhEBwE0ahtUFSdOSs4etGvfCy8VW8Ut473snHhAduaAov0L/DCowVx44RJbixq62ywsD 7odQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=ZLJl56T3; 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 a640c23a62f3a-a626c7feed6si661979766b.70.2024.05.29.14.47.45; Wed, 29 May 2024 14:47:46 -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=ZLJl56T3; 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 3D7C368D53A; Thu, 30 May 2024 00:47:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 0260168D525 for ; Thu, 30 May 2024 00:46:58 +0300 (EEST) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-60585faa69fso133639a12.1 for ; Wed, 29 May 2024 14:46:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717019216; x=1717624016; 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=IfXLj9LtJHHupDvyv/XsRCr9G97AvGArbvZyyAyp7/A=; b=ZLJl56T3PKS1zAP4DPKnXcv5imYycHio13aIvGyIioGR+xpLFQAMv0wRf3hq8X5rzA U0Bc/3z9XflqvBepFHcwVevh6r6zs408Xi39i0+TTCVdI3kciHD+XSHLQHoRTkkx8ocq A9tfW/rzRorc47F3I4Z9/ij5nSbZhoQKoXjOwHfZBmWVKQ5jVRE1eDNId/oQE+T01FWV tr+kiqqKWOPXbgpUWfMa04R6lBX/AqUgS2eLqaJUb4wpy7BPFa76LwMj0T/6v3P+tboG 7c9XsqOdEiIzK1/p2jLjWSSPM9VFvehJLUdRV0ALh9hjDF1VXnfT//0y9F+G5i2UsFHl RR4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717019216; x=1717624016; 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=IfXLj9LtJHHupDvyv/XsRCr9G97AvGArbvZyyAyp7/A=; b=veHf42uydF0kgalvoECjuZN0w6faF5EyqGZwakxLoFDwPVBsrFAWaVJo8nDv58d3Kz oPYJEnN4muavIFPTna4c91zcDxKPXJ17kSNclgNJTGs8a1XCALm/kdQtRL0XE31DGGm6 7HFDXunD6Tuat4AR/B3L5Y2y2LiVRGa2LRgTzETuAV04pQFKBSUS+93oBK9GUxucIDom GkjMXRbovahVPvvcfm7TdBPn3v+r1AVlWsIwylFTZ3NuWHDjROXYdRThZ96LXS6H4dkf tkEXC3aNMHOgbxNRFRpGbNJL6lyPqApI06yz2Xz6ifTsF7PL9CKIVt7/k7Bt3nLZ4Soo SJXg== X-Gm-Message-State: AOJu0YxQaFoKMTSXd+lNtCvpxlCfz2Ow/qCpjwwXs4lnlYw2/CPrD/S6 g6dpNf72Qkty0SAXTEnSk0BlyMR3VlfCM+w5Zaofpf2GjhM/XUBWWjEK1w== X-Received: by 2002:a17:90a:e28d:b0:2b9:e009:e47a with SMTP id 98e67ed59e1d1-2c1acc3d22cmr88306a91.10.1717019216289; Wed, 29 May 2024 14:46:56 -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.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 14:46:55 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 May 2024 18:46:32 -0300 Message-ID: <20240529214632.9843-6-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 6/6] fftools/ffplay: 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: CqSCwjxrF9JJ Signed-off-by: James Almer --- 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" },