From patchwork Sat Oct 7 16:25:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44206 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp510499pzb; Sat, 7 Oct 2023 09:26:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFcrbn0642lACPapojnJVJ//RVJ14qjhYgFZJoKEbgZHlrxZzev2jvTVMrwc4T+m+8XeTeP X-Received: by 2002:a17:906:9c9:b0:9ae:4f9e:7813 with SMTP id r9-20020a17090609c900b009ae4f9e7813mr8637632eje.73.1696695972681; Sat, 07 Oct 2023 09:26:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696695972; cv=none; d=google.com; s=arc-20160816; b=cPHOaT/LUlqpU74MOEbOdVWCDft3+ost0gGv4Fz9lZUUEdNJRCc6TChL7NRbPInvsv H0en+4lL72oETINXsvbXmf7w2WBgJFIoO52U7uyJRRzLX7b0dBYAlab0Y7VvoRtdoWvn iGfJXPypMR5E9qevcPhsnGca8zVrjkbYwpGOHh+QFIl1mTTeM/+uGF5uahG6sqwSc3CK eUWm2dJV/gFQO3/4MME41f5Og+eBvtGkOEyvhukNrfoy0PTs0E1jLr5PGzUDpsKDvpg9 vVac9b++1TItVoPpsoVauuNJLtfXukc0TrtlPb9waEMzTTaJXCU8GvnxhHExNKYpZnyM M/8A== 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=s/rybUSko4D+RL7hfl0uC6XcP7Z74HZDgFovDYO2lFU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=K5dVoPoOKqppAhWLV7QclNiKJr938W+2g3bD56rJp5SbKQ6eNAAtHuIrMjm7BRG5FV WiY9AudeaPnSGwUrYwpqrIdEGHd8Eb8SXeBa/9letfxjGvpaDEkEp4lTGhi6Mie0K+eo WQxYvNW6m/hstww1D8YzQET2tIJdWF4mwpdEATIHDk9rqGCB6R/GKL35L0bNpl7cDHq9 Y+uQipF9v3eVz5nkJdGwT56vZPP2JpeIMZO0h0CsSbsEKlgYeCPE4VENiQjjXgqnMSzz iq9D24oZcT++q7qIuhyeOS/DGPmke4bdysLkRub6qt+aN/+u5aDQ2qvl6ZGanVha2QrC HvKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=RydPVnZ3; 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 g7-20020a170906594700b009b92b7579b4si2529670ejr.25.2023.10.07.09.26.12; Sat, 07 Oct 2023 09:26:12 -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=RydPVnZ3; 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 2A70268CC1D; Sat, 7 Oct 2023 19:25:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D89C668CBFA for ; Sat, 7 Oct 2023 19:25:09 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-58907163519so2385044a12.1 for ; Sat, 07 Oct 2023 09:25:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696695908; x=1697300708; 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=dPSi2c7vMyFhRZwvKydK4P2hPfnz6C+yzAc9CDcLTYI=; b=RydPVnZ398EbddGCk/eMYk4GwKQAKlR+9PEJHCEH5S2yutU1NTJ2zc8AnzObBkjZnw FSReDoialnfkjMrmJlvzGnK10S6dG38RW3shpTab2C/IQ6KNQQxJOBAYAGeCHHohlnjs 9Jg5DyYaAcFFuWwPL+CbwPtLUluQS3OHomOtOqXhLuv5BQztOMOVdO0jYIBZs6gKUYPN tebac8prEinWsih0165YPGM80KvkOJIcE+ITBG48/dN2rt4wuJ0M051/2AkMGvE5qgyP luJ7orikZObSAZWjfCwQuO1QVjD3FasmCIfuJTyI69LBw3kIzcx9lrO87XXMyj1blSbX Y/Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696695908; x=1697300708; 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=dPSi2c7vMyFhRZwvKydK4P2hPfnz6C+yzAc9CDcLTYI=; b=LAh480aleMAg+CpyE9oXpM4eHTElc7Npnzi1wTJyw42Ay0FE+JXfVNxzhKP18LRWOD p8r1CBrWPkNeB7C3NsKxPi00QDH+ftNVTLl1DJb/L65EMRuRjwq5dRws62S7YaDrUPKh 9+lmuqdwr6UrcsBw1s15xODZY4Oo3O7TNuRYB4OjX8aFNJ5MD1T3Ezf7ASEKcaSD33/F DmAIEraD5ZtUdIZiGD5wtO12RIQVQlipdemoNoVqkMoaHKQzx37JCfArFuoWUr08wyO1 tWqF7nyP9bjAwqNPx62hZaIzAMGj9Z3fRNyt02+Jyq1sSMaFQbV+NDTRmojdDmR3ngTn 7qPA== X-Gm-Message-State: AOJu0YxJ3llqUCu2NfmB8hNgcMdWahaKCpmJEOiTGwg4eDp+KnkgVAAi 1cZSpoLmoEQrGwBHIHpvnZksFIEZK+s= X-Received: by 2002:a17:90a:9c0f:b0:274:914f:7fcc with SMTP id h15-20020a17090a9c0f00b00274914f7fccmr10966366pjp.1.1696695907733; Sat, 07 Oct 2023 09:25:07 -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.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 09:25:07 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Oct 2023 13:25:03 -0300 Message-ID: <20231007162503.1057-8-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 7/7] 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: EXop1roZQXLK Signed-off-by: James Almer --- fftools/ffplay.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index d8c69e10bc..5c213bf0d8 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -36,6 +36,7 @@ #include "libavutil/eval.h" #include "libavutil/mathematics.h" #include "libavutil/pixdesc.h" +#include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" #include "libavutil/dict.h" #include "libavutil/fifo.h" @@ -348,6 +349,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; @@ -1910,6 +1912,28 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c last_filter = filt_ctx; \ } while (0) + if (apply_cropping) { + 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->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) { + 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; @@ -2610,6 +2634,7 @@ static int stream_component_open(VideoState *is, int stream_index) av_dict_set(&opts, "threads", "auto", 0); if (stream_lowres) av_dict_set_int(&opts, "lowres", stream_lowres, 0); + av_dict_set_int(&opts, "apply_cropping", apply_cropping, 0); av_dict_set(&opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY); @@ -3608,6 +3633,7 @@ static const OptionDef options[] = { { "scodec", HAS_ARG | OPT_STRING | OPT_EXPERT, { &subtitle_codec_name }, "force subtitle decoder", "decoder_name" }, { "vcodec", HAS_ARG | OPT_STRING | OPT_EXPERT, { &video_codec_name }, "force video decoder", "decoder_name" }, { "autorotate", OPT_BOOL, { &autorotate }, "automatically rotate video", "" }, + { "apply_cropping", OPT_BOOL, { &apply_cropping }, "apply frame cropping", "" }, { "find_stream_info", OPT_BOOL | OPT_INPUT | OPT_EXPERT, { &find_stream_info }, "read and decode the streams to fill missing information with heuristics" }, { "filter_threads", HAS_ARG | OPT_INT | OPT_EXPERT, { &filter_nbthreads }, "number of filter threads per graph" },