From patchwork Thu Jan 20 03:25:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 33699 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5431754iog; Wed, 19 Jan 2022 19:25:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJwoetors7LnXVG+vMW6zrCGXf1I1WigsjQoDniNOXWUMNIOn4UPvazIQjVt17mZgLPFYs6u X-Received: by 2002:a17:907:7b99:: with SMTP id ne25mr23555537ejc.769.1642649158644; Wed, 19 Jan 2022 19:25:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642649158; cv=none; d=google.com; s=arc-20160816; b=Z+5o8I7mZnv5wvQoa4uHjoXi5TWZuc5Ao0JIyersOKPMMOgae9qmQJKkHOi4jpDvbG QFFBqfVcqV0fG2vgZNeZxoZLEgZaDkM9BWAlUvM41J1GrocQKe+7FY+5FZhW+smeCe44 98W6jpkMjjB9+NxndhUXwz/+/QIfKXF1/tWErHSD/sVNgphkcyOHnJ2KY1FOA+KqRx1L ukZNRv1I8CrqGVqZbbAzoNAsQexzJsaQ0BWCjx6qI9b0RVcuqotoYJBhXN1nfCpxPq5i blBGoOvN9oHcie1edYEu9Hhu9WzviAht4746svcehKu5yeF/i9kgre6nozIrVyehFybD IoSQ== 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:from:references :in-reply-to:message-id:dkim-signature:delivered-to; bh=TQnAen+DV7aFtFioRK0/NUkuJCcuI8VKgLfAztqjzmg=; b=mfMpGLiNJvLMXGzHFhJPqcro52t3M/ShLJU8rupvQ2ThkAv7+Uhffq2DKpG4Ldu9el OBlwlsIHbh637kIvWGAO1sZCz4u+4bPsZf450yxnPlRONqYuEhEdPtzYUddMEITcoBRI cYrRMXiEV49utTFSXpx5A44kCH86jl3L+uWrsYNNfEG9OCGUaG74MEZneVqrEJ4CtloN XyRco90cuMVGMgy1Rbrip61nP2b/eR7X5ZK6CGNwYA561F5iMR4Z3gXqwGYBqaWYYH+O LXb61OSAEa6oVxfz3KRSTOdX4w8ka23kjq01PjiEMtLs/6y0tlcRp77rIpVu2fQzb5Bc mjfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TN1FFTWd; 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 c12si1043479ejj.935.2022.01.19.19.25.58; Wed, 19 Jan 2022 19:25:58 -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=@gmail.com header.s=20210112 header.b=TN1FFTWd; 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 CDCFA68B21A; Thu, 20 Jan 2022 05:25:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A47A68B02E for ; Thu, 20 Jan 2022 05:25:38 +0200 (EET) Received: by mail-pg1-f172.google.com with SMTP id i8so4435114pgt.13 for ; Wed, 19 Jan 2022 19:25:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=TpUPukYaZVM59oxufUEiMOrqpC19LS0P3MvaA/WmbiM=; b=TN1FFTWdq2bk/MAnX8Fj275q8G1aWsdVO0aW1cQ0KE8DpYkYllOvmPOMtAOhnRmTup 8ErXUMVXjaSpgRs7jwepTSbRaA6IgYy/nxYZVx/ClvQxABXNszKOey6p9FW9L7t/k/MF BmokWDrI/Yxo5bf8E1mRpi8JBVeyT4pz8uaDQqhiJ4ZnlioNJwsI17PllpEOEl8lqVyG B+r2l78HN2icvsL9UpdwPH30HEEqaoGn5zWdMQaiYp8PqFtF2Sr/505SH6kgW0lFM3cv 4oOH0N3nCmQexQ7V8P7EzstjE/qknMKCosNCtvSdVx3O9OOTXXt3C2F/fWwEaxL9vm7+ +Uag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=TpUPukYaZVM59oxufUEiMOrqpC19LS0P3MvaA/WmbiM=; b=q+FMR9NxRWwc4GGMnXX4eOEi+cWBAMErEqkdr9tfAUz7utOwDuFP7ozr3rNLWCd5ll y30JDp6YORz3mqMTECyQa0aAoG3vGE9GLRe5USJ+/ssMAJmZBj3TGGYsD4TmRC4jphXN Uzu7hMiAF7gJ1BYbFtbLvIGxhTBMLYp6RhPDDxSbZAsJ4z2xZxvmqmGxrYR8URJay/QW oR7K/eugegYqNs5cphYuif+vk4akSZKIg/8/kE1dQyd1W81rqp9abgTzJEKadFbwiBCU zCQ8CyEa2MicTMFwlSm6XQzuMimBMZu4LACHWrHJPM+V+nUtQs9SOyg81vjsvjoCqvtb TUCw== X-Gm-Message-State: AOAM533CXEE8mILJuTlxlBMyGspYFfrTbI4BjmR2dfQc9Lg674k7+p5Z 3rCEZx/IEOJmXxsamWIn6apOfBbL9Co= X-Received: by 2002:a63:2bd5:: with SMTP id r204mr4756823pgr.232.1642649137132; Wed, 19 Jan 2022 19:25:37 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id y16sm997305pfl.128.2022.01.19.19.25.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jan 2022 19:25:36 -0800 (PST) Message-Id: <77679332356fe29a3150dd56f4ac27a09f108201.1642649134.git.ffmpegagent@gmail.com> In-Reply-To: References: From: ffmpegagent Date: Thu, 20 Jan 2022 03:25:09 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3 01/26] 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: Michael Niedermayer , softworkz , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Ndbt+v9RFzxZ From: softworkz 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 ec1a0566a4..fe5a83cf85 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 d17876df1a..ce644f4d48 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 953aac9d94..5bf48f6304 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -110,6 +110,7 @@ #define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_FIFO_PEEK2 (LIBAVUTIL_VERSION_MAJOR < 58) +#define FF_API_OLD_SUBTITLES (LIBAVUTIL_VERSION_MAJOR < 58) /** * @}