From patchwork Sat Oct 7 16:25:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44203 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp510339pzb; Sat, 7 Oct 2023 09:25:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG0qsDvWt01SJOpB3E5rSjqcI8iN0tP+yyuGsWOPFYC1KfPsofk0P2Xjp192J8W/K7r7cZn X-Received: by 2002:a05:6402:690:b0:533:6379:afaa with SMTP id f16-20020a056402069000b005336379afaamr10204472edy.20.1696695947041; Sat, 07 Oct 2023 09:25:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696695947; cv=none; d=google.com; s=arc-20160816; b=lOMT1IddcIR4T3NM6wYalNXiEgt6tLw9YCY3KGhcLGG/1l/BWUXd7QaVF/ri2VUwX9 CVi/B40chKQCKf2+5WmwsraWwLFmlH764KYZzJ0JTT6UcD0ek2JuS1e8bZyXMRL2RARA e7ynIpagkYEUhJaJqM2OFskSOfn8fYnkFbIkxgyB30wHUzcKzmoYCnGfs3/7ZYLwSk66 KnoVFaFcty9OPxTZhcEfeC91Qld1x2K+H9RLfKKjRk7fe4gJyLdp+5Sn9Oy63SpaDUCc 35Dm0RenczFkbrivD4RwbcWaMpjgDK7bElF5iezRz17S+Q/EH10DMMM1KUnb+1QDXCIt pAIA== 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=I+3dMKiwCc5mxbHWFzuoPY3eZkLEFQwMp1MWyblNfog=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=BR2CTkeWe2PDvU/FslhM9bhshTo6JRJI2ZK+Wn8yW8HZLf5ub3iomC+4M+mq3rrMPE Mkh2WxJx2lbboQI0jLwDumNCnfKVMDsbnj6H84goM42BP8jsi9iFEav+/4v9QewxQsE4 DTIrq5yOUcchGpAAxdZMUXcDkF3Pa9TM8Eg4Eqr12kp+gO7+VlkZTy3YXAz5qMmfoZma j0Wt+9fvHMa/1lQezbUk+yePZ8d2A3Xhpxa5PLoMGzUmjZU22CGtbbcaq8cK9buZ3gtq kgfGkLDXy74cTxKljN3FqTt8jNTjPvEoEBdPyL5jqmFDhfh9vwYNIWsWUhV8tM9gJeg6 WUtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=VSlcxnMu; 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 c2-20020aa7d602000000b00530bad54f0esi2769185edr.561.2023.10.07.09.25.46; Sat, 07 Oct 2023 09:25:47 -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=VSlcxnMu; 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 7C99768CB78; Sat, 7 Oct 2023 19:25:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFD9468CB03 for ; Sat, 7 Oct 2023 19:25:05 +0300 (EEST) Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-279150bad13so2342420a91.3 for ; Sat, 07 Oct 2023 09:25:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696695903; x=1697300703; 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=8jUObIJaxw8IQvOO2+tbh9yir/SfbHkjGBI762qt3BA=; b=VSlcxnMudFCUmdgLe9RPp2oiwImSP/XbTTjMNuzq4ylAP0uH0vd9EHijtm8Qi4MOsu XeVaAAu9jymZ7iISslvOkqyon7Rj8kOs1K6VQKTLdrcBtHdE5H47ckJ1SjtZRQCHBgX6 BC2ow4TQIhp7NQqoZHmCkygf8XJoBctCNHHLU5JHOzumQifLkX36Z4j5mprM8AYvT8+R +UZO7GIVavFz0J746NPAgLdKTjVnyJPG8waS1YcmoeMFNKOh4neIKJ9xkh8Cqk4dED5m U0aQvyXGS9vnVuwMVPjqFNAOZqxaN1JQaE6V8A0ipr6yzgkF8m5XoC+coBLq7iRaz2Yr 3+bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696695903; x=1697300703; 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=8jUObIJaxw8IQvOO2+tbh9yir/SfbHkjGBI762qt3BA=; b=HTEPAXwTm24WfNEYHGWgshB1zCCDy0KYPRJ5RmlaZa7M2k6+s8F2ihi7e53bvBF1Yg istZaMUUdomPiWNU45e6JntAtTK+atK2DOkeMmJOl75qzDZ7r1CdWZFxd655eQSRkXzi 8b5Erv5UpKz/4FR/TUVOVXRW4+9uQl3DxMQs95ORZl6kfOi8x3LE4NZO5/PDM+7+ru2a OGWb99858971o93J5yfroUkPAVrzTW8RUto5L+uKudipbO0qlpbGLku8fTqOUrHQjKlu 8X9KTNYZ0PiQjw5Ja6RcHscsEFIIRzpXgewCgv0qSdx0W0PD+wpxhpUS+4K1jWZlaGNr 88gA== X-Gm-Message-State: AOJu0YzFrKRa2Imd4NKo30ayVsGS3da2d5I68TaZnG37pSXGZXuw7iDD irGlmHDSv66xMZAY9hm7fm3d1LFFN5E= X-Received: by 2002:a17:90b:1915:b0:26d:2162:f596 with SMTP id mp21-20020a17090b191500b0026d2162f596mr10628442pjb.6.1696695903557; Sat, 07 Oct 2023 09:25:03 -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.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 09:25:03 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Oct 2023 13:25:00 -0300 Message-ID: <20231007162503.1057-5-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 4/7] avformat/avformat: add a flag to signal muxers that support storing 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: FSPxZkygCbTJ Signed-off-by: James Almer --- libavformat/avformat.h | 1 + libavformat/mux.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 9e7eca007e..c099ca8a01 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -500,6 +500,7 @@ typedef struct AVProbeData { The user or muxer can override this through AVFormatContext.avoid_negative_ts */ +#define AVFMT_CROPPING 0x80000 /**< Format supports storing cropping values */ #define AVFMT_SEEK_TO_PTS 0x4000000 /**< Seeking is based on PTS */ diff --git a/libavformat/mux.c b/libavformat/mux.c index c7877c5d98..c5e8a4ca74 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -188,6 +188,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) AVDictionary *tmp = NULL; const FFOutputFormat *of = ffofmt(s->oformat); AVDictionaryEntry *e; + int warned_crop = 0; int ret = 0; if (options) @@ -276,6 +277,13 @@ FF_ENABLE_DEPRECATION_WARNINGS goto fail; } } + if (!warned_crop && !(s->oformat->flags & AVFMT_CROPPING) && + av_packet_side_data_get(st->codecpar->coded_side_data, + st->codecpar->nb_coded_side_data, + AV_PKT_DATA_FRAME_CROPPING)) { + av_log(s, AV_LOG_WARNING, "Muxer does not support storing cropping values\n"); + warned_crop = 1; + } break; }