From patchwork Fri Dec 3 19:31:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31933 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1096593iog; Fri, 3 Dec 2021 11:31:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJxwE4pS2dSBFIf26GrcL5KIkSHTzjSyEFOcS1FmQHGOp5TIAvVOhyPkuldpEML0nnB0SPAo X-Received: by 2002:a17:906:c14b:: with SMTP id dp11mr25738728ejc.294.1638559892783; Fri, 03 Dec 2021 11:31:32 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s11si4712651eji.151.2021.12.03.11.31.31; Fri, 03 Dec 2021 11:31:32 -0800 (PST) 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=@hotmail.com header.s=selector1 header.b=GravtKOI; arc=fail (body hash mismatch); 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE87268AE3C; Fri, 3 Dec 2021 21:31:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2068.outbound.protection.outlook.com [40.92.41.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1945C68A8C7 for ; Fri, 3 Dec 2021 21:31:13 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cgO591bNmx6n0UsXSBjJeR6YH+IEOT4FB2nR2uc11tC0n7eSoqheqoy+BYLSPxCak5YBOTfKKBkUqvtOO5DpXja97FhnnDCd4h9dh/FiOWPha/BmbfzCmdm0deNpALbzff0l9dMpXa1SgWOLvp8ePfwVGLE84DnCMh4huhcH6EYLyp/cpzABF+5qx1gOp1XFdoDqdLZd5P98ro3FCkuBp7kdr9CQBxThh+Qw1/cVTV85wc5XqJ6/fplfVCnEYw75lsIEoq9rnqptKDzvl2QnangiFJoKIk+5/XTmqUDF2fQeLLi05gEtBbrJy38+eEYqdGf/b+EKFEFOLLpoeKwUOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yCvKUQCIKpHMgalFAE1Cz1/8g+sW13L07Jg2d6M1lFU=; b=SUcdjxsgkp2FqnZGrKqintAY55zwx567t9suSK/7R24o+ngJKGyDZWwhsi5kf74g5OOeySVuK25K58j+vi3gyArQ5A0tQ862TgcuNvWi3JJPGOhmZPw6jgEJE4SGWr1euAMBO0TFHcMca5N58XvCE5ofepZQfQvJYE/wa684ALUIVPW2MZeNa7VkJiHTMKKkNJ7KU/x6TXVwrDU+IY/gKHyM4Ss2juzI0fKUOYX1+Gp/0lUifol7hPpwD9ZFYH2ZXvpyLoBjGTpcHZKxJIY6yFfuTHra9mNBA6QofVSwvp4J7bnvYl31IvboZ4d18tH6/G+j+XjCqkAzEnEigPM0OA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yCvKUQCIKpHMgalFAE1Cz1/8g+sW13L07Jg2d6M1lFU=; b=GravtKOIB0FBG8W59XHbhi+CecGPRXo1CzS78CMpHPRwNC9K6Oj9bHMpZ6LrdoV2SHJPStQR2p6Rb47p+5YK/hSfVbhlR/lBXpafNfmi4weHIR03ix8nqaeK1h+koR8S9TJggQ8BuD9FiMnzxmsJHRFmLAgdInw0sjdL8H4n1bnwacQi6dhgKJbiJrRaCv0Mej5Mk1/Oy2y5mWXZHleS93AGSDFHUP7M1v3Z9SiZMN3IXZ14XMFafUEgde3ELxb8F7UdkfKFjtHccuxvgRF4J+QYGkwUXSgktsTxw8JDLup5rfUnK3VjaJN0YOkdDR5wpTSm2x96IEqX88ZTt2I4Fw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0333.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Fri, 3 Dec 2021 19:31:06 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%8]) with mapi id 15.20.4755.016; Fri, 3 Dec 2021 19:31:06 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v19 01/20] avcodec,avutil: Move enum AVSubtitleType to avutil, add new and deprecate old values Thread-Index: AQDvBw41a8hIOs8kINZbvKkBfDq+YAJy0NVF Date: Fri, 3 Dec 2021 19:31:06 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [KNpIGGNZBY6ndOwrxDfFkr2eMQK3EscA] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7d4b2804-d68b-4f00-8ea6-08d9b69373c3 x-ms-traffictypediagnostic: DM8P223MB0333: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: yWMTv27q0rP3PTMK+jBa18WbuUVX2BsYlHKJZvtAdV3rrCJd4lpo417wnW2vqaFSzkHhrnD68y3OvfT/5B5fF1l75Nz8++oXXbOPt5rsoYDH/KlA6PFUhq40eU+a7rzDk6KYvFffsID0O5ZLtRYTX9ucJVqIEe9z16CNUS+OMAXPTi49nQkIl49B4vYfrurzAY8bms5Ms+5Jbc9sPeTXsFXoSM//2PS2/rTa7YRzRDe6eU417A/tcdXnv5NsqDmC7s9vUVL8GgjV3wgG1Do4TdTneWpC8y8Lv7osWXZPK5m92ExjlQdRCnXMtDGfOW1nQb/hqlkP/LZcEG/Nx7zo5h4lWIk+ZKFj0MfUtWlVWCoiLZXTC6TzZPdPostGEli3GqRtOiF2jbTpX2J22prji/iHHlonue7JZ2hlkBRYmOrwYKf6Ymr1rTRWMNFLSId6znhAtT+Bn00cw+Sg6JY40PcJV7D//tz9scXtxx581GcoTOfthVWq3x5a3ZtDa1DcZHx8C9PqtOesDsveufq8T/OIuJAE+57jle02SHlQT+oQDl9PeQG8+7PzhOPMelc48yAwaGQLoBpbtjEoUm4h+w== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?rf4z/ZUy7tGskWIxmjqeAYeAMZ3n?= =?utf-8?q?PaXEU5hy2lJlYmMGikussiHJ/GoTuzMReVQfqprFZ9QucsJdMXixmgQARBXO0qNeB?= =?utf-8?q?q68VUqnyd8mD+ZR95kYTfOKr8D5cL3YLr+pYpxzH5f31H8aWMqHUZpxCGm7DYdX/F?= =?utf-8?q?gmCHUAv158RUuaXcfAQuwSdAh1WTZ4s0uV68K3zLXkgKuwUfb1BK11Pj2rUtL+zQ4?= =?utf-8?q?JQVcdPDcIAyOQWhcfeV9JLxER6Uf30XXVespGLNXXyJq2aEF2h/gVyshFoTx0F8KY?= =?utf-8?q?Uwt7YEop9FIDUH0toA4kjVX8ZF+PSOz3ISubo4rWWPnVP8NuDBu9FNJhi1C5hXJe2?= =?utf-8?q?QsuR4Ph3NUYnOn0fI6UroCiZEmRCPDkWpSqVCZrrotrvR5JlPEzreBUKtgevuCUt1?= =?utf-8?q?9poh7jpotmHnxz9xnhgug48qA39TGvdh6ULlShWpdulmAsRBxJc3+Ye1xzAdmOyd+?= =?utf-8?q?qQtJlYiPFOlvVukhLS5lw8GLpZ87KxyijqHdEcOtCm5VY74up/vABbrboDtsfIHmy?= =?utf-8?q?4EnEnZe2Tk2X4BGJMbuf4bQzPKc0HMNO2Gdo8OhcoA1U8EHqo9JLVQapG56Z2G5W+?= =?utf-8?q?/6ceITLb8trMGvN5q72jiFxElHbHWzUAcTISQENQwuUTvZ5nr+dV/NjTxycBQuT+s?= =?utf-8?q?hggVtUKlyIjZ6gjcXKxEHbeVmuGGGjSuug4oOsCbB/tnuaUx1SiPGV+YyoCZYBkid?= =?utf-8?q?LkgQjesmvrOxZgBmgUuycabhXj3qdot4G95jRm4sZBGA2SWVyY7ODFNtzx3GRBO2s?= =?utf-8?q?uUj26FfscaiPMAKsNcyZStNX3NO/GZBZ1l3nECmsXcmFlJBObqAK27Gir8y/2KiqG?= =?utf-8?q?FGY4myscMVpIJ55n7gaZnJPUsdR5u+3+NhJXUqlWo3AjnIOlu0aZXy4+62CbbGNcb?= =?utf-8?q?o6fUY6b8tUGQT2j0SzIL57I7dd8c1CwmGL0LPYOnPgIA=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 7d4b2804-d68b-4f00-8ea6-08d9b69373c3 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Dec 2021 19:31:06.7801 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8P223MB0333 Subject: [FFmpeg-devel] [PATCH v19 01/20] avcodec, avutil: Move enum AVSubtitleType to avutil, add new and deprecate old 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: WeQsh0Yjwtfm Signed-off-by: softworkz --- doc/APIchanges | 6 ++++ libavcodec/avcodec.h | 19 +------------ libavutil/Makefile | 1 + libavutil/subfmt.h | 66 ++++++++++++++++++++++++++++++++++++++++++++ libavutil/version.h | 1 + 5 files changed, 75 insertions(+), 18 deletions(-) create mode 100644 libavutil/subfmt.h diff --git a/doc/APIchanges b/doc/APIchanges index bc9f4e38da..c0e1fde8aa 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,12 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-12-03 - xxxxxxxxxx - lavu 58.1.100 - subfmt.h + Add enum AVSubtitleType (moved from lavc), add new values, deprecate existing + +2021-12-03 - xxxxxxxxxx - lavc 60.1.100 - avcodec.h + Remove enum AVSubtitleType (moved to lavu) + 2021-11-22 - xxxxxxxxxx - lavu 57.9.100 - pixfmt.h Add AV_PIX_FMT_P210, AV_PIX_FMT_P410, AV_PIX_FMT_P216, and AV_PIX_FMT_P416. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7ee8bc2b7c..b05c12e47e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -35,6 +35,7 @@ #include "libavutil/frame.h" #include "libavutil/log.h" #include "libavutil/pixfmt.h" +#include "libavutil/subfmt.h" #include "libavutil/rational.h" #include "codec.h" @@ -2238,24 +2239,6 @@ typedef struct AVHWAccel { * @} */ -enum AVSubtitleType { - SUBTITLE_NONE, - - SUBTITLE_BITMAP, ///< A bitmap, pict will be set - - /** - * Plain text, the text field must be set by the decoder and is - * authoritative. ass and pict fields may contain approximations. - */ - SUBTITLE_TEXT, - - /** - * Formatted text, the ass field must be set by the decoder and is - * authoritative. pict and text fields may contain approximations. - */ - SUBTITLE_ASS, -}; - #define AV_SUBTITLE_FLAG_FORCED 0x00000001 typedef struct AVSubtitleRect { diff --git a/libavutil/Makefile b/libavutil/Makefile index 529046dbc8..c7843db1e4 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -74,6 +74,7 @@ HEADERS = adler32.h \ sha512.h \ spherical.h \ stereo3d.h \ + subfmt.h \ threadmessage.h \ time.h \ timecode.h \ diff --git a/libavutil/subfmt.h b/libavutil/subfmt.h new file mode 100644 index 0000000000..88078a0d14 --- /dev/null +++ b/libavutil/subfmt.h @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2021 softworkz + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_SUBFMT_H +#define AVUTIL_SUBFMT_H + +enum AVSubtitleType { + + /** + * Subtitle format unknown. + */ + AV_SUBTITLE_FMT_NONE = -1, + + /** + * Subtitle format unknown. + */ + AV_SUBTITLE_FMT_UNKNOWN = 0, +#ifdef FF_API_OLD_SUBTITLES + SUBTITLE_NONE = 0, ///< Deprecated, use AV_SUBTITLE_FMT_NONE instead. +#endif + + /** + * Bitmap area in AVSubtitleRect.data, pixfmt AV_PIX_FMT_PAL8. + */ + AV_SUBTITLE_FMT_BITMAP = 1, +#ifdef FF_API_OLD_SUBTITLES + SUBTITLE_BITMAP = 1, ///< Deprecated, use AV_SUBTITLE_FMT_BITMAP instead. +#endif + + /** + * Plain text in AVSubtitleRect.text. + */ + AV_SUBTITLE_FMT_TEXT = 2, +#ifdef FF_API_OLD_SUBTITLES + SUBTITLE_TEXT = 2, ///< Deprecated, use AV_SUBTITLE_FMT_TEXT instead. +#endif + + /** + * Text Formatted as per ASS specification, contained AVSubtitleRect.ass. + */ + AV_SUBTITLE_FMT_ASS = 3, +#ifdef FF_API_OLD_SUBTITLES + SUBTITLE_ASS = 3, ///< Deprecated, use AV_SUBTITLE_FMT_ASS instead. +#endif + + AV_SUBTITLE_FMT_NB, ///< number of subtitle formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions. +}; + +#endif /* AVUTIL_SUBFMT_H */ diff --git a/libavutil/version.h b/libavutil/version.h index a2615cd299..9edda72411 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -109,6 +109,7 @@ #define FF_API_DECLARE_ALIGNED (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58) +#define FF_API_OLD_SUBTITLES (LIBAVUTIL_VERSION_MAJOR < 58) /** * @}