From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 42C814BCEF for ; Wed, 22 Jan 2025 02:54:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2131968B6F8; Wed, 22 Jan 2025 04:54:25 +0200 (EET) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FCEA68B55E for ; Wed, 22 Jan 2025 04:54:18 +0200 (EET) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2163b0c09afso115637435ad.0 for ; Tue, 21 Jan 2025 18:54:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737514456; x=1738119256; 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=sO+I/kXkBf8CM18sFu/3ZPLlnpQVUmYNH7oQHhHlZnQ=; b=gYSZTB9PufXH4KS8kf2VIKmkvUzs8GVkDVModk6yfwinh8EM3imjibDqRkLsickN9h 2oMZlkY5f4aBkL07CihuwLGWZbfJ73kkACtKUFRFKnUORuwoJi7o8JlyYpVspygViXhz XzkZsIXfULVYPa47RS/eL8pUM7bpxrDFlBwgEE5BULVneYlkttpBadeIfsFsPou/UHc8 KhNBVk2F/SCl2YwSXXRbdONCVsO1llzSs3oIFhiaXITKJ8xPPSN6lt3BROu7i1NexHf0 LWcbsVhJgLLAeNaUR9OybJwhajV/czxUD5lktSNXauGXZavekUqxImwnmFT/z4MszSIo pSqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737514456; x=1738119256; 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=sO+I/kXkBf8CM18sFu/3ZPLlnpQVUmYNH7oQHhHlZnQ=; b=VjLWwUsVvLRCUefwtqZApFHIu6VpajWXsce7hKMJYWutJJq35mctQ745+wEUGUyqnc No5tUGhNmbI1X6hh3gE40c/35rTZjqX1DV6vq7BLHI4cx0doNFVXaSIx0cGNCFL4e073 xqjqzuVvUCAvr9Dk6bisP9ejiNVDYEuT0BBgLZhz5q8vh4L8wICoIWgclkVPsKp5Owe1 wHBKcVpHg+vg7no/D0KDA0fMZRFn6hnPOPQzKNXA0w68trOzlBfVv7KUHzjjfaUMU9g8 Ybrv/Sf+zu5nYE8l706+XSHvtRb9vWHzeBZM9b1dAm9uWihvdJy2r67YbhTKpuD54L5p V8vQ== X-Gm-Message-State: AOJu0YyXCyMSpvIEYP35bzWXwvmEizaW6yWxGlrBgK3pBLbygcSHydzc LECNe2ffF/72se59zDg512X6UAXcoTINL+3A3bmLpGor27xcM+2LM+vlFA== X-Gm-Gg: ASbGncvAPX/wM5GN+1xB9TxsnLarXsUAzRc3sud44BUA6HUl5J5bdJ5CFAe0YUmhba7 Q4Ao/cwTl/zi4wITmMMbS8z1KLrh0nucsG2ro8HpvZrug9JC+OBrwO20wRpgeQfQ4htFt4k2N/D owdrCqBznHGvfdWPqyXwBzPeALis9nFWuzcF3uYvjS/uYX1jw/Svyq1B+HeZxSF+j2dFyHVb0+f RtJ8PTPZtUmwSLlexXjyracQzp4HevLdbyQk7iT/plzeXHtn71SEbWNxZ5b5bq71upKdhmN1fg+ zIzushGlwQ== X-Google-Smtp-Source: AGHT+IFpZxXDz4tVUdKmpG4AlrFnCfDk/AUQ3kaUXayZvcXcPJkI9VKw3UZQHqrVbbyqltfmeZzb4w== X-Received: by 2002:a17:902:d511:b0:215:75ca:6a0 with SMTP id d9443c01a7336-21c3555b09emr340990525ad.29.1737514455625; Tue, 21 Jan 2025 18:54:15 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:5b7:a27f:554b:498a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d3efb4csm84817225ad.201.2025.01.21.18.54.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2025 18:54:15 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jan 2025 23:53:57 -0300 Message-ID: <20250122025403.14457-1-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/7] avutil/avutil: move some definitions to a new header 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: They don't belong anywhere in particular, so move them to a new generic header called defs.h, following the same idea as the one from lavc. Signed-off-by: James Almer --- libavutil/avutil.h | 94 +++------------------------- libavutil/defs.h | 149 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+), 84 deletions(-) create mode 100644 libavutil/defs.h diff --git a/libavutil/avutil.h b/libavutil/avutil.h index ee709fbb2a..1cf562c73f 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -191,100 +191,36 @@ const char *avutil_license(void); * @} */ +#include "common.h" +#include "defs.h" +#include "rational.h" +#include "version.h" +#include "macros.h" +#include "mathematics.h" +#include "log.h" +#include "pixfmt.h" + /** * @addtogroup lavu_media Media Type * @brief Media Type + * @{ */ -enum AVMediaType { - AVMEDIA_TYPE_UNKNOWN = -1, ///< Usually treated as AVMEDIA_TYPE_DATA - AVMEDIA_TYPE_VIDEO, - AVMEDIA_TYPE_AUDIO, - AVMEDIA_TYPE_DATA, ///< Opaque data information usually continuous - AVMEDIA_TYPE_SUBTITLE, - AVMEDIA_TYPE_ATTACHMENT, ///< Opaque data information usually sparse - AVMEDIA_TYPE_NB -}; - /** * Return a string describing the media_type enum, NULL if media_type * is unknown. */ const char *av_get_media_type_string(enum AVMediaType media_type); -/** - * @defgroup lavu_const Constants - * @{ - * - * @defgroup lavu_enc Encoding specific - * - * @note those definition should move to avcodec - * @{ - */ - -#define FF_LAMBDA_SHIFT 7 -#define FF_LAMBDA_SCALE (1< +#include + +/** + * @addtogroup lavu_misc Other + * @{ + * + * @defgroup preproc_misc Preprocessor String Macros + * + * @{ + * + * @} + * + * @defgroup version_utils Library Version Macros + * + * @{ + * + * @} + */ + +/** + * @addtogroup lavu_media Media Type + * @{ + */ +enum AVMediaType { + AVMEDIA_TYPE_UNKNOWN = -1, ///< Usually treated as AVMEDIA_TYPE_DATA + AVMEDIA_TYPE_VIDEO, + AVMEDIA_TYPE_AUDIO, + AVMEDIA_TYPE_DATA, ///< Opaque data information usually continuous + AVMEDIA_TYPE_SUBTITLE, + AVMEDIA_TYPE_ATTACHMENT, ///< Opaque data information usually sparse + AVMEDIA_TYPE_NB +}; + +/** + * @} + */ + +/** + * @defgroup lavu_const Constants + * @{ + * + * @defgroup lavu_enc Encoding specific + * + * @note those definition should move to avcodec + * @{ + */ + +#define FF_LAMBDA_SHIFT 7 +#define FF_LAMBDA_SCALE (1<