From patchwork Sun Dec 5 16:23:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31997 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3439566iog; Sun, 5 Dec 2021 08:23:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJzLmpTdrg91wi0bY3qzw17z0ZEIxszt6CzoBu2Nmj2zDk3iiW/3yNs2MF0fbHyON32GVLNx X-Received: by 2002:a17:906:d54c:: with SMTP id cr12mr38735863ejc.56.1638721435092; Sun, 05 Dec 2021 08:23:55 -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 g13si18577377edz.120.2021.12.05.08.23.54; Sun, 05 Dec 2021 08:23:55 -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=XTrpLrpB; 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 C0B7168AE8E; Sun, 5 Dec 2021 18:23:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (unknown [40.92.40.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4E4368A255 for ; Sun, 5 Dec 2021 18:23:38 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DAiGfgGE3dS4NrrO2dcFlmUqBWRME5Jwm0iFBIhJeBDW+itq1qJe5WmxyXPxKhFXRIElsQ3Gut6zw2EiZ0jSfLAao0MiIGqIrpQmDsKvOnxqc9fcxzAtSiEAkiBZmJ744oSCL/vh5TRwz688KLqDMrkvexWLlp1BHP9Hbgbfo5s+pEbTOweEDBo+XgTzIDTMce2HThAU5x7RbTSADMx+NnKgjXznbYoK0aCmQzOw4nHJUu92bQIIUxpe4hIZ1GGcPXSBVr/Eolq9smihbIW9356D1gO3aSyFCszHwWU1COpeJycDJIslhJgSPUvFR6qYbi0iIk9aUn75X7wV7j98Cw== 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=JdpiyVWRrsbJAiFXaoWOiRpqDOQxkicWgncPcUTNGls=; b=g5S75NUW69X1mJcmfF6ORjuAe8/Xa1TDJAdD+me7Bh6bZYbcweC8b1nHnggnI0v5x/ybiuofSoTqyIFBUjlP7ZOf6OZzbfVV3M6sSFMX6lN4nFU+aSGKrBgqpYbkdtiUT+XQ5RMA9H0qIJiSTjMiwYwrs9SubnAuWALJtCEtcrnA8CEUo4fF27OaT/mF9HSY+/lcZ90sKZyJFrR8tTtk+aQ607xlZYX7tEp+kiXL+DTT6/hZ+4VYqPAmC2pubtR0iomO/YNjGdPqgv5DJexLMnCWUbl/a4gKnbEPurTeJn2tPB7laR9VdhZqMOyZjv41msNsnffggv9pRXVS+ZkXww== 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=JdpiyVWRrsbJAiFXaoWOiRpqDOQxkicWgncPcUTNGls=; b=XTrpLrpBf26aen6ObGX6NqlzztxmKFDCSKT1d2vSbnZn1EN4q6WaYd9gpReKNXBT54RUg9D+poa2LXR8wwggj3ikvZJoVVm8FHN2PCYNmrdCTs2RuL88yG+hp5V0qRH25j8j7F07pxvIoQ2ivgurWfCWl8OXhaJXdbpxZ5JQcrWnm/D2X3seyA7W7Q64Rs73XgW7J+8fhhcKEKshQVTWmP/9l3P1YSKmzg0bBsXrslR5SfdRtjbXZzwDTlWRuUFpFappQv/BUpUNHJuoW+P8dwX8w0HxdPMyVOoM4xLJv6ylfhhQEk0JVEAp0izvAI8xio/iPED9IwKBUn/w1hCfYQ== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0368.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Sun, 5 Dec 2021 16:23:32 +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.021; Sun, 5 Dec 2021 16:23:32 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v20 01/20] avcodec,avutil: Move enum AVSubtitleType to avutil, add new and deprecate old values Thread-Index: AQHX6fRyWLvsIsQh+kG5KM+JBTDYtA== Date: Sun, 5 Dec 2021 16:23:32 +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: [GmTO4JV8rKErtRJWPicYWTFc9JC2cz3O/GlcyXseJeNycys47m/GbErcAmG2RCkA] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0336c510-0436-4190-786f-08d9b80b94ab x-ms-traffictypediagnostic: DM8P223MB0368: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: hNJunlU8F7T151jf/fBh7LGXtTvUKIjhBkxe0wePW+90ngNEuGJEtnhOHgslJvGCkJQc1gwdv7o6qCDYiGlrVOjKh33/InO54Lb785mW8Eg5YD8C9dswZ83nr5V3aJ4pjhPjzOPkuwuiAkpt2nAqPbhiGFIO1fsb293ORXFKWMTHbnvE6Z68LXkq3XZO3rA+obJ7ZCJr5tHVIcdgnhGcf+zF6efappRQMpSiphQPZGWlKWngmqguwt+wYbypfQ0UP3SeOWI9KpHK++jKIuH5VAl4XgPK5rhWn90DTZJLm/Fhw4tftL3K2uNoyvjzcxMTseXhUnWMBgv0q+uL8dD68fkvzLphtgxkHt1BKxoTFkDaNWzhnlSE4OHh/5X40fxC8AtGQh6G04kdASBRlmx/+GBbtEabtDahM1b4sYazpIEH7pAQwjEieVkYudI0vjT73oFw6CS77Ax3y3JI4R6mXNfmr6yayYEWWfWVKLckYI9d70JYWUpOYJwhSPyGZIXtFRwoS/3p8BZp2xX0nUoaaRpPESQlqGaR1eV+Z4EN1voJ6sUkN32uJnUHCr5XoYZJEzuC9j1j94oRNI9S8zYTWA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?uVogIwnDFKk67GQIJBqqjX2xLqa2?= =?utf-8?q?8ltobYi1Mmbf6G7v7Xh2UDGGdCcgYyoxdKhynicjk1zVyxwrg63p1oLJiyId60i7j?= =?utf-8?q?QB22i5cRbLd7a9joyZNUAAREE70k3E/9kR2PFtVwMKFe0iweR6QVRuf5kZAs14+RF?= =?utf-8?q?IkX8dKuMNm8j3l/7O62i0iV6nR2atU2jH/flFdZXPIB0C9D0Jzf9v70IX1GjiTjbf?= =?utf-8?q?NpSql4zcPp6ETOwHHCYghtxfurY0EiAp0TFimle6MX3I7xUOK/axowGQ2oKExO2aN?= =?utf-8?q?MMqZOAvxJC1FHG8YoPVfRCVVBHMFIqyLZrcKvXUPjS8tmJcvNJZUqCxypKNEjgOG5?= =?utf-8?q?wxmvbIPYUyvnlumlCcI3s1eX7U8xIMDtIIuuZjpXuagyIpXHAIHmxDT/fw/rxzJC3?= =?utf-8?q?iDZ6w1tr3vyam5o9GuItiQ4xuw4M7ejq/WzQmGmSEYNYzp64oGcJV46xQlMNs8D5L?= =?utf-8?q?+AvKWfUQuI9R9dFWcl8giNyERmadFrwC2ZKbuJbKxM41sAGLf9myQL6amFQUoxeqK?= =?utf-8?q?ADBENJwAspN63vQZ2sQobXEthS6Jf4SzzzcI/usg/g+LG4jHrSfRzMpmFCe13Jxr9?= =?utf-8?q?3i/peVRaWq65+6KfQnyOZHQ5jltxwemzN7aQKidlONXZAJArVn6F35YLT2/Yu/H8d?= =?utf-8?q?yEdU7uGiqDPSH6eAz7dL90JwyPmXsoIgbDJS1Q1YSl09idezhH6seGEGAR+4N17qD?= =?utf-8?q?fm+afi57P2GCVW4TcrntGtjKNtxSqlbZWIkS4NoYJXWkEHRQjFVkL6aYQoVKVgMuA?= =?utf-8?q?DUSS/Joa6KWqRGUlIXpAuccl23XFnscB1FPD928wuqpLBX7j9HAs2yi4UOAeKj04a?= =?utf-8?q?jg4NZgqJaCohiu0fl6k3xo2WxsffkxibxePcw0PHUl+kQiQZs1aIjTRPAxQOOqQmn?= =?utf-8?q?heXVPCCf+wl+xEvIwwAPvAoRKq0fH11clXDoQzTy26x67i6+OCLozAdv1EBLdY/q3?= =?utf-8?q?zDvFb1MHDqDxJOyG7ku/9qF20WzPMkrk/driEmZ5+5g=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: 0336c510-0436-4190-786f-08d9b80b94ab X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2021 16:23:32.7395 (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: DM8P223MB0368 Subject: [FFmpeg-devel] [PATCH v20 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: mZ7mJnbujn6b 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 2914ad6734..a466a2ec22 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,12 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-12-05 - xxxxxxxxxx - lavu 58.1.100 - subfmt.h + Add enum AVSubtitleType (moved from lavc), add new values, deprecate existing + +2021-12-05 - xxxxxxxxxx - lavc 60.1.100 - avcodec.h + Remove enum AVSubtitleType (moved to lavu) + 2021-11-xx - xxxxxxxxxx - lavfi 8.19.100 - avfilter.h Add AVFILTER_FLAG_METADATA_ONLY. 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) /** * @}