From patchwork Thu Dec 9 12:12:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32220 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp273741iog; Thu, 9 Dec 2021 04:12:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwN+3IX/qwCcuNzndASVSjevQf/aAX5R5hUN8OTT9cI5OeLv6PeKodXCaI6+SQb+XUjI4ml X-Received: by 2002:a17:907:94c7:: with SMTP id dn7mr14920790ejc.470.1639051966209; Thu, 09 Dec 2021 04:12:46 -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 gn6si10199931ejc.196.2021.12.09.04.12.45; Thu, 09 Dec 2021 04:12:46 -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=YuKBkCtX; 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 AE43068AEAD; Thu, 9 Dec 2021 14:12:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10olkn2041.outbound.protection.outlook.com [40.92.40.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 85E6668AEAD for ; Thu, 9 Dec 2021 14:12:31 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bzTIENJuz0EMdiY4sklM37l1SMJtcCpBMu9VBe1r2zV/X6bY6Sctlc7O+5W/NUMdaICD9+Sw6ad0lrd2PUDmmq2pOh774ydkjKTNAKiIVjaJGDaEA/XL9SQqi1ncS/5rgELc0947rcxJU36iUiv7ROkypRrgPqUDDF7uzT66HTvCph/r2rflqmDKjKy/A8W5TvBYIbkI5s3x/OTG5KlcZbLlH9dxWj2mKvQxF6YBjk4IWt1vdhOOUJPgSQeMJTy2ltcnkT190CS0urNQh97c5IwL7ZGrsLBs7wZ3wmlf/vKYbpDd4Z8wd/+1V8GZfuEmL8W+5C3BcTHrKf4tsnMdwQ== 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=ZAsSELDN72a4N9PsDuaxrBFeDWfEZvY/IL05oeIz3ys=; b=cUQV8DUl8vJJ0HKvqhkKlrE8hHFh8zZ1YMf32wPGM+Q+Zn1YoURygwlxemQJ5xPbPL/nc01FBZaHDXXUlErTaOUGBmkkm7GYzDmF7+0M4D8uIMqNcGky8JGQS/nGalNp73aJzrr6r0RVmUpx7mhzGkJxA4aYWhYuwmpRweFoWPsVzr1/Cty76fSyEVi3IrTsxHJGdJUwHXpWEzEmXijp7ouoLKowMmF05dVhfYk7+0DzljTvltpIW542EqLR9or5FLwuFikXRBwrEsMdj4kTJynLdCnK8kPYuQujUmxBMb1tFFRnjKiz5IResQTz5rXwgpZRFbcm6lvmYSedIxfLdw== 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=ZAsSELDN72a4N9PsDuaxrBFeDWfEZvY/IL05oeIz3ys=; b=YuKBkCtXz7ViOjBa/vE0YWDOWSBqIv0pWDySt+gX2NypPmmci8hRLoxccBielGufakbdLP1a2sULkpCtDviu/DyLpjPXnrjEa5hRhDNkjqYr80WPe+GIjH+DrYdf/24ZQ1pUJSflMkRbq3JCfd/W1+cIq16N23rDLOeuy2rGEtY8wNCdZwDJZ+sEjO7ESneY//4A1ky4GvSti5mjLJsdpHYpVrxMqWiLlwavnPTwOavI7w9uW+5OAT1TpS75R8a9P1tnfX9/rbZmpdYJEzcEhpE/gAhhW8iq50BQKe6CxeCSmVj0G1ftXwX8h1VMkPW0/tDexa5jxln7MFfHaKFAug== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0399.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Thu, 9 Dec 2021 12:12:25 +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.025; Thu, 9 Dec 2021 12:12:25 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v22 01/23] avcodec,avutil: Move enum AVSubtitleType to avutil, add new and deprecate old values Thread-Index: AQHX7PYH+SA8RNfcxEOmSDUICyDyFA== Date: Thu, 9 Dec 2021 12:12:25 +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: [ybEeQAyQVbKS82rKWQF21ZESyQMzretV] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: bd89ee36-4a97-4b25-3a20-08d9bb0d299c x-ms-traffictypediagnostic: DM8P223MB0399:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: E1ma1Y4Txw99LJZV0+BGZPjJTOehuaLJUbOugaLSsE8qFgxvo3f3l69FHMFdf33dQGTVeKhGvtZGWO15BDrnqxL7LVYBNtdAfgBd0UEcaWi9OpVxtlXgulmPzb1i9V2ULDhTFfEepcH4c6FfddZFPUhPjLRBu1TutDNaYp7WqNHIITz9z0NTLVp+TKZpBq9lIJFTteglA4SOFt8JGkkUZdm9M4OQnRqCCnM3MbQpEkZE9OqCIeoEw8NEVYDJ5JkWkxTvIdnIii0XjIBATWD23vndz3bolMnCb50UOrFP0t+pdXjiO3hynudNm14+ZogATutstA9X3cwpNJUFFvkm0Z1LvmbXOj0Vdy/8iUdyl5q0yfsFnnNQ80UdVwTkmukeUSI6+30TNZcGOM0yWmFMFOEbuTmgrFDB1ev4iL6cNm6vnuRWURyzzWME2ieec6GF7goTSvc7cCUWi/RLthjJCU6uP/srLNvpSe/MZut4e3welAwKrUPeE8cs0QZ5nVmUskP/SfUUrLXMoZxyt7J0I2Vzd2a59mHffrxKdHmfxYiM6IoiYyuZLODMhu9VVg1HGjwFqXmTLn1SJ47j0amKoQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?7IpF2copkOXsUSd536coECiBeTJB?= =?utf-8?q?CZPfzvCuOqy69P3q8iviZPT1okoARdeVYIN/VRKUvTavPURf8b1YbfXLD1++HqVIE?= =?utf-8?q?YEMad1plF31EloghPOb9XkzU//f+2PeMI5wZCm2Eo0YL8Voixhxo3b5Xm9dv6ljez?= =?utf-8?q?FMnvzLPtsuXJU4Nezyj8YEqRgwoyDlqMQABqHaFDiSW6kf2NvaChD+BG6nVTKXkUu?= =?utf-8?q?McRkuWU5q+KgNyzRB3nsCKUHMVD/49KKnoKdWDGlWUgglAeW0ZkWcCOO6dDuQTpdS?= =?utf-8?q?dEdipUPcT5jHMWeXMnfmzkWcnWWkOQ5vu64tBy11cbEv4qHXMaDYqrEkb4TtXjyyU?= =?utf-8?q?1Xqo0YS1C7tgb7y9kgSx6jpIEpjvtmTcmC92vA5ds9hcyU/A/5Y+snxQ61+2sB/0u?= =?utf-8?q?EUzxM5hZvO/6ZZboyuusCeE0gFejKXAvLp8CQnyKUut6tNR33V+/gANtYHXV6EfaJ?= =?utf-8?q?8T6TGQk+eDzWa/LOgy+gihK6MWUkc7XT18liZinKyi6h5XUtIqirkzONY3fnJiowH?= =?utf-8?q?EDLPQrnfNqYmeYiFoUZ1RTGSAMaEBLq51KzJKFOElULtWE8dMjl9ys7OhSW7pPcx6?= =?utf-8?q?UxlNHDCK8UEKwmtjbXW+z03lVLZjpz2UXVSKlXht/8XGq9uuH5U6/b27pZm0rwUCK?= =?utf-8?q?iypcai0AbrinBrvtTUSuiycz0LoQu2eECwZti7VOzShM68KTIMjnL6y9l1nzFj4ct?= =?utf-8?q?oGvq3lpNAuxWSA4DqOf8j0Tdsv2QdCkaVhscsVR/X3V8gJ9Ye7TsgoNoF1+EPZmjd?= =?utf-8?q?vanEuBWtBMbhyDrdQRrr7H+Q9Cr7a2VqdNdmJr35SCDfSY5UBvSO4FSS1Rcj6E8IC?= =?utf-8?q?zUPhdFWJM5zalKfZa0xHMiYElzCT66W/qgvTDL75mQM6g2YBgtTfafncw2Brrw9Dv?= =?utf-8?q?22gxk8EWpyTqAdXa/Gi1z3JxOFV6/zN4VVEeg5Ym/H0A=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: bd89ee36-4a97-4b25-3a20-08d9bb0d299c X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Dec 2021 12:12:25.6121 (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: DM8P223MB0399 Subject: [FFmpeg-devel] [PATCH v22 01/23] 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: JQLtmqS76MWk Signed-off-by: softworkz --- libavcodec/avcodec.h | 19 +------------ libavutil/Makefile | 1 + libavutil/subfmt.h | 66 ++++++++++++++++++++++++++++++++++++++++++++ libavutil/version.h | 1 + 4 files changed, 69 insertions(+), 18 deletions(-) create mode 100644 libavutil/subfmt.h 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 017fc277a6..c6cd0b0d79 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) /** * @}