From patchwork Thu Jan 20 02:48:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 33672 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5408289iog; Wed, 19 Jan 2022 18:49:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJyL64cCk7GcCLH5kckF+hkaN7lchPJQyPlSffhyakwOsgTsyOLZGyqy7ixfyp5xRGz8skwY X-Received: by 2002:a50:ce4a:: with SMTP id k10mr34118583edj.31.1642646945597; Wed, 19 Jan 2022 18:49:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642646945; cv=none; d=google.com; s=arc-20160816; b=lTcS99OsjcUcuSXSyXtSJG4waKmqmdZnf0W3WfIZJ/JaRo4VntVoPWEIJJJhxpFTtd 6bqOY29peeNEexP657WhHM1GdtkGzhmDMe1QgVapBct9WNEQ5YopR8toyDCUkgpPqR2P 5QkzncnoBJNXEuLbPMumhlvqdyUkIT/KATa97rXbNaVriX48o2KhDv22T4JBxdOv6v8I WIBOST5pKrMltFdxVhNRK/sQzT0mB1f9+WRdy3MM33OHcEiQmleri8PhoiZDb9udVbXT GrVGaStjmWb5cF0mKhQkawguwcTvJOzzjfaFxMz8+9oeLdcFq7nwM+xBvphNqb0lXTDz V+yg== 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=dnXKS0tVKliaGqQEqlVN5zbKw/FWpsM7atAIkWO01LozNrLw3aALupGJhr0lBw5R9h 6Bn/ElstfNPr5cOQtakJRaEbiihstr+dAxBBq8aQ6YR96c+oDV9yafSTXxd+CStSXCaV GpY78lKtKqLu/MmZCThxjUgq1h0JP9li8H8DU0rlCCxFa9t49mZkHR3n2KFPIkjoyLnU KPHrwbKnke17FCfWVg3C1MCSYLVVOCeK9llUgxdklrTGreELTIbxnvjdqnV7d/qrbFVX 3OUo43bAeZ5aV+06NhKyx6Wb+0GZd9/UkunYPtljZZU5Y2MzhLkhKbrXvvm+ZZPXyvIH DHKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Qn8mjclE; 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 q17si1247201edd.193.2022.01.19.18.49.05; Wed, 19 Jan 2022 18:49:05 -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=Qn8mjclE; 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 314A868B18D; Thu, 20 Jan 2022 04:48:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3D1B68B18D for ; Thu, 20 Jan 2022 04:48:41 +0200 (EET) Received: by mail-pg1-f177.google.com with SMTP id i8so4366771pgt.13 for ; Wed, 19 Jan 2022 18:48:41 -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=Qn8mjclEEjCopoB2Fbukf2KivDF0tccABWxbnNw2ZbFQsA2TIbUufmsXMvf+JA1suK gpKw3lugNrtRJWmkdVkVRVijaw3ZLJ0/DOa1erPqGkvYgo1GhO8+B8pPPzmlK+hA9NOO G1X3eTbHkd20UyKjsCP7zRMa1VglLKtS2yzSPGp5GavpsusyvQtke/swBKe/Z+F4rBVw RVZ3NFng7qpr65cUXrXpGs6ZIKcDp+9s+MWG8B/qldK4ZDcbbHdepuQFcTy8QBOiLr5b JmMJRNR9tHFue0YJ+3Ecq9k5RtzZzsStWQb6hm4fsAsyDq8Ym1gK4jCNmls0Kk2XVKc8 muHA== 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=XElcF5MngHpyrg4s1sVQTP/d4zE+DNFKEja6y84j7AO4nKGaBQEHN42X2HxjlPx6cE 9tNmNvHyIKrB10UmcA4Cx2vk2vrXxxD+DWpNl/UjSSorZ4R0cd5Pzw+rXfTIvKUJRalD 7dF6sIVpBjPCgCfmAFZZjRb5fOrqPk2otRyo4BOkYErd5lK7Df4L6n9fCYwcawczWbwT 2pJKq5wKvZv57MMPSa8I4iBVoqp4HeJTkCNvJicX2d//nOqcZqSoQj/0a4s+xqJ2R60T FEoayt74vNOV8cOAKW2NmBKxuhVUNPRA5CdwK+tg5yC9l8QgIWp1UJ+Ne8UthsOnSrQp CKrw== X-Gm-Message-State: AOAM531WTEjwd8d1w8iLbQA2S0Ey9cXOmnCGAMl/S3ANiJiYvmS2bTCW wAI0sxZTVqhqcUnXTJMCU8FsRwlYRPc= X-Received: by 2002:a63:d417:: with SMTP id a23mr14048678pgh.297.1642646919787; Wed, 19 Jan 2022 18:48:39 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id q25sm878178pfh.167.2022.01.19.18.48.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jan 2022 18:48:39 -0800 (PST) Message-Id: <13b9a26b25af71def101a29c2c079fb5bd37dbff.1642646916.git.ffmpegagent@gmail.com> In-Reply-To: References: From: ffmpegagent Date: Thu, 20 Jan 2022 02:48:11 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 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: nMIIqWI1fZUs 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) /** * @}