From patchwork Sun Dec 5 19:41:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32015 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3627227iog; Sun, 5 Dec 2021 11:41:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJzkzpngmYoYlWtgIgMU1mXl0hJxV4qtsoaaHOCp1LfM5ePNskpqzPAesb9g6KYcOLPsGGDY X-Received: by 2002:a05:6402:50cf:: with SMTP id h15mr47551311edb.90.1638733304889; Sun, 05 Dec 2021 11:41:44 -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 jg33si21447240ejc.404.2021.12.05.11.41.44; Sun, 05 Dec 2021 11:41:44 -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=l1cgX3tn; 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 BA9D36806A3; Sun, 5 Dec 2021 21:41:36 +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-dm6nam10olkn2076.outbound.protection.outlook.com [40.92.41.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8469A68ADF6 for ; Sun, 5 Dec 2021 21:41:29 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jsJXNyEm+5o+DKitkNDoWVzyurV5LohEhit6S1O68jKxLOA/OthBMgTVjH+E6QDlYSSoSQiJMXrLvggmGog2woQFV/oJWrhetQylXYKlh9uJReI1OKA6zxXN/akQ7s2yr+zH4Aum+692vCofks/27hhPMQuSCcPOMqZBzHX9/4I7TCehupPxFFYeCwWLwWrqfwXimpFoTNgnmuqX8C9bANVEPjiktgnzZLvmQEYS+4jumUmgbVUyHf9rSquYZA09vSgegAcvLJujmsvkSp3jrrN9Nei962AnpAL10LcI7mupJpHCB0hMQyqWoXyi8DeKBvnWeIvxbFlVvrEdkwxZGQ== 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=KSFIwumbwIKz2rkUIYtsqQHmWAfDkg0Ga5VdL84YbwbUDK/omxHhYPvVsyQp1qxAB0JIV8zvzIWfKTeJHSRBi2k8HyedaD9Un6j8nXlHbJFcygj72btU0kfL7iuwgKiP3RtBJ33dYSssQqHvkJYJN3MiCs5E3VAV5rwZ1RPnoI21+OVnZJnSZBtMajEDGj5ua/tWCbL1bHUW2rEcfjuknShLD7UlC0QYxHcmMBiEO7ItaT+LPL5vp7q+vLgT+13fwgXp0c/QcuAIS83fHa9aQxXP/Eoq6Kr15hWnbZA9Rn/4y+pvCxtIwxJf+lvKDSjkjmfOgZq2+VhuA5TVxK/lYQ== 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=l1cgX3tn0LSWQUkW5p9hTvJvJqB/B500bMgfnKZHgmb8+GdSkiF5KMKzC6auugnZIYYN9lnWXbjw7q5A/nNvaHdjbreU8V5uzi/kg6A1AoVJq6jp2UnTfuVuBUaemV5Hmj9ZlekjGxZ47wANOJUSNK1e2kRTINvYH1xQYDW8wmUArUpmQz2z7TA0v+LDMyIMBz/PXBqQL/9eovggtEa5lJPlhy81PnNDbeuQhViUNRfJ2hE9SFsbG5Z/imq4YUfxR0xIBzJh+E15hdAekJrUzYx/80ro/I6+VOTXZ6XW8rOd0jILIa8TJXnJidba7J1pEftxTYDsOSY9rJ0hKc6wxQ== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0381.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Sun, 5 Dec 2021 19:41:23 +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 19:41:23 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v21 01/20] avcodec,avutil: Move enum AVSubtitleType to avutil, add new and deprecate old values Thread-Index: AQHX6hAVcn6WcwvlBU6sjWZ8HXZfVA== Date: Sun, 5 Dec 2021 19:41:23 +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: [PPz0eu2F47gotg2zLhRY7nY3j1DKVu8jvh5qTANgYAF5cSNKma/hwIkSrJmmvG7K] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: afccbe00-cfdd-4e2d-f456-08d9b827380a x-ms-traffictypediagnostic: DM8P223MB0381: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 7Ak7wsRzMXMND6yVOFQLb+knm1HRp8pihQPnOBbLoz/lpKQIFgRGxNttvfvYa9sxD5zqHfsOn2lYWNC3hR9RS3pu0ffImTeVtArGr3oRLTp8tYcvdVLTF8HysArEpkMOkYaFnOnnqkkIElD3GdYnceJLPuSPFZgLCB7JdBXD4Kvuj9BgK2M5UhbwFA/KSGRdubqYqtjPQOJJ5wIk5j4GfMDtLOJ8MNTop1UVrXhBSH9j/icfCm5mWZlfH43ZMB9jlG0fB52TQnNGvrOQAfNgjjpUrnqDvCZW9l5yLo+Dm4tHNR8DYPPZaR1GmnlvVlCirrgvNFjbJlfyGpvpin0thSHf0F6UulXyHHXcGOvwNLKOt6/LnTvMTzHGDTrRFVDIAv5GQPNOucBTLrMZrOe82UhRYToDKypCwXRO5KidSgNITEi5bHZTyPXjdIfD/i3lHNvFdqQHppzZdipMW1iMvumqFnHN2OksQaji8f0W6KZs0OaDAkfG4eEyoC6hkj6SRU/hw6PyTw7CkBvzMrJmm9Bhd62fSMY64uoMNnIhYZZuNvi5GMGJmXn6orIuJqM9260r6pXZ2Oes0yyarAt9/w== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?kZoZ96tFUrpODcncSoeirdMbbC/w?= =?utf-8?q?wpVIZmE9qqsPUzjZV32FLB0xHzxHHvDO0WOBpfB+Xa+lY8scY9PjZiEEh01lw6lVo?= =?utf-8?q?LQK9jricksTwTaRnm/SRLOefb/BFshUukfVwc93ndLnAK95ncJhCoqlJn75rf+sYt?= =?utf-8?q?USxAq8MA824O/zhtlKkiMHO6IbxwRb2bhVEZOMz3QdJ77wVU8d4+5BygE9s94l3nq?= =?utf-8?q?u4Ar6NObOOAjVWNUWbP+8Th0+Up+8N9rxLxXnIdc+avvILbd09JfIU7j0/fibh4Pu?= =?utf-8?q?IUD+vS27Jc7vAK2/5qFbReRPpzBnjXPHJfME8c4b/IMti5jrOk5PNg978ydTiTC2o?= =?utf-8?q?m/rWvqQgLCubwvDChH4jRGyDT+Z6eJTLTeAZ7eAQ+e5ifpgFbSxqF1FVeAT+z+NJx?= =?utf-8?q?YcBld6CJ/SNXZU8rXARJfBrrbINLGZ378WvSf+umhbuNjlh3cgkWmKi5kkQBwLiN4?= =?utf-8?q?pLhIwejUVgx6JT4+nZlppZitiNzw+t9LklCg9C6v7XRshrSnNHLngVKzt6T+MqXmy?= =?utf-8?q?aJ2oIix6TwgMB328my+38OlVXQR6aoEj4TWao2WC5yMNDVJTGBlrEKuimzkOhdYQ/?= =?utf-8?q?4Mn3RjqIXVP78F6YNUubFJk8XAJoayGsyKylCzNj4AOwU6AtrTHNxDcxt5+s5ILkX?= =?utf-8?q?80PBvMu/iUxNBjQB1siirXupnzcWXriiAhoJcZWpZ9g0sBQqvwc0XGUZCAy+kZViE?= =?utf-8?q?wUzgFAd1LTHaOKbTR3iPPtVoNTR8bmUIPD2b4M5MWqO8mNfBu6/eGqbFGaVAW+CT6?= =?utf-8?q?Wad1ueU2Dl7yzOsRX4oG14NlKkyWCMT6+PxhUGHAK3EvwXZO+Sh5qlQF4ovawJsMs?= =?utf-8?q?iJ5j7AZbK0nnXHu78g4DiP+Oz47Leb0UoacGvec27QUbFC1h5mryu/W6Rd7BQBkmt?= =?utf-8?q?f4fEEI/DVDgM3esH45tudaNSKxM2zk7dQfLMZZuJLlKmNJxMKmK1A5OI1U34ibZAO?= =?utf-8?q?0445P8WK/jv65daUDjceHK8Ao6ahRAsTysbT4xb/Bdg=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: afccbe00-cfdd-4e2d-f456-08d9b827380a X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2021 19:41:23.2744 (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: DM8P223MB0381 Subject: [FFmpeg-devel] [PATCH v21 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: I/yUuSh2RL8/ 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) /** * @}