From patchwork Mon Nov 29 19:47:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31801 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp6641322iob; Mon, 29 Nov 2021 11:48:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJw9/nn1gT4E2JYYMBM8fZ9RzBZGg+oZ2bXNhrpgwNC003BdkJRnBOYyasjuUQFA8vSjBBQQ X-Received: by 2002:a05:6402:34c1:: with SMTP id w1mr77367217edc.179.1638215292764; Mon, 29 Nov 2021 11:48:12 -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 sd30si33079561ejc.764.2021.11.29.11.48.12; Mon, 29 Nov 2021 11:48:12 -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=iDvzhxEz; 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 EC2C26881C2; Mon, 29 Nov 2021 21:48:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam07olkn2063.outbound.protection.outlook.com [40.92.43.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 715376881C2 for ; Mon, 29 Nov 2021 21:47:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M/dEWPbMXrxZRWUOpMR7dq2ScMT1DzSNQFAMgxohMtTKeKsNesqNg/7Y6PyNRoBcN54kUMDTXC8EmVNASTesz77YTbnOn21T5et8i9gYM86twT5nX3P76otViB1kUeq/Cmjh7klQGKcjJZILphA9XyGlZkTn96aESP4bhC5F3IIZlmZ2HigjGbhTDZZyVIFUcrhoFaUy8+clStQoWFtu/U4kf9G5Qz77TLzEAH+3YBEIiDX3RRva9QrmeGRjJNBn04lbZOS9BSPgx5KQoNwzMUPHnflBithgJmJYCMgEP7yNdoxTWiE2XEkfMiVFNUCLcwkhjXdVUa7CpFskNxAXQQ== 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=BObkwOspLWz29Kt3d32962JZZOUwavaXmzWTxzfst5g=; b=LQrpHZ9oVddO0T6UYTdzT+v+1NfHednVnA7H+XwZ5+w62aijiGNcngPqQ3e8bdEj9b7Dk1G9uuk5GXc+v1+aW+arcaIoJNusG5MMwYHL3K/sVTU782p/0hBORzLk7C9vckuAT905v3dywtqQrXPr5F7roaRfEuHq0AZt3sy+xuh22ELWoVfc1mnY0sorEilzQYnPaV0drkF5nrpGsx9Sf0wDW0GgzX5FaKE2DBne44qOTUFFClZNSu5OyAvJg1p5Ox0ibGDlXeQPRZKhhlAYtXZBoT8FOrCCXfAbwIROEVZilbJ9+gT7/UhL9iY5rtCMQrEtr/7Aijwgn782/JAWmg== 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=BObkwOspLWz29Kt3d32962JZZOUwavaXmzWTxzfst5g=; b=iDvzhxEzHfwEski66mUF3peIShK9i+r9M3H8Kg1VF9/Qd/VnEMSgtPlU/f94ZZ19ScE3sWx8clvWwkNogSZdZ/XQIpCsBuDHNn4uu7XkqntZQetkJYcQoRBUFWplec0J6hmDMVypcxzKjf7bmvhEQAW/5BNXYuFACOvLcFd/DgVnMqxAuuRypWySn26whV4UcppW0WUmzQrChDoqcbzE4h4ykRHRiuIgetO4OhQoWs0HphfvNXEbHtiiLRgJ3rvQvci8P7W+r1yEuJJNQ+9qVTpLJ33qLz4vEf5Mu1gWxxyluj42Jwi924qnSdoi3rSn76WoMrRfBCVR8JqlVLuZGQ== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0336.NAMP223.PROD.OUTLOOK.COM (2603:10b6:5:316::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Mon, 29 Nov 2021 19:47:52 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%5]) with mapi id 15.20.4734.024; Mon, 29 Nov 2021 19:47:52 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v18 01/19] avcodec,avutil: Move enum AVSubtitleType Thread-Index: AQHX5Vn+AlLeSSvjwU6ZFYPYoDU0fA== Date: Mon, 29 Nov 2021 19:47:52 +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: [8poycS53p+biArAUZHfqNgPIyNXGFWAp] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ffcb3c88-ad42-4b64-2583-08d9b371217d x-ms-traffictypediagnostic: DM8P223MB0336: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Ih4XaTg7vpKeyjpvkgLks/DOZ01ez1veEhvRZwO4Czb4sIJ1X3pEBMf8JtOn9UsUePYNQWXCD9ewQ0yFY8jiIh4ylsdMImC8EQWW7b4HlP9ulzSZWLfBCVRFdJjM0z5IEWM0SrVx4aaDImpj6pT32s/AKGMNMNQkNV1mJbYhc7NxqENqZeFXtXR0WTdx6G9U4TCWW775oCB9y33EwfB5K5/ckGs1rNAWMF9e/mlD8bag6YUwIall7FoMsYgvKb7t3T2YE8LsYCXSsjzRELlAqJy1AvVAIfE1SNYz+BVzOPY7FZTH8ycVql88dUj3bLkIbplNfj2OL5+xg038FGGwhbJa2/avJyb7B3Xi8U6/KIkBrPU+IOxZZqZ8cu0fKI4AARg5cf2y5jnWIgJRwSRLBD8auaGYhuko9XkjUn+C8DkNeq5/mNs8O4QOPpVV73CtIQRBFK9I/ynZ5Go2BLvRbmNVGHjGXCkaAFUI/jlNunLW4HQoVjv0W5Ga8tui6LjlGJzY7qzEEYP4ZZ37ExbrVLwLSKpdevjR+WJT+KFlfj51Z2gSxVoc9cHh+M1MU2vU8mzfXqD0NHKiu6QHtFBbUA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: biKU+D8f65BkvSzXyRfuTsNfj0QfaUBs5dp6UHqmRKxS7LWNeZwVOiDVlqM+ld/a59ndKn7nupro2v0+DCedRIA09WFv+5LpJ8BHp1MC+S8SC2K8PYJnlZS1dQNyhHjbtAY3FDLFY7cCI0cI209sKdlGYFW4jbF+u8261rbSF38ar2IJ1m9/xnmJeG7dn2Sq2OIzP+29IH2e004ydF6F6CuibaoEdg/afj3gFncgk/pV5qYCbv8BUqhllafcpSIjITPa0pbelhVVpZY6t7C9F/lIw8PSJhduSERO8X8U4MJe6+VGA8B6bGUswo5YzzIu/p3+KwtJtgmpeddJQXYWZBeVV8VkUOF44RiZSuNexVcJZ0xG7yoYVLWR5/bogZNLprYJdHQvvSKal+kIZazsZG85kp8Tg9GoGt3tfI73T3oRpu1pVNcvhCQHLJ/MDZJfZuX8EOuIzwAks5S7GCZ6ukpCbWUR6UaJiT2+Ywy/IP0+x9stEdQ9yooqKuY0jxEKF32cejlsPo5oM7xC6H8+HOLSYtVtvQxIwU93i6oxKyYm8IE/dRbVsaO+gCSJPzx0SWUG18vh6CdTLJ6WyCYX1tjirf1/odawFK8jafPzyvq0npagO93DAzty5midB3X1DyHqC2vqgSgSbjvPCE2VtHc5+T29n+drpBoXlWZt1xiN98effogVjcZTkEUKfEhyYR274kqABZwpCgYZWCo52w== MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3912-16-msonline-outlook-1fc6d.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: ffcb3c88-ad42-4b64-2583-08d9b371217d X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2021 19:47:52.3285 (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: DM8P223MB0336 Subject: [FFmpeg-devel] [PATCH v18 01/19] avcodec, avutil: Move enum AVSubtitleType 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: 6rsy+FMNl1G0 Signed-off-by: softworkz --- libavcodec/avcodec.h | 19 +-------------- libavutil/subfmt.h | 58 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 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/subfmt.h b/libavutil/subfmt.h new file mode 100644 index 0000000000..5fc41d0ef2 --- /dev/null +++ b/libavutil/subfmt.h @@ -0,0 +1,58 @@ +/* + * 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, + SUBTITLE_NONE = 0, ///< Deprecated, use AV_SUBTITLE_FMT_NONE instead. + + /** + * Bitmap area in AVSubtitleRect.data, pixfmt AV_PIX_FMT_PAL8. + */ + AV_SUBTITLE_FMT_BITMAP = 1, + SUBTITLE_BITMAP = 1, ///< Deprecated, use AV_SUBTITLE_FMT_BITMAP instead. + + /** + * Plain text in AVSubtitleRect.text. + */ + AV_SUBTITLE_FMT_TEXT = 2, + SUBTITLE_TEXT = 2, ///< Deprecated, use AV_SUBTITLE_FMT_TEXT instead. + + /** + * Text Formatted as per ASS specification, contained AVSubtitleRect.ass. + */ + AV_SUBTITLE_FMT_ASS = 3, + SUBTITLE_ASS = 3, ///< Deprecated, use AV_SUBTITLE_FMT_ASS instead. + + AV_SUBTITLE_FMT_NB, +}; + +#endif /* AVUTIL_SUBFMT_H */