From patchwork Mon Dec 13 23:40:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32452 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6138586iog; Mon, 13 Dec 2021 15:40:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJwoghg8QiFkXJ7PIoP8tagEBebA1DalnRjMyNSSnUNBcx1lJDYPkJ3sKnREuGBGm/eJAskJ X-Received: by 2002:a50:9d48:: with SMTP id j8mr2680494edk.192.1639438839520; Mon, 13 Dec 2021 15:40:39 -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 z15si17491642edx.151.2021.12.13.15.40.39; Mon, 13 Dec 2021 15:40:39 -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=fPLqABkD; 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 90FB468B029; Tue, 14 Dec 2021 01:40:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11olkn2032.outbound.protection.outlook.com [40.92.18.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C67768AD39 for ; Tue, 14 Dec 2021 01:40:25 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ORTT7sKiA8HTS19PwUSd0N8jfy8btWP4anmFt/prMYSdtl6ESveCy5PPgaIPaVny4f3OiG7Kq6qQ8Ip5O09MKhzf/ejNSuu8j/Rq7qkylZLofdRrFP/M39jsoO5fQAlq8l8bJQHwMA61xU78iS7+AD9RWZfmqPZGPjl3En3Way8qwwpONEDvThs1F6ELFDmQEd0BFqxepQq5EfbzN3h2ISuBo5+OE07NwoRuXWyr4TTngI1z7A5lmUJm8utTTup76D7SGo6u0XgK60jZHCy95ckLrN/nax6qfbzbUUbKLuwcb0KMZgJ27uwWliKsL3DtZSPBc0p7U/4yfJ9dvOBeng== 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=L/JwRvIuwCyQ8zzIEsYtEJ3V3EVmXCY+mbNEMHVFp7Q=; b=b7Oa715SAqH/QgEltdD1D9ANeDULoGMAHfE7HLaJOsV/vKTtlpz4PFWLEMj1vqLYXuQWUKrAiLswa6R7j+31YO8lEFR2WQY0WjRB+P17xmeuUzKc/pJNRTOgrO2tMtNF7e81Cc83xJ4Xuxto1Cc/EacPq3bUcgLyIBUMQJ7lz0aIpeNxdNqegpj6HT64WJGgnpDLJJTqk57jUi+6iIzoYSWxi54jlt2BtGuqr5GFgazbC7i+H9ApRA/MHHyPwmTnZSDId92p7Ojg2XEGnqKijW/Op1TsuFaXpg01diABGcVZoSjtALiy2Q6IIMIfxR64rWVkl3NpzySOZSzQJMjiHg== 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=L/JwRvIuwCyQ8zzIEsYtEJ3V3EVmXCY+mbNEMHVFp7Q=; b=fPLqABkDbMjT7mig3fHkLPC69Ha/pRdC/T29lTW+sNXQEv3lrSAAsMw/7BBbAW4nngLX30OiaYCXRrlfwcIkZ1mU2pmgTbMlz0zb6egFlybobO5Wwuns/GG7AMbWgh3latvxUJafJO4LFRxJmo+5Eoi4rTLcNP8vgL337FTzOVCEN7PyeEQ2sCyP4G/GIHpmNhNdIyFU/OiRRxDEbg0B02F4Czj7JES87gVK9fbTXQKryaPyxvS/tkh4W8PC3wwjWnUc++GfG8Mnj/yI/CnXg027JkMIRoXkcy7xaecvnogorjcDtB0gG0mEDnrHgK3hgXRk1IVvjBoP4iKQsMqtRQ== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0303.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12; Mon, 13 Dec 2021 23:40:20 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%7]) with mapi id 15.20.4778.018; Mon, 13 Dec 2021 23:40:20 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v24 01/21] avcodec,avutil: Move enum AVSubtitleType to avutil, add new and deprecate old values Thread-Index: AQHX8HrK2MViD7eCbkafIlYzN4PZag== Date: Mon, 13 Dec 2021 23:40:20 +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: [gZz+dSmUCKf3FmyOTdYe4L5iQXSrcsOJ] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d7587541-4fba-4e57-a53e-08d9be91ecfc x-ms-traffictypediagnostic: DM8P223MB0303:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5reF0d4y02Lwqe7kIJ04YvavDUeYrpyfWpMxRaAqTkIJmYgDditu0mgfeD/ozdU2AyterbAQUh9bh0CpXk1FgN2n9TiGzk0p+hFQbzw0owv8lvxb4sTApH276XjBSOOvAq8mz92M3JOmpYLwrDd2/4bFbksAykNzzo+byRE7IKcfALJgzlckRX9nkHqQN2iyD7gZ18R9mbapZ1cPPg4ynhDK5v8rcxp++DIt9cpe5psng7fsokeTCUaxhHJ5gyPwI+52S0Q8FJN+/LyhkfniMsHJxkQieJRw9wmUrxV8RQ0hFy2coqtL15ingsnzybLmj5MPXUvi3UM2vx9Ecf79KRoNYsaMKlzVTR/QskLpRZGSi9DnsHCk0qPcNGlb9WkR/SS2u5nsjeFxsx7tm3g9VYeDwwMXt7xfpjw/5WhRF73nwfxcxaHe1vPJHkK7kWrf2ydhlzsdanvRNNFrf0sgQMtWZkazlT1CJC4EU+Kzp0CzwfQuPEHz8zM5MxJQpA56zgOPKHiemOYz87exRJ/cl1rfkBamnH9zn73/Durpun5deXsU5XCJekqUCosRQklw6NqfqHMW+mkOE+PHxV3zjA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?sBWUSmUUQFGDAE66+HIGthCJz/2l?= =?utf-8?q?rHG7Ofyfc7ORurgkWDM6pBfAXJcnNnMLxLbC60xPywL83m3He2ECNCo23L8fVIC59?= =?utf-8?q?aeGt67JvQVNCPVBgtBrQdDEOzLASzq+IBrLu6DjdsDElbZU1FPIXs/jSJQnnEBwRh?= =?utf-8?q?8+VAa66vT14vBT25HO1eHlSkKeT36KwlT3hLZvzdzzUv8g77ejQlaDnAD15BBaiQq?= =?utf-8?q?T56NOA49UKQz/tYK+kg4U5pG3eOOfjzBqN/al7dVzpUrUJgl3geSbi+9orfZbKJsP?= =?utf-8?q?uH8LTwrqiDHegGxoax9yY9cngyXqY/P2AqIX6eKMf7eyjGWSj3NrkYes+D3IYApGT?= =?utf-8?q?fsrKzyTAG9EOj9+5Xft0qISWMqhWhDOe9sM0gkV/SHngSe0kY1yXnnZs1UO5h10Ah?= =?utf-8?q?IlA7W8Y/UflebVMCo74agojQrdrRF4vYiZNT1Z38Wh5WXXpbukNvtBWu2c12WSwlv?= =?utf-8?q?m848JrMIqA3KOeoGlezG+wO6zmc/oklXP5Pn889tQzCwg49mh8aklLW4ODzV4EhqJ?= =?utf-8?q?u/b0diNlUCedbOtsmuIP0Dho3uIL8uRSDlKhmsh467elVK3B1EjzL3zr2+cgX2aPG?= =?utf-8?q?QN43jDJKO2IRXv2KeHi2s+XytCfhhVFe8ppGTJ9sauPa4t5CONAAezarPQJSEPeiZ?= =?utf-8?q?MakgR7Z4R90t9jov0ifgvf4EyETBkNVGmp8qS0EhuS9p6JnSYHBsUtRw4A8BCH+5U?= =?utf-8?q?HsQu9UxRMUMMlhXcUqtBP+kZilIiRbkC0kPsHiLIgNm4cL+sLE+iJzAt9Zll3yAww?= =?utf-8?q?F32LlVtPij5qVHyfl4KRDUMoQQkvd8ohH7h4F45oORFssWwyA3PQ5++hi+AMZeANA?= =?utf-8?q?thX5Z2g/RNhwOoV4K6Ng5VLpX78exNuYRnmt1uvavQzzHKgI7yXK/0bORbUVKQVdD?= =?utf-8?q?OMvm6rhWITN1r/Unl5Or59JMek1MB0GL8H2PGhl/QOpA=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: d7587541-4fba-4e57-a53e-08d9be91ecfc X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Dec 2021 23:40:20.4623 (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: DM8P223MB0303 Subject: [FFmpeg-devel] [PATCH v24 01/21] 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: MLfeFPJ/i52r Signed-off-by: softworkz --- libavcodec/avcodec.h | 19 +------------ libavutil/Makefile | 1 + libavutil/subfmt.h | 68 ++++++++++++++++++++++++++++++++++++++++++++ libavutil/version.h | 1 + 4 files changed, 71 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..791b45519f --- /dev/null +++ b/libavutil/subfmt.h @@ -0,0 +1,68 @@ +/* + * 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 + +#include "version.h" + +enum AVSubtitleType { + + /** + * Subtitle format unknown. + */ + AV_SUBTITLE_FMT_NONE = -1, + + /** + * Subtitle format unknown. + */ + AV_SUBTITLE_FMT_UNKNOWN = 0, +#if 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, +#if 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, +#if 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, +#if 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 0e7b36865a..cc8caadf50 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) /** * @}