From patchwork Tue Oct 25 09:13:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 38976 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2684216pzb; Tue, 25 Oct 2022 02:14:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4UPs8vrfE+pNIWVZMn9BgegfrabqC3UGSFPCu5/Hz6PbKrr1DW02DjHVRuv5QP+nJ/YD9h X-Received: by 2002:a17:907:5c2:b0:77e:def7:65d8 with SMTP id wg2-20020a17090705c200b0077edef765d8mr31991722ejb.487.1666689250904; Tue, 25 Oct 2022 02:14:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666689250; cv=none; d=google.com; s=arc-20160816; b=Vwwd3WtCEThRFu9UVI1MkRoq1bC/Om/moNGd8/zt4Qxtda2IzKYxkTMaMoO8LRGB33 sXmqxxshoppAQnkCTVp03RqInX6WFNH+rzfpuE2pzcgliO94iAuGI93oijwPdi4iX32F JxDS4fEEG+PXDVJOUepiRQGZcS+hLfEsuD8CfdQumAWlk8/UBh12W6nrKOmNic2WSqMQ t7hOvQjLMZpBu45Y/vCJitIYlGTtM2DW1tRWHPb9/+BqpGTthjvFnPKN/R3ZoEzYFot6 HnRIhGzDUAz4Nhnzl5mxOy5HoHZUbPevkArkzoWJgPtnAEZMnu4HWFmraH2SPkw46P4Y zkWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=QnB4Bwirozpx7+R8M+YuFNtMankLBW8dyovjvvF+WDc=; b=fOcz4Fr9BQTs99qKNv7FrfyK23Qw6OyGG3Krvu4RqKOBX27JfO9XwS7Z238aDNCuw9 S0Xy5M7yUKLEzMpelEq1JOoTzp0V5Qft2/VxZKo889/xFT+AirqWsJuhhaiH0ep4iP+7 NJj7oZnWlgqYF/Yf22MY14oO14cH9ccpQOawB5TM4AN2smChFdJUzPixH45xkvmEp3TS E+e8D9lmjLmKqW+uqvOtK0E4hXjoay4Ci0m1FpxJQsdi7P65s4l2uFCIONXdOd04mlan F47blChRtGHIGX3cx66zLmtXr65nSr3GgKq4bxQcbChKBLUc8Wj/1Et+lK0IHz7kcOHr 3ivQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oBzMMZ8O; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hp16-20020a1709073e1000b007306ac0faa0si2090954ejc.615.2022.10.25.02.14.10; Tue, 25 Oct 2022 02:14:10 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=oBzMMZ8O; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A69068BB94; Tue, 25 Oct 2022 12:13:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60B5A68B9D8 for ; Tue, 25 Oct 2022 12:13:51 +0300 (EEST) Received: by mail-pg1-f176.google.com with SMTP id b5so10916207pgb.6 for ; Tue, 25 Oct 2022 02:13:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=Q5ow4anFTCYy0VRyhIFwswBnIQF4Qfk6tm2/Y8mb+xg=; b=oBzMMZ8OMk4or4i3bXvPAbezzU4COVQz2XudtuO7ECgRyt9jAvZJg0Uz2GHs91nI0M 2CWgf5FNDiwFTwVQ32oUim96NysNqWRfvbcm3iXak1N+H8SEGl7LItivwTvhU5dxRuEx 4811rz7r+rVmwGn8+Gp3a0d03GylDnmBeGu3dSOLs+6Tc2C9kda/eHJ1mxgaZERgdmIY w5Q5Df2NaGQLvD0tLPZGiuJuoc7qEVN36Bgms8Id2LMkjP/JbztzEZ0TmRGwIve9diLt M6mDkqLT+3v4TDCLJ6ymuzLZtTXcDV/6TeOH0hBjRzifgq6pt7A1Mrc0vD8CB6/TGM1K I0Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Q5ow4anFTCYy0VRyhIFwswBnIQF4Qfk6tm2/Y8mb+xg=; b=AhFIz6oGXlb2ATpMEIL8fE7amvyJwBnjV4c0zyzNlH9cbvmC6XPidnZToz0eIxCkA9 wx/O+PvTqJF8Ds7/9xblXW7VLGvOgIPh+TAbRMQ4rTZ4r6BFjpaXL8XkWia4cP1JGrKU sMnZJ61KjnezDZrm9OOJLan3/2egdLN7nWEQj6ZQB5hEnSR3kJpiCLMdh/nIjHZ6xhGr RYUvA/up/M6FFRLndvBBXXvCg8zmf3Ytc3Saz5BAMfKrjaVe9Bj35uFUgRsxSZTsdgtc 3JGFdcRLOBE+J0g8F6hv8T2BdNb2vFRwE5ABjQSNTvkzq4LymFHmg85jK9e6kW0BuhiI 5SYg== X-Gm-Message-State: ACrzQf3mgMOWMAZZprAK5yrC4GYQpLxEDHi0+A46nKwhGh7Txy6eMmS9 KjtKZcuMNDHdxlEoPkCChcabqZ6ixMQ= X-Received: by 2002:a05:6a00:134f:b0:563:7aa8:5cea with SMTP id k15-20020a056a00134f00b005637aa85ceamr37310000pfu.69.1666689229546; Tue, 25 Oct 2022 02:13:49 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id e13-20020a17090301cd00b00177c488fea5sm894823plh.12.2022.10.25.02.13.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Oct 2022 02:13:48 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Tue, 25 Oct 2022 09:13:22 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v9 01/25] 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 Cc: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: J83cN0TQL9S/ From: softworkz Signed-off-by: softworkz --- libavcodec/avcodec.h | 19 +------------ libavutil/Makefile | 1 + libavutil/subfmt.h | 68 ++++++++++++++++++++++++++++++++++++++++++++ libavutil/version.h | 5 ++-- 4 files changed, 73 insertions(+), 20 deletions(-) create mode 100644 libavutil/subfmt.h diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3edd8e2636..bf06b01e22 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" @@ -2257,24 +2258,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 3d9c07aea8..74380cf917 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -77,6 +77,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 cb0c928bd0..009c628e35 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,8 +79,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 39 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 40 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ @@ -115,6 +115,7 @@ #define FF_API_OLD_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_AV_FOPEN_UTF8 (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_PKT_DURATION (LIBAVUTIL_VERSION_MAJOR < 58) +#define FF_API_OLD_SUBTITLES (LIBAVUTIL_VERSION_MAJOR < 58) /** * @}