From patchwork Thu Nov 25 17:53:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31681 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1100141iob; Thu, 25 Nov 2021 09:56:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwVq2rOPvQKSmpEzJpafuJlRtO1fVX8JKaW13rVkbGi589+tCAp1Nodc8dVHE68uQINB9Et X-Received: by 2002:a17:906:9253:: with SMTP id c19mr33113969ejx.63.1637863012732; Thu, 25 Nov 2021 09:56:52 -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 w6si10415790edc.617.2021.11.25.09.56.52; Thu, 25 Nov 2021 09:56:52 -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=aUKGezgc; 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 8DB1568AEFA; Thu, 25 Nov 2021 19:53:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12olkn2064.outbound.protection.outlook.com [40.92.23.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D871B68AB35 for ; Thu, 25 Nov 2021 19:53:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pw6So1GdRcsPJBIblIQ6KsYx2IPxK9jDUM7IVy6icA84qCC+a1PABzrnklsOpIgb1PO5pSTHSZIPfmZJPSQBED2D9gMEiD0Ea52ZDsBM5x4CeIzUGN4tvGD4LHQh7dSDy7y02BBEVO4J6Ts7vYHCzXhFKmHh6SuLS6NZkNbAy70Drrdg1iybT6keh2w9+HXjIlvJBFfAx4t2KcUKLOAIUvWZA49Vz/iH/0NCaQelqOj5Nq/o0gXzm8zFNQsTWyCfDECfbEP2Iu00zreXu8WReXr0Y7uEuYZJ1gQLAP69jpPk1CNDX8nbELoxja5wVCxtIPwYE0BIrnzdNORKDrqmUw== 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=bDL97GB4jejrgjmRzhDsP7shYz99S7YBdbklbSFNiW8=; b=GJ49FWQ6iGK06WF729iJnxsb4EikKMxUfNNHhTgN4Mjrw8YPi1guEWQ6kmc6G6Di14SEqqxVgnpX05lEIW6bGaTBELEnxz/OqiDwaD048aCoCvpQFw1BR5Q+syMOxU1fK3pY4ZO/68Q9j+HayBQ9fw1UoUmIkjXzF/Q00gSMqMChGw6NPrgpDlH6mDj2UbIeV0WEFxlRT3FpC4Glwtd5F/jIhfjyyJA6w4kOhJJPlJuOiH2L5jJrOiplzygB0mtcnzEgwpm3+fT1tEetTOI6dz0uys6gTK/TEm1OmcPnFOEV3Po5YA4cEqRa30S8I+gL3vfaE5qb8DBXPXDmNg+EVg== 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=bDL97GB4jejrgjmRzhDsP7shYz99S7YBdbklbSFNiW8=; b=aUKGezgc5AaAF2spSjKV3ISJIdp7gGalc+BaYUjvF9jNDQusDjOush+nEeZFsnFB5aZfdL6NIYA+n6apTQIAXZTbw3u2UKuA6m6BXTq9ogpnyRHGsUI16euc0Gzugj+QUXpSlwxXTIcLHTD4jhArGnBO3TesHuzKrdK2l7+3bRh0M92r0bvMWR6fO5hlGDjFxTySKep7Li2qIbKs+ZVyQyiQ3FGuHCilIt5CS1+NzFIOwvq5wg9lNG0iti0cUAPNro8q/RgmJYwNxLFiEtBsPPKGJE6/q5n600WbowzWdltbifDMqtWjYM6zZzVEoB+4lKqa7KENoWPfXX2iEolBQw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0112.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Thu, 25 Nov 2021 17:53:42 +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.022; Thu, 25 Nov 2021 17:53:42 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v16 05/16] avfilter/avfilter: Handle subtitle frames Thread-Index: AQHX4iViNNyZEFj6e0Cg0wfJFFpd4g== Date: Thu, 25 Nov 2021 17:53:41 +0000 Message-ID: References: <4b9347bd2083dd36cab996aa68083e6aed364d2e.1637862494.git.softworkz@hotmail.com> <1c7eb4cba1a1d30c8848d81bda779ac5fa1533be.1637862494.git.softworkz@hotmail.com> <699ba39485ee5f5be1db4749ffaabcb638e89215.1637862494.git.softworkz@hotmail.com> <6a6111595c87f35e641247d206fb4e7c750b50e5.1637862494.git.softworkz@hotmail.com> In-Reply-To: <6a6111595c87f35e641247d206fb4e7c750b50e5.1637862494.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [W/i+GtENFEgw+f4K5ZUupwaQOxbLGq1C] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b7c10f43-4f7d-43bd-c9a4-08d9b03c84da x-ms-traffictypediagnostic: DM8P223MB0112: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: RUA2RYBcYh+xvJz5GWlpRn3PS6n/vMQDKqXP0JQUkdbaKJEBI+k4p5qvWI0ZKM/zVbkkQiHIvfg7D6J+cx0qqBcjZVpi7b9NV+iRfUvAiZojaEvfTJBVRIpRmiozZl5eYRhDqqLsrAiGu2Pew+mB/AmJ9q7dyd0jEfFZOwHTUAA2EHMe1b0dDgMVfFaOz2Gc9jmmNH8vGS2GRkmEhU6P/gljxVGYuPFkDgjH8waabBa8itpwoZ46FUMuEdlfsp5JFAdtQo6bmTXC7smqyVJhVbmgt8w4Zr6h9GRC2cyt196pZHTOb1GsivR3n+G4JPTWO3xhyAdGcyQ9KrwLETWWueeu9dJkGMC9TIev/2zw6zoFn2QpPVO+71nHefD3F6XRKor7Jm9wC6x4p6g1ZFQhyE067YL/jhJlg4LV9qx7JL7nZru+pm0GrlWUYV3Kw4teE79/j1cyRkaZuJLAwepaa90ZqajcSw+vDVQjV6S0JQVMHstPhfQqcAzNSTsXeMrO23zDkvmQun99fmlrd6zfhtJFihRbdDWHSBkZ8bqjiSuidmWNnRrm5vhp4J9mspS62z+AZmi6EUmGE0SB+Yq6dQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: umctX1kffsXM1LCqAvl3C4x1NHQQEgZD1LirBmwSiVr79k80m/4GTh+kxCn2BK+UHNifaQZZPg/ZdRNLwYu0YJ1VFeeXzsRjOC+6zTtoN5ZCH6fTXJltVkmm3MHk4ip9WpbWnCo3kxkKeQkLKcT+5e/dfmq8bxPgIkrrbKGBO4qIfcIpMIvPPXL5zGmVAj4jhGEzqBWmaT9mMZ5KrhIoXzC5Jr+QMM+wH2AG7NejdYLSgg7gUCrScykZVcrARjdforTpBaU9caCVAfBPdL/2z4w2XB3Rd7TmEcQYu8apW5dwdaeHmeRPfc3ug7e8SE7Ut2ptgSIq229WXhio+CFPHnHlzb0mS5p1bMYvrke9OIXEbg4qSj9BnInlhANn+N2H9RyZygsBqMb//NjCxB6LhQsJDSfjPqIJPqYu62E/5OrqYuGOEPsowV5xCAZd9AuQPPsMROpqlU+iNLiPFJyXXxkOQsrbOk72B7/DT6vJNJn03lmpi8h+jsafQxYEz4Fpvds2qPo1F5Diw+31Acfq24W99GG+KgZmCASxhTPPpdfFZQWNyTrFdMQMfDkyTbdC0EDUBhP2isMZZEznmeFXoVXF+v8mKE3B7Bk/Txx79NPihIO4iX2TcBzHBTWZfw1fQ64/LJtNN3GPOW5Dwn+8s7b7rWVNjlrRCsM2MfhhGrN2ckcV2DcYEtkROeefJn5l7EzKLgQ0kO16P6N1SklQJA== 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: b7c10f43-4f7d-43bd-c9a4-08d9b03c84da X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Nov 2021 17:53:42.1918 (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: DM8P223MB0112 Subject: [FFmpeg-devel] [PATCH v16 05/16] avfilter/avfilter: Handle subtitle frames 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: DMuz9Iey/8jA Signed-off-by: softworkz --- libavfilter/avfilter.c | 8 +++++--- libavfilter/avfilter.h | 11 +++++++++++ libavfilter/avfiltergraph.c | 5 +++++ libavfilter/formats.c | 22 ++++++++++++++++++++++ libavfilter/formats.h | 3 +++ libavfilter/internal.h | 18 +++++++++++++++--- 6 files changed, 61 insertions(+), 6 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index df5b8f483c..75d5e86539 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -56,7 +56,8 @@ static void tlog_ref(void *ctx, AVFrame *ref, int end) ref->linesize[0], ref->linesize[1], ref->linesize[2], ref->linesize[3], ref->pts, ref->pkt_pos); - if (ref->width) { + switch(ref->type) { + case AVMEDIA_TYPE_VIDEO: ff_tlog(ctx, " a:%d/%d s:%dx%d i:%c iskey:%d type:%c", ref->sample_aspect_ratio.num, ref->sample_aspect_ratio.den, ref->width, ref->height, @@ -64,12 +65,13 @@ static void tlog_ref(void *ctx, AVFrame *ref, int end) ref->top_field_first ? 'T' : 'B', /* Top / Bottom */ ref->key_frame, av_get_picture_type_char(ref->pict_type)); - } - if (ref->nb_samples) { + break; + case AVMEDIA_TYPE_AUDIO: ff_tlog(ctx, " cl:%"PRId64"d n:%d r:%d", ref->channel_layout, ref->nb_samples, ref->sample_rate); + break; } ff_tlog(ctx, "]%s", end ? "\n" : ""); diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index f7208754a7..ee2f5b594d 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -45,6 +45,7 @@ #include "libavutil/log.h" #include "libavutil/samplefmt.h" #include "libavutil/pixfmt.h" +#include "libavutil/subfmt.h" #include "libavutil/rational.h" #include "libavfilter/version.h" @@ -327,6 +328,12 @@ typedef struct AVFilter { * and outputs use the same sample rate and channel count/layout. */ const enum AVSampleFormat *samples_list; + /** + * Analogous to pixels, but delimited by AV_SUBTITLE_FMT_NONE + * and restricted to filters that only have AVMEDIA_TYPE_SUBTITLE + * inputs and outputs. + */ + const enum AVSubtitleType *subs_list; /** * Equivalent to { pix_fmt, AV_PIX_FMT_NONE } as pixels_list. */ @@ -335,6 +342,10 @@ typedef struct AVFilter { * Equivalent to { sample_fmt, AV_SAMPLE_FMT_NONE } as samples_list. */ enum AVSampleFormat sample_fmt; + /** + * Equivalent to { sub_fmt, AV_SUBTITLE_FMT_NONE } as subs_list. + */ + enum AVSubtitleType sub_fmt; } formats; int priv_size; ///< size of private data to allocate for the filter diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index b8b432e98b..96f35a792c 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -311,6 +311,8 @@ static int filter_link_check_formats(void *log, AVFilterLink *link, AVFilterForm return ret; break; + case AVMEDIA_TYPE_SUBTITLE: + return 0; default: av_assert0(!"reached"); } @@ -441,6 +443,9 @@ static int query_formats(AVFilterGraph *graph, void *log_ctx) if (!link) continue; + if (link->type == AVMEDIA_TYPE_SUBTITLE) + continue; + neg = ff_filter_get_negotiation(link); av_assert0(neg); for (neg_step = 1; neg_step < neg->nb_mergers; neg_step++) { diff --git a/libavfilter/formats.c b/libavfilter/formats.c index ba62f73248..46dbbd2975 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavcodec/avcodec.h" #include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" @@ -431,6 +432,12 @@ int ff_add_channel_layout(AVFilterChannelLayouts **l, uint64_t channel_layout) return 0; } +int ff_add_subtitle_type(AVFilterFormats **avff, int64_t fmt) +{ + ADD_FORMAT(avff, fmt, ff_formats_unref, int, formats, nb_formats); + return 0; +} + AVFilterFormats *ff_make_formats_list_singleton(int fmt) { int fmts[2] = { fmt, -1 }; @@ -450,6 +457,13 @@ AVFilterFormats *ff_all_formats(enum AVMediaType type) return NULL; fmt++; } + } else if (type == AVMEDIA_TYPE_SUBTITLE) { + if (ff_add_subtitle_type(&ret, AV_SUBTITLE_FMT_BITMAP) < 0) + return NULL; + if (ff_add_subtitle_type(&ret, AV_SUBTITLE_FMT_ASS) < 0) + return NULL; + if (ff_add_subtitle_type(&ret, AV_SUBTITLE_FMT_TEXT) < 0) + return NULL; } return ret; @@ -724,6 +738,10 @@ int ff_default_query_formats(AVFilterContext *ctx) type = AVMEDIA_TYPE_AUDIO; formats = ff_make_format_list(f->formats.samples_list); break; + case FF_FILTER_FORMATS_SUBFMTS_LIST: + type = AVMEDIA_TYPE_SUBTITLE; + formats = ff_make_format_list(f->formats.subs_list); + break; case FF_FILTER_FORMATS_SINGLE_PIXFMT: type = AVMEDIA_TYPE_VIDEO; formats = ff_make_formats_list_singleton(f->formats.pix_fmt); @@ -732,6 +750,10 @@ int ff_default_query_formats(AVFilterContext *ctx) type = AVMEDIA_TYPE_AUDIO; formats = ff_make_formats_list_singleton(f->formats.sample_fmt); break; + case FF_FILTER_FORMATS_SINGLE_SUBFMT: + type = AVMEDIA_TYPE_SUBTITLE; + formats = ff_make_formats_list_singleton(f->formats.sub_fmt); + break; default: av_assert2(!"Unreachable"); /* Intended fallthrough */ diff --git a/libavfilter/formats.h b/libavfilter/formats.h index a884d15213..94754ebd88 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -180,6 +180,9 @@ int ff_set_common_formats_from_list(AVFilterContext *ctx, const int *fmts); av_warn_unused_result int ff_add_channel_layout(AVFilterChannelLayouts **l, uint64_t channel_layout); +av_warn_unused_result +int ff_add_subtitle_type(AVFilterFormats **avff, int64_t fmt); + /** * Add *ref as a new reference to f. */ diff --git a/libavfilter/internal.h b/libavfilter/internal.h index fc09ef574c..192b0ae196 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -149,9 +149,11 @@ static av_always_inline int ff_filter_execute(AVFilterContext *ctx, avfilter_act enum FilterFormatsState { /** - * The default value meaning that this filter supports all formats - * and (for audio) sample rates and channel layouts/counts as long - * as these properties agree for all inputs and outputs. + * The default value meaning that this filter supports + * - For video: all formats + * - For audio: all sample rates and channel layouts/counts + * - For subtitles: all subtitle formats + * as long as these properties agree for all inputs and outputs. * This state is only allowed in case all inputs and outputs actually * have the same type. * The union is unused in this state. @@ -162,8 +164,10 @@ enum FilterFormatsState { FF_FILTER_FORMATS_QUERY_FUNC, ///< formats.query active. FF_FILTER_FORMATS_PIXFMT_LIST, ///< formats.pixels_list active. FF_FILTER_FORMATS_SAMPLEFMTS_LIST, ///< formats.samples_list active. + FF_FILTER_FORMATS_SUBFMTS_LIST, ///< formats.subs_list active. FF_FILTER_FORMATS_SINGLE_PIXFMT, ///< formats.pix_fmt active FF_FILTER_FORMATS_SINGLE_SAMPLEFMT, ///< formats.sample_fmt active. + FF_FILTER_FORMATS_SINGLE_SUBFMT, ///< formats.sub_fmt active. }; #define FILTER_QUERY_FUNC(func) \ @@ -175,16 +179,24 @@ enum FilterFormatsState { #define FILTER_SAMPLEFMTS_ARRAY(array) \ .formats.samples_list = array, \ .formats_state = FF_FILTER_FORMATS_SAMPLEFMTS_LIST +#define FILTER_SUBFMTS_ARRAY(array) \ + .formats.subs_list = array, \ + .formats_state = FF_FILTER_FORMATS_SUBFMTS_LIST #define FILTER_PIXFMTS(...) \ FILTER_PIXFMTS_ARRAY(((const enum AVPixelFormat []) { __VA_ARGS__, AV_PIX_FMT_NONE })) #define FILTER_SAMPLEFMTS(...) \ FILTER_SAMPLEFMTS_ARRAY(((const enum AVSampleFormat[]) { __VA_ARGS__, AV_SAMPLE_FMT_NONE })) +#define FILTER_SUBFMTS(...) \ + FILTER_SUBFMTS_ARRAY(((const enum AVSubtitleType[]) { __VA_ARGS__, AV_SUBTITLE_FMT_NONE })) #define FILTER_SINGLE_PIXFMT(pix_fmt_) \ .formats.pix_fmt = pix_fmt_, \ .formats_state = FF_FILTER_FORMATS_SINGLE_PIXFMT #define FILTER_SINGLE_SAMPLEFMT(sample_fmt_) \ .formats.sample_fmt = sample_fmt_, \ .formats_state = FF_FILTER_FORMATS_SINGLE_SAMPLEFMT +#define FILTER_SINGLE_SUBFMT(sub_fmt_) \ + .formats.sub_fmt = sub_fmt_, \ + .formats_state = FF_FILTER_FORMATS_SINGLE_SUBFMT #define FILTER_INOUTPADS(inout, array) \ .inout = array, \