From patchwork Wed May 29 21:46:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 49363 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp940500vqu; Wed, 29 May 2024 14:47:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWykVCYmRBuDQOBVmeAY9XbN4LlCB5m+iOV6oQRKOAOueqZk/hQwQUEBABJ5cjGxZoM10vi9HJmRrlgUafFZ0QF4K1j78Hg4q3F7Q== X-Google-Smtp-Source: AGHT+IHEo3wMH1BDUnG2zPVsRIndMnQJOZtnPKEQmBm2zYJfeO6g1TK5/OKF1x5wOhQw63L1q4kE X-Received: by 2002:a19:f503:0:b0:522:2ada:c02e with SMTP id 2adb3069b0e04-52b7d49a5b3mr246283e87.53.1717019222531; Wed, 29 May 2024 14:47:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717019222; cv=none; d=google.com; s=arc-20160816; b=VY6qM1savBNWTbqWARqTUp51NrAUhcjOuIAN7S5s+/AD10zKD+AFUyqMF8Gpu35FIK vpOYl+Pfms37j2qdyqynvA1mFkzEm2uR8cxjyPOm6vRQN1s1LBIUjUETiKek8EXpmkTi UY5zGx0xCUFeIyBx/vIHwyh1aLyhP4kIA/IL+sEFJlpdxPLGTwMQzHoQ6OnooN0uVubU BeZdIu5I24xSXcdLew9ukyaESdwvNChipkjZGWJgyk5NJRvijaPNw/HqV+k1qCGpqwcE 3aMIRVVpzmgHAUt+3+KpfeVP944Em7zSlC0HCZeoGCyu9mhIapTAtOhgua8ApW257kMg o5eQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=K+Xk5IXsbBnU2T2gPJqQtjpTchhY30T68u0cf4buqn4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ei1NjWEic6vsWm8w+RqWKJq+Squp+2vOSq5Y3deJMgdayZZY9GMomFXY42ua2kaagE 17Ix2+DHC1GRmG+kE09wOGW3GsVY1JYemrk45gckeMGKqLrvg1NLgqqHqfS4G3VR9jWO s0DUMdv88ZryF+CAfYe1AIYqtNh6S/kxoryEMSJhScM845NfBnTr92D/zGxApRCI549j Yr0v2JZq4mcRBhVcVWzaFl0Lez1QKUj5NJAh3mL9cggFISulJZPjJ9lq6n+/inpjUkUA RZJzTcIioVmRnbylMYxg4bK/HZvGyTpER9d1hwGlaAYQVzHL1OJ4x9RPyy306SeCGn5q RK9w==; 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="i/qKtyOS"; 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-a637f380b24si156546966b.564.2024.05.29.14.47.02; Wed, 29 May 2024 14:47:02 -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="i/qKtyOS"; 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 9BA9368CE20; Thu, 30 May 2024 00:46:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 710DB68CE20 for ; Thu, 30 May 2024 00:46:51 +0300 (EEST) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2c195eb9af3so165563a91.0 for ; Wed, 29 May 2024 14:46:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717019208; x=1717624008; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=sfRWEvHiHGPFunAvcrxvyMpLesMIdI89djeTIXvBsGI=; b=i/qKtyOShkJJnTl33n/+jDOsZVAgOpih4T5XzQMcHhoWD35Re63cEJ4lj+Xz/29U62 /1lJStfwT+uvPjT8LqE7esDVv8tqYbV03s6R6+s4zzlSKTN75aGnQEORT0mZsk2pk9xQ Gm0Q3N+Ma99xQh+v+ayiQtFs/3z+Aarm/pOMbs2nrlEs4utwwYN4wPFaHbmDk6hTLm7E Wg6qnmJTqRiXrvILuQxULNWUzEB3BSDJjAOagYhNGPLfSvvk0rZ4fRRogeNJkOB+MJuD 4s8WFAqoLmHJONSh2TIAUUgWQKAPqlLxk6Jff2LggfTlT1RV9Id3PPhxybyVTVWGnsWo /xVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717019208; x=1717624008; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sfRWEvHiHGPFunAvcrxvyMpLesMIdI89djeTIXvBsGI=; b=DQLaCyVpFx96ocwBlwtrri6zoU5UO+E1M4tAsXGgovMHE1DDQnKfWlH08LAaJjalaK RX05naNBjF8wNjHNppJOAlDmJMy0L4FN/boGVOuG3KTsgGFrbmzNgY0IDgNRj+RAgEWA rpCvhakQaPwcV3eSfBeZcjvalr4hcRbqaINX1rOolD9TljPEvTlEfk+elq8RgKTyN6qv /lvGvyePIHva6ud9quDHeyVhelgbXCzqahD7rtzO+tuhIgGtwdLK9K/GMyPesU6VqBus R5B4LkBWJB2SJwuosUeGvQZOB4heBQ3P+SKXaTMVbzCoIdEpqHp3NMw9wKPONYcJDzby A7+g== X-Gm-Message-State: AOJu0Yyg4k5MgknjHuhylORjfz7wUwqMYose8RO6RJxV8Zh+ggpI7hBd swU2eI+5i99LNwzcLrfj5hYRpLYSQbeJnLtqh1tudFhX0Tg2EdJunAkjnw== X-Received: by 2002:a17:90a:6881:b0:2bd:e884:bc72 with SMTP id 98e67ed59e1d1-2c1ab8d218bmr373760a91.5.1717019208325; Wed, 29 May 2024 14:46:48 -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.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 14:46:47 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 May 2024 18:46:27 -0300 Message-ID: <20240529214632.9843-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/packet: add a decoded frame cropping side data type 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: VenKXlz3oExO Signed-off-by: James Almer --- libavcodec/packet.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavcodec/packet.h b/libavcodec/packet.h index a9a41576da..9dee035690 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -330,6 +330,20 @@ enum AVPacketSideDataType { */ AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT, + /** + * The number of pixels to discard from the + * top/bottom/left/right border of the decoded frame to obtain the sub-rectangle + * intended for presentation. + * + * @code + * u32le crop_top + * u32le crop_bottom + * u32le crop_left + * u32le crop_right + * @endcode + */ + AV_PKT_DATA_FRAME_CROPPING, + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may From patchwork Wed May 29 21:46:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 49364 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp940547vqu; Wed, 29 May 2024 14:47:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUgnzNxoyQ1khINqyoM6p9Sdz46pF/WHCrw1UiZZDA4cezFun/qh1IYTmXEChOOWcL4UkXuaNfCzrp8M/zqi+ICTykYbZoztsPklg== X-Google-Smtp-Source: AGHT+IH80A9yvzMnFK8J+AxIbpFy4XZr/MRtv+IG3QlkEw7VpXM5dmWWX3X70G4zZ5X9bJJGE96e X-Received: by 2002:a17:906:f143:b0:a59:be21:3587 with SMTP id a640c23a62f3a-a65f0918c9cmr6670066b.8.1717019232496; Wed, 29 May 2024 14:47:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717019232; cv=none; d=google.com; s=arc-20160816; b=szfxhX7H37oZcnR8Y+MkJ2n+QmqvRgHs/llMywoCtAvAw54/r3GhdNEGYH1/qxNyyh hwt+EuXefv5JOFn8g8HM5I/2bZy4ndmTHF571UxBEm7izHf7eVqOfBnobw3JlrZsC0Ka dCDD3QYaYJPiJ8+zqKnfIHMmUMjn4+CBBhguIJvGeUnj80D5JWAKR43LqlgwlwCL5Vas iPTuOqCCqVgrNbhgiHRamqgH70de0sTs97UUV3JlUIetUxL4o2kC0Uy5kmm5vf4pf3lC ySyrrc+1OHi5verHFRAf1SzMJ2KZC7EyyCwGH/eaidzw8JacguLpI2+nGgmFK7Wj6FCf Xk3A== 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=FP+gJX0o7grq7Mt24AiNQWOxIq41LKkBA7X6UMnyz/w=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=PUfOIuY5uJCtE+jWVa4SuM9cTQvKHiR8nRPtbSmdt4DffG7iNXbBKayTonU5OCJd5h QxapI8UzR7KBnES2VOdaaBH0hhG/AVX1PwJsWXtSUpq8Jgk1xVX4tQ6yOhMuvQA6b/ln nj3s3+QvLpGU5Eh60/zk9IhJKFVM3u4w7pQizHXyfh5orlXqeOR7+wovlmO/rC23oCB5 +0/3mgOEo5steB1UhoITobWmtlHT3TodpvL+gwX2jSs1No3Y2NvqcSGFOhTgJB1FFB7p d/I17wfQ/pa5QWBJ5ouIldFq3f1HE5xbFOyPRS/hSuKLUONjGUduq/tZFXtMWJf2dlJl 1VCQ==; 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=V+7C9ahK; 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-a626c8053f2si648277966b.12.2024.05.29.14.47.12; Wed, 29 May 2024 14:47: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=V+7C9ahK; 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 2730E68D441; Thu, 30 May 2024 00:47:01 +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 72AB168D255 for ; Thu, 30 May 2024 00:46:52 +0300 (EEST) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-681919f89f2so192394a12.1 for ; Wed, 29 May 2024 14:46:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717019210; x=1717624010; 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=MFgfkN9axEu+/kIEBs8TQnmLI0+5C5ZOWNkNXg4hqTo=; b=V+7C9ahK+BX/0R1KJKuJBsgmrRr+sjBMjYkNeIoUhMmT0wFmN7/NTVFwCYhrs89c20 78uJZZbpVXeFTeQyjMRmCCFCp4tg6v2Ge75/6gzrU+RR6NNHYnAsfuL4thO/KvuwD8MW pHiUt81KVg1PxQ/A8xmA6GZmlLesjcNTflhi1gV/Y0gWnsrBGqv2DZriCqLStrBXTo6s B8wB3RIMyYqojNHi/HTi5IpO0dQYZ/TFkbYncf06yCLzzlWK5HP+pluebzccuvkViqB6 QPqFX/QnEDXigPGYqCOwE3y6pQf/+4TLyTeNLK6dT9DqilC4KpHZfdALmVhmTQROMW2/ jNPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717019210; x=1717624010; 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=MFgfkN9axEu+/kIEBs8TQnmLI0+5C5ZOWNkNXg4hqTo=; b=S/2D/JfVgYzH+3DW+Iy5x3X1rM+ZY3KK56mxu7aN7wEYcXfCodP6OK/dhEgiEBLZWu egsfpDaHHgl7rBvYEZLgwkXV8YW9ADKc3AHkT48gIZMnP4BzKmaem5xcx/hRtvX21oj3 qEmBeXxFezU55XcX6p5mgHpwpA2CCkPYoSNljlAIfdsLocSaw5EzlEuUImYnx8qsV39E GTvYMLYhckd6wQXfDStZXO7s3Lmlg8z+H883LA029LKQcF9UA8MhWqGB+XOoOPXqxZ7Q sC1DxpulqWw5fm63O1PmUNIQq5xQHzPiifEDxNNK3wmGOGxBPdgPEIlCeSSfXnU/Q8wb yeWg== X-Gm-Message-State: AOJu0YzDpGzdNCfvQhHp84pQEd2SgAV8VH5AxjeDo1sKgNAAXpxlrxSf AcECNpY/87/sxTKdNX5WS9QKSZ+dHN0ijJ+xmoi37tCBjCW4+JWlBqy77g== X-Received: by 2002:a17:90a:c68a:b0:2bd:fcda:ef2e with SMTP id 98e67ed59e1d1-2c1abbf7fa0mr457220a91.22.1717019209897; Wed, 29 May 2024 14:46:49 -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.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 14:46:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 May 2024 18:46:28 -0300 Message-ID: <20240529214632.9843-2-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 2/6] avformat/dump: print Frame Cropping side data info 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: Sts4e1wMwLcn Signed-off-by: James Almer --- libavformat/dump.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/libavformat/dump.c b/libavformat/dump.c index 059fb84522..610965cf81 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -431,6 +431,23 @@ static void dump_s12m_timecode(void *ctx, const AVStream *st, const AVPacketSide } } +static void dump_cropping(void *ctx, const AVPacketSideData *sd) +{ + uint32_t top, bottom, left, right; + + if (sd->size != sizeof(uint32_t) * 4) { + av_log(ctx, AV_LOG_ERROR, "invalid data\n"); + return; + } + + top = AV_RL32(sd->data + 0); + bottom = AV_RL32(sd->data + 4); + left = AV_RL32(sd->data + 8); + right = AV_RL32(sd->data + 12); + + av_log(ctx, AV_LOG_INFO, "%d/%d/%d/%d", left, right, top, bottom); +} + static void dump_sidedata(void *ctx, const AVStream *st, const char *indent, int log_level) { @@ -505,6 +522,10 @@ static void dump_sidedata(void *ctx, const AVStream *st, const char *indent, case AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT: dump_ambient_viewing_environment_metadata(ctx, sd); break; + case AV_PKT_DATA_FRAME_CROPPING: + av_log(ctx, AV_LOG_INFO, "Frame cropping: "); + dump_cropping(ctx, sd); + break; default: av_log(ctx, log_level, "unknown side data type %d " "(%"SIZE_SPECIFIER" bytes)", sd->type, sd->size); From patchwork Wed May 29 21:46:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 49365 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp940582vqu; Wed, 29 May 2024 14:47:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXhnkPjOVXPvoVBpfGd1dzLXbWKkRQxo4TKflsDklh0KlZcBY1ckfw792p8tB0bN82x/vW/7VCwytgMGS4ANB9bCj2WONYZTLhzDQ== X-Google-Smtp-Source: AGHT+IF9fSWY27plpGrPwNVoUdIJ72ZheqLK4A862DK6GL89GIq6l96J/rZwIwR/OxodokB8c2Cv X-Received: by 2002:ac2:5463:0:b0:51d:9f10:71b7 with SMTP id 2adb3069b0e04-52b7d42a33emr245062e87.28.1717019240787; Wed, 29 May 2024 14:47:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717019240; cv=none; d=google.com; s=arc-20160816; b=WJkLcLCATd9vjsZVA/dEpLGKIVCkNXNnyeIflvFFasSYDogzJ6DooVfpi2iJmbJvt6 rmldysPuCjs68i/0H6He8fnhR58d73yL+M6IdT5UMAyr4lqucMmEQeUfQBI6Ah3DkNDM 7hGQVdwic5kMl748fWNocdLzWL4Fa2qEM+mw4+vLv+0XO1hmfT98GfVDi6TPdxVg4PR3 IB3QKKs0MyUtBd+mBvySvai21CFywCn8jfnfSIWtegAd+kXuvpB+vy5VW2mf865lt5nc 7n+v3NMAaoOsF6n3jqb51V8M6whuELIckBB8BM4+wj02bn4nPtSDlr87euy9sbaBH3x9 +qIQ== 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=2WlDtPu9irbC4lHailH8uzQ0m+H9gBCbLiqg7pUtSFY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=RJfo4dTImFTsPDYkZTOh0o1M0Vg08iNzyBAmO4qPW6wMLG5z1j3+BTl095XIATHyB7 iCZW4Fn56ifT6/PAbNurYhhL4VeeFp8SWvDwKL2bB4fVyd4tC2J4ej4N+oL3FDc+aoT0 KYXvtRK0b+YAZOHifLHqsJlvlbJOh6L9Og5I7S1Zge0f4xdi/9k2qUG7yzYZm8i8iTRv cf618nl1PhbgZ54wtwTspBDQGl1iqTZn6h5p0nG4hWBN7vavNem6K2CyDio2y8eNOo8X /71vbsGSoQXntkTAqgP3pIVD7CZAChgVeEVeNsYialYH/xZHytRhzzZG7nszhfUC1i4k wMiA==; 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=YgDko0TH; 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-a626cc6a859si663959266b.630.2024.05.29.14.47.20; Wed, 29 May 2024 14:47:20 -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=YgDko0TH; 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 A47BB68D25B; Thu, 30 May 2024 00:47:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A6B568BED2 for ; Thu, 30 May 2024 00:46:53 +0300 (EEST) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-6bd8b845116so207325a12.0 for ; Wed, 29 May 2024 14:46:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717019211; x=1717624011; 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=5bIEHMt7A+trt6+3e6O6GyytI8wV4caRppaAjXmXj9I=; b=YgDko0THFd73VYmq1waDHqHmKZY/TC1+LfcPkDndloCS5TQ3AfP+D5Zirw9///pNt1 ovbWa8qz2hs0lh4lotsNW09REEEDT+E2Uing8BFXjMzf2dOHZDHf425dMc7ZXy04dI6K 4O0Atmx8odXWywK0PnenNOgGv0ozdv71Y7dw64uV4ZZGBkgpwBkzno9XKpomi5bUnp2A uK6cpSfUCIVimso65KUiy1hWsC09SAHPBZEPuQtyf3ASIR1eI45ydoscRK7EWyLFvVla 6wRqx4Wo1TPsbjK41SyUsizxsqaqxQ/NEMySUlBRsDVgVr1Bk5NkF8qRBeAfO+WkCAOB svPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717019211; x=1717624011; 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=5bIEHMt7A+trt6+3e6O6GyytI8wV4caRppaAjXmXj9I=; b=LgL/aJ1O9GROFljDTRjBW+JHLhts38MepUeT+OWepjWeDf6i2U2scEN8OF4LpYGHTj Kw8jyR9K6hkKuLurFArzM49GiU4qZDtZM3Uk5imwbmQaCNwQHmIQRkP52cJ5H3ViQSGr iLu44VHj+8ECTcYzgclyq9AKvGlOidAVBa9cmURqT+5S0gCUUxpWUmSA1DbqsZHUrEhq w0F/1ayckh8wnsTtkaE+m4oyWXnhzhde4r1eAoa8vI/7r5bhx5gUY413seAxNWRGq7HI Uca4gdRVoomCtYRXfEX1UTshtP94WM7ruQ4YIEvPDFeY4o+Zd/z5Fo25NohctJvsxAYR LeLQ== X-Gm-Message-State: AOJu0YxjEDsilF09X/twyU26sMyDJpML+x7f8vDaP2z3Wo2hBNDyONV+ HBAj9CEcMqJ1nuQ3yfC22vCc8+DTMmOmlPvj8AG8ykvtUFnX+FY1lmhAtw== X-Received: by 2002:a17:90b:d94:b0:2bd:eb21:a72d with SMTP id 98e67ed59e1d1-2c1ab9f9dc5mr397640a91.23.1717019211464; Wed, 29 May 2024 14:46:51 -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.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 14:46:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 May 2024 18:46:29 -0300 Message-ID: <20240529214632.9843-3-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 3/6] avformat/matroskadec: export cropping values 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: fGILehiGV07i Signed-off-by: James Almer --- libavformat/matroskadec.c | 53 +++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 2f07e11d87..a30bac786b 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -213,7 +213,13 @@ typedef struct MatroskaTrackVideo { uint64_t display_height; uint64_t pixel_width; uint64_t pixel_height; + uint64_t cropped_width; + uint64_t cropped_height; EbmlBin color_space; + uint64_t pixel_cropt; + uint64_t pixel_cropl; + uint64_t pixel_cropb; + uint64_t pixel_cropr; uint64_t display_unit; uint64_t interlaced; uint64_t field_order; @@ -527,10 +533,10 @@ static EbmlSyntax matroska_track_video[] = { { MATROSKA_ID_VIDEOALPHAMODE, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, alpha_mode), { .u = 0 } }, { MATROSKA_ID_VIDEOCOLOR, EBML_NEST, 0, sizeof(MatroskaTrackVideoColor), offsetof(MatroskaTrackVideo, color), { .n = matroska_track_video_color } }, { MATROSKA_ID_VIDEOPROJECTION, EBML_NEST, 0, 0, offsetof(MatroskaTrackVideo, projection), { .n = matroska_track_video_projection } }, - { MATROSKA_ID_VIDEOPIXELCROPB, EBML_NONE }, - { MATROSKA_ID_VIDEOPIXELCROPT, EBML_NONE }, - { MATROSKA_ID_VIDEOPIXELCROPL, EBML_NONE }, - { MATROSKA_ID_VIDEOPIXELCROPR, EBML_NONE }, + { MATROSKA_ID_VIDEOPIXELCROPB, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropb), {.u = 0 } }, + { MATROSKA_ID_VIDEOPIXELCROPT, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropt), {.u = 0 } }, + { MATROSKA_ID_VIDEOPIXELCROPL, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropl), {.u = 0 } }, + { MATROSKA_ID_VIDEOPIXELCROPR, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, pixel_cropr), {.u = 0 } }, { MATROSKA_ID_VIDEODISPLAYUNIT, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, display_unit), { .u= MATROSKA_VIDEO_DISPLAYUNIT_PIXELS } }, { MATROSKA_ID_VIDEOFLAGINTERLACED, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, interlaced), { .u = MATROSKA_VIDEO_INTERLACE_FLAG_UNDETERMINED } }, { MATROSKA_ID_VIDEOFIELDORDER, EBML_UINT, 0, 0, offsetof(MatroskaTrackVideo, field_order), { .u = MATROSKA_VIDEO_FIELDORDER_UNDETERMINED } }, @@ -2963,14 +2969,30 @@ static int mkv_parse_video(MatroskaTrack *track, AVStream *st, if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) { if (track->video.display_width && track->video.display_height && - par->height < INT64_MAX / track->video.display_width / display_width_mul && - par->width < INT64_MAX / track->video.display_height / display_height_mul) + track->video.cropped_height < INT64_MAX / track->video.display_width / display_width_mul && + track->video.cropped_width < INT64_MAX / track->video.display_height / display_height_mul) av_reduce(&st->sample_aspect_ratio.num, &st->sample_aspect_ratio.den, - par->height * track->video.display_width * display_width_mul, - par->width * track->video.display_height * display_height_mul, + track->video.cropped_height * track->video.display_width * display_width_mul, + track->video.cropped_width * track->video.display_height * display_height_mul, INT_MAX); } + if (track->video.cropped_width != track->video.pixel_width || + track->video.cropped_height != track->video.pixel_height) { + uint8_t *cropping; + AVPacketSideData *sd = av_packet_side_data_new(&st->codecpar->coded_side_data, + &st->codecpar->nb_coded_side_data, + AV_PKT_DATA_FRAME_CROPPING, + sizeof(uint32_t) * 4, 0); + if (!sd) + return AVERROR(ENOMEM); + + cropping = sd->data; + bytestream_put_le32(&cropping, track->video.pixel_cropt); + bytestream_put_le32(&cropping, track->video.pixel_cropb); + bytestream_put_le32(&cropping, track->video.pixel_cropl); + bytestream_put_le32(&cropping, track->video.pixel_cropr); + } if (par->codec_id != AV_CODEC_ID_HEVC) sti->need_parsing = AVSTREAM_PARSE_HEADERS; @@ -3136,10 +3158,21 @@ static int matroska_parse_tracks(AVFormatContext *s) track->default_duration = default_duration; } } + track->video.cropped_width = track->video.pixel_width; + track->video.cropped_height = track->video.pixel_height; + if (track->video.display_unit == 0) { + if (track->video.pixel_cropl >= INT_MAX - track->video.pixel_cropr || + track->video.pixel_cropt >= INT_MAX - track->video.pixel_cropb || + (track->video.pixel_cropl + track->video.pixel_cropr) >= track->video.pixel_width || + (track->video.pixel_cropt + track->video.pixel_cropb) >= track->video.pixel_height) + return AVERROR_INVALIDDATA; + track->video.cropped_width -= track->video.pixel_cropl + track->video.pixel_cropr; + track->video.cropped_height -= track->video.pixel_cropt + track->video.pixel_cropb; + } if (track->video.display_width == -1) - track->video.display_width = track->video.pixel_width; + track->video.display_width = track->video.cropped_width; if (track->video.display_height == -1) - track->video.display_height = track->video.pixel_height; + track->video.display_height = track->video.cropped_height; } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) { if (!track->audio.out_samplerate) track->audio.out_samplerate = track->audio.samplerate; From patchwork Wed May 29 21:46:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 49366 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp940626vqu; Wed, 29 May 2024 14:47:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUjNgcqHJSahA7RC41iSJDgZMNFU03VZWe4pxylaMfRz6OQ0f9YtFyExL7Jk2dyghQeyjrnkgoAqKy5zzR7a8rwT6t7P3JE5mVZaw== X-Google-Smtp-Source: AGHT+IFaJjCH67CL8Q4oABfYBb0Jvmw2SwdtGrWWv6vjht3Y7ItBTZ1qFZNHJJz6VNQSL8YKKIbV X-Received: by 2002:a2e:80cd:0:b0:2de:74b1:6007 with SMTP id 38308e7fff4ca-2ea848287a9mr737741fa.36.1717019249185; Wed, 29 May 2024 14:47:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717019249; cv=none; d=google.com; s=arc-20160816; b=COQMrwUhpTAABjuQc4+SgjMaYIOTjrajOdKThstNJDwpHyrdH3mnxLet6cyuop/agA o1a4VasyuMzmkvTbvIm34wfymiOkecuj0qCfTCr4ZKalpQE+d5Wr4AQmruywJcogI3Ne 57Q/sFBc7/QQRf7VpFljuZ93JP9IA8XL+IFJ/lx4spCL+lCfD2suD/JklGEC6vJvJsLV ceONw/oN7AbbupNMRXrePl7S+MlgmGzR5YXUAQC4fom45tnYvVc20bvDJhamIEqe+tOj LgJFWil7HqWBTPbsZISr4Y6R3XA44m1jCpk1YLm1d2RTWiM25U94ypfW307STJz/4N5w 7A6Q== 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=C3yoqxlOZhtEBh2zq6lbrRYUHSDY1rbHgpu/wgp4omY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Jlx8cGeoi1hi/rwAzwrl/oKiGR1+bmzziDDiMUFsQdkv/ADinmAF7eI3Eoecvoksm1 ZqYNO4iYk+qfuuf0w2xWx1fQAAbZTjxFQ/+f8ns1ZLg+SBYsDsPTwqYmVqoqb21Z29Pl 9vYzG+KJ22c9flkHxi6a3UGXAHfH/5+Ow6dOg3OEwKwCQfoaJtDSd20im9FYvvjBYf22 Ktc+AsHhCIC2C3qQQ/xCoRmDUmpz0Pf/vA173lthfDg2RjuDS17bgzCl18I5YM/wfAg3 nuZNVQZLPXNsDcvHmty00uEny4JiOb13M2ybIU0e1iQ6kBmrnFRJLBeZwlLkU2sffkW0 TdLQ==; 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=mV7ul648; 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 4fb4d7f45d1cf-579c1bee43dsi5154342a12.317.2024.05.29.14.47.28; Wed, 29 May 2024 14:47:29 -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=mV7ul648; 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 B790068D521; Thu, 30 May 2024 00:47:03 +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 C133768D441 for ; Thu, 30 May 2024 00:46:55 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-6bec8c86b48so229022a12.0 for ; Wed, 29 May 2024 14:46:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717019213; x=1717624013; 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=CqWm4OC1MMacugM1XBQ8SktsyDBLyfW804nWjKEOt0E=; b=mV7ul64887XTGIOtNoo0WriA6FMOryJlO+oTwQCok0tuG4J1bRQWxMgqd61bLvMlND ZDP3WsAX6y2X8jehtWn3KNLGJUGyY98ScCJZm+xgveCqxva6ML7j7/r4zPREw6MtXW7E y0IjR9zc0tYE2kg1GI5pLIIKFohXf7PVY4aixuXAkFLopFDtTYd+fXBru9tbzpLkWWYD MWBbwlXR5caXWYAAFuVb5Nnq0untoXgwsmBuG2v/5CUlUYp/421IvMXBjUmpPG/2PWz6 r3IbiTON1GctV8g+OPU5batCXTqJJc/yPDg7x+MZc3HcpwXM+nyPyTEaZ/ARSmB2na8d 5Qbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717019213; x=1717624013; 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=CqWm4OC1MMacugM1XBQ8SktsyDBLyfW804nWjKEOt0E=; b=mqsLfY+wx8JpYT7giJ/lr+zgXVfTjSuZWsxIna2BdvxW1riUK+wbLkhQd3LMI18NbQ RQ16+J+ceHAVDlbKajZ/QNhNcwFVFd2IPFwpfG0PA9NOW3x/YMtUrcNhzjBcYMsqELoc iVkWkkTQes7pQFeCvfgzQ1mpDD01rxBb+muIuSzHRuAck7lP6uzsI03b6FfEQVVXuxZo 5V5Ns/uTQjJ1+JP78stwhl45xJ9Mg3b4GrRqUJNYVt3T9PjL+3kNV9g8rKR6Y49xSSGm Kl1Nq62WY+bt3CnrrY/CBCSzmWprgXCqHYISrxfb5HBk21fi2N/akvOcI/pDBBKK7XVt qwag== X-Gm-Message-State: AOJu0YybY6JuXgbgCMa04hvp8+n+dx6WST+gzGuGvsV4N9l81xTlWBOX aM/we7X4ylfc5Ke7mni8Su1bI9s45CcdmFVDtncP3cr56/UeK5oJpOixbw== X-Received: by 2002:a17:90a:9af:b0:2bf:5f75:9c2b with SMTP id 98e67ed59e1d1-2c1abc3c310mr424903a91.32.1717019213082; Wed, 29 May 2024 14:46:53 -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.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 14:46:52 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 May 2024 18:46:30 -0300 Message-ID: <20240529214632.9843-4-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 4/6] avformat/matroskaenc: support writing cropping values 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: PTK4XIXWEVHS Signed-off-by: James Almer --- libavformat/matroskaenc.c | 44 ++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 76c542d50b..37a6a5b4f8 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1755,8 +1755,10 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, const AVDictionaryEntry *tag; int display_width_div = 1, display_height_div = 1; uint8_t color_space[4], projection_private[20]; + const AVPacketSideData *sd; EBML_WRITER(MAX_FIELD_ORDER_ELEMS + MAX_STEREO_MODE_ELEMS + MAX_VIDEO_COLOR_ELEMS + MAX_VIDEO_PROJECTION_ELEMS + 8); + int cropped_width = par->width, cropped_height = par->height; int ret; ebml_writer_open_master(&writer, MATROSKA_ID_TRACKVIDEO); @@ -1779,25 +1781,53 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, (tag = av_dict_get( s->metadata, "alpha_mode", NULL, 0))) && strtol(tag->value, NULL, 0)) ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOALPHAMODE, 1); + sd = av_packet_side_data_get(st->codecpar->coded_side_data, + st->codecpar->nb_coded_side_data, + AV_PKT_DATA_FRAME_CROPPING); + if (sd && sd->size == sizeof(uint32_t) * 4) { + uint32_t top, bottom, left, right; + + top = AV_RL32(sd->data + 0); + bottom = AV_RL32(sd->data + 4); + left = AV_RL32(sd->data + 8); + right = AV_RL32(sd->data + 12); + + if (left >= INT_MAX - right || + top >= INT_MAX - bottom || + (left + right) >= par->width || + (top + bottom) >= par->height) { + av_log(s, AV_LOG_ERROR, "Invalid cropping dimensions in stream side data\n"); + return AVERROR(EINVAL); + } + + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPB, bottom); + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPT, top); + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPL, left); + ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEOPIXELCROPR, right); + + cropped_width -= left + right; + cropped_height -= top + bottom; + } + // write DisplayWidth and DisplayHeight, they contain the size of // a single source view and/or the display aspect ratio if (st->sample_aspect_ratio.num) { - int64_t d_width = av_rescale(par->width, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den); + int64_t d_width = av_rescale(cropped_width, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den); if (d_width > INT_MAX) { av_log(s, AV_LOG_ERROR, "Overflow in display width\n"); return AVERROR(EINVAL); } - if (d_width != par->width || display_width_div != 1 || display_height_div != 1) { + if (d_width != cropped_width || display_width_div != 1 || display_height_div != 1) { if (IS_WEBM(mkv) || display_width_div != 1 || display_height_div != 1) { ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYWIDTH, d_width / display_width_div); ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYHEIGHT, - par->height / display_height_div); + cropped_height / display_height_div); } else { AVRational display_aspect_ratio; av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den, - par->width * (int64_t)st->sample_aspect_ratio.num, - par->height * (int64_t)st->sample_aspect_ratio.den, + cropped_width * (int64_t)st->sample_aspect_ratio.num, + cropped_height * (int64_t)st->sample_aspect_ratio.den, 1024 * 1024); ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYWIDTH, display_aspect_ratio.num); @@ -1809,9 +1839,9 @@ static int mkv_write_track_video(AVFormatContext *s, MatroskaMuxContext *mkv, } } else if (display_width_div != 1 || display_height_div != 1) { ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYWIDTH, - par->width / display_width_div); + cropped_width / display_width_div); ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYHEIGHT, - par->height / display_height_div); + cropped_height / display_height_div); } else if (!IS_WEBM(mkv)) ebml_writer_add_uint(&writer, MATROSKA_ID_VIDEODISPLAYUNIT, MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN); From patchwork Wed May 29 21:46:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 49367 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp940682vqu; Wed, 29 May 2024 14:47:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW00ErkKnXarE5A7nPPoIIeln33CR/0zwbTDD/ZKJVSmJIX9Da/uV9sjOD4Qbh6iECTtckE85++572JTldAGfE9mERchVgq5UOBAw== X-Google-Smtp-Source: AGHT+IE1FtLk/TbHNwFXmZlygxeljDRJ9CNXPi1qBNDp2PubHxVQQCknpToBnn8GNv/znzJzCUkE X-Received: by 2002:a2e:bc21:0:b0:2ea:7d9f:8f62 with SMTP id 38308e7fff4ca-2ea847b8167mr1356611fa.10.1717019258588; Wed, 29 May 2024 14:47:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717019258; cv=none; d=google.com; s=arc-20160816; b=0zwZeWFD1ktKlO5UY9zWKXc+ADWLbXt7Q6qZ/JFophR4oj+e+lEbcUwr8MAdQJDvb5 76LNrqO3POJ3lohuZGLgCdEwKrJKZL4SiTPfLvf5Mwr7MeTM+v/NDYd5MvMLcZjlIzy7 NZIX4XAc3H5915aP0OyT1kN22GEUgmoHDFhVpn2/FcFtSBxbvUaK9/tf0WKqDV32b92e ddJvuq3ye5wKcUL/xxH3Vv6QxlIh7Zs6z1q4ZK4w1p2VdDHASEAPkSXjDbBqSXmDa5BD D7iy2qtznZlYMe54z863wBUwbvTU19i69mSYXhEbaHV+XSuJXpOX1/hAOqPwqJ70eJM7 PpbA== 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=gznFwmOrAwpeuhMqhRID6uHX78M8UaleOEjIDBeXGjs=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=cm4BM3SQ6SHXDkKoGKDhS5ZG/83x6sONSxKlONDaVLTvreIfuKgle3VLO/OOira/8W f6HuqfyXmnEpyLh2LOniBgg5nLdcc4zpqYPEMcbwwn30d2uNWoBTt5PbJ059zMP7A36t t78lch+kq+hvGr/nIPOTm0IrbbRhajb7hnAEbA6o4EPa3eqDkDps5S4XFyshVj8jnUDx YUGWizzDN7OE5DO6GpoG3SwAxuBUrqlBvS35HYNU3JsnSUbsM0gRg6sbMJuk0IyfllP7 mdbYp4gIvZNaBdJNHx4kbha2bqFDr2DEKZ2CQzc6igJsDtQ3g/QYOgLkMSlV8HORUCoI yCcw==; 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=Xq2QBfmq; 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 38308e7fff4ca-2e95bdb1adcsi37920321fa.213.2024.05.29.14.47.38; Wed, 29 May 2024 14:47:38 -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=Xq2QBfmq; 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 D001E68D4FB; Thu, 30 May 2024 00:47:04 +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 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-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RMTozYdfjwwK 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 " 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" },