From patchwork Thu Dec 9 12:12:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32239 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp276297iog; Thu, 9 Dec 2021 04:14:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvQfVJCB7eVPUjVkAVHpv9EvEqR1DE3jlzNs7immqnLvQHei24fPrePhRl1kAOc+08gz2w X-Received: by 2002:a17:907:7b9b:: with SMTP id ne27mr14924340ejc.79.1639052087512; Thu, 09 Dec 2021 04:14:47 -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 i13si11926726edc.496.2021.12.09.04.14.47; Thu, 09 Dec 2021 04:14:47 -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=WttZHo7g; 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 89A4E68AF75; Thu, 9 Dec 2021 14:12:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10olkn2096.outbound.protection.outlook.com [40.92.40.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 919F668AF21 for ; Thu, 9 Dec 2021 14:12:48 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ToUyPHLSKfd3O9+3AMpNh7wyRz2DC/ATXHk8OqF9GOH5L7v7jFn3ceIi+nl9JwLsWXyQiRf99Vn/NR8qz4Umnzdluv3TANTQCRnX/lfmOk+mgpgfnsyezqVCBbPKT96gtg6y/i5Tj+pm+n5/TuKV5qSQ/d+/CgM4g5oHapCgmllBSWnr8qFhOvlQt6QUKOeBum1w2Bs9i+1yRrejL1+M5jJdmqqoNgmQjblyJcy097kvStKE28as8r8L2Of3+70mBvtwHuM8fqaKgP/hjiPgLO6Fya0/7w6K11825LFK8PcH35aALrQ+7ViLVU5TtGlBvYQHGtxZpqeAniH7I1popQ== 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=qgJmS0GpwRFmLIz6mjkSSnEW3v7UTXOe8XP6GYa7hBQ=; b=NHDDFjLkA2HL6eA9NG3AZdFTFzifYiR309ArV7a0Bxxlu3YcbbjJmI87V53fDFRSmb+xQRFqeaAh/O+VbR5oc14hAuB1ppqay6I2REnxWxzBeYlO73egx920GTLnR+YxAtLCr4Tkd0/uqkVRQ3QQZ5dSqU8LgWaJc+wV6zhBdLGGMbjtHGGNVSD3AJsbg6DLJoheQCneK7bsssjxXVbzegNr5lqd2EaQxMXtiMPC53SIqafZScHWZnHds9fqythYu3FlpOr9E02ar3+Ej5qOaU7a7xX8klnLJ8HLClFtKQB6kA96veYhD9HjMtdxNLNE+0S7U0bniV1KdOUBouwQtg== 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=qgJmS0GpwRFmLIz6mjkSSnEW3v7UTXOe8XP6GYa7hBQ=; b=WttZHo7g2pWSixtsCBNDcFpa1ypO74nw7OltIp7vCp+yXQUzOro0m+WkarGw04mpQ9hwPJx4HWbe1F4Asu4ZhrY5WBeyDoTNZUbup3NMZyips4uvByOc9iQyP/Z6tfPttKCbkC4cgYh8Lcf906dbWGDYZnDBEc8PflFpR2NSlmmNBWh/WhQ/dikBtJs5JMTOUTYxGH2uZns2eq7bVXc75qMDQ83YE0mwrDaC5yS/3Fgsn7mj3iOrdjtOOV3dvcDPLJN7oz+vfflLv9/jIHQvsBOuPbZeJ4uoYzJZOqZVMnCmTiddT2uD9gw1NlZHm+KTsS+E48MUQOe0U/+uuRKeGw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0399.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Thu, 9 Dec 2021 12:12:45 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%8]) with mapi id 15.20.4755.025; Thu, 9 Dec 2021 12:12:45 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v22 10/23] avfilter/avfilter: Handle subtitle frames Thread-Index: AQHX7PYTlg7T87ooxUmVpfXCcRIf4g== Date: Thu, 9 Dec 2021 12:12:45 +0000 Message-ID: References: <05fff8a8e41014ff699b57bd805f0411865328af.1639051681.git.softworkz@hotmail.com> <18ca2f636f4ef69cbd1b146fe2b3384e242bc377.1639051681.git.softworkz@hotmail.com> <3f3d922baa2061dc8a4e4243c2fcd9813e59ebc3.1639051681.git.softworkz@hotmail.com> <36b0675ac77e7856359413d13b3c655cd3f32abc.1639051681.git.softworkz@hotmail.com> <3549fd8493f7ddba0a9c8facc7be023f6d8c3d01.1639051681.git.softworkz@hotmail.com> 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: [1dksST+4lhSjFKvYSnmu/NlzIAB+4dbt] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f2f78f55-6d38-43ca-10c8-08d9bb0d3595 x-ms-traffictypediagnostic: DM8P223MB0399:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: vusF/4lDwUuAHIYNo14nRwyWFrwWvS6Hu3VuaXnptuGiYk+KOW3jAsJXS6Sjfohliw4hco9S/d5yb7i5Jf9IHeX0loBK/AVDm6NG6hQLegvc8PIZY4CTZEfkyP0k0ctCO5eBUdRo+2ECbVeXDnpvqX6/4ayu3bImYmDyVbV8KneYYfhqM0zXPvRPqlcrf5fk1CbJp5rwEb1KcucIMP9lnvX5tqDdygy2KJ1Fc2AusvU6bMcQuDvqXvaHpXUBUI77METJoA2zAI8sIoqNpPvOhS3kaKTWOyfLuP2ZK3h1AtW8CzWusK8tLgI5gl9MWnAFuWkK+BRwTmYw7Y5gGHnE0G2TuKpcqwA04WBIEQmlrqCHbQSjSLVfEYeQHuLbHInjUTcY/WeGMXjsMGH2XrsRS8tY9EVoU6TIWhWZ6CdrNg4Z3s6xsXQk1ixLUWth1aidKqxe/Q6BYCXMhMulJ1jvP36tVQSzJwpw45tK4Elvf5a/rOao5F7JL1aqxSIflJnSiAt9xnfxMTGB8Op/YaUSbZkJt6K2qzJ/NTO1fMIhRs/pXm8xney7SP+fXlIT8pwf6YLHNwvtsIS2mSrEeo9ilA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?AV3bULpN2F7aODofz0tmAAikReiE?= =?utf-8?q?swDZJTSe/d6xYx+vJlrOc8sAllWwkvLUQxIRrwcCrhL2htbHbpazYEyy86NiKzw/h?= =?utf-8?q?Ey1c9AB6yG/yQ5cDLkvQBSto89d06nbOdDgWxgoMreRTwalp/eZVkQe6yOg7wKYW9?= =?utf-8?q?/Nsn2VAWdOJmIIBNu36M5FZg/Z863FADb9M7lLVSP+GmfzIrS6PvJmwVEPyUb6XcB?= =?utf-8?q?sitFBK3aAsSJhGx/TXlLx5xAf8k5eT3lF2AsMFiLLWU9n8/wo3HeafcT6/xt5B9xj?= =?utf-8?q?CLSeBuW34VV1Pzj6+u/VzC49XcvPMPQgPuNq/9Pl3WGRckbR7P0xQjLWNsM2xfbTH?= =?utf-8?q?4B2c6RPyv6Hcsm4nT7MDv4eqVdTA/s50Tv+jMjI9Rn+x6AgCVhDJ+C2q74dwPBmGG?= =?utf-8?q?smHMYGaUTDDUuhToDmcejs6ijXzm9595vImYmTpEcpWSXvmba02nEDVTcp0x/nSg0?= =?utf-8?q?mzHse0781rvU6KOa8V3BdZ1pjpDVJYYyQSngpZXOW06VwWhRCLmISXg+jAaLBII9X?= =?utf-8?q?QFg/IAjpCopp5LEX4cvRkOeXhEphj8Pye+nX5P2xMAuutWmcOJUN9rTVdjcZIUVM8?= =?utf-8?q?euVGeAh14oVHbHb47kaS9N1oQXbguqNUYEhMLKye2ct8kwyy52qVgs0gTPmEEnKlV?= =?utf-8?q?gUfz+dVhPro6Sol7CJp85Nkr0SkQ72SRhdiJ4TmG2HITC7RBBeRbRHH/ge8B13M8p?= =?utf-8?q?/05leP4AAa108KXxi+gfh/5NAG3KI/tlTtE4qCRVIsDNS+9iUFtqhy0VFJ6oDxcHs?= =?utf-8?q?5IEQn2KLLmBNdYXdLBn/c6C5ZTteMgfdw7e4zXNsLlLA+bK8MV02QOFTUQGbRwFW6?= =?utf-8?q?NynXio8C5DMNq4nE5CmADBVrSX/0qs+QmKUdGZUtwWcqcnE/AQ6iM2Lk5b1go19Q7?= =?utf-8?q?VRmYkmnGPtbi/DMKajUf7YozIXEDIW59o5pHQGAbNwTQ=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.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: f2f78f55-6d38-43ca-10c8-08d9bb0d3595 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Dec 2021 12:12:45.7257 (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: DM8P223MB0399 Subject: [FFmpeg-devel] [PATCH v22 10/23] 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: X2A4ULNY1Oll 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 b105dc3159..9f917deb41 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" @@ -343,6 +344,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. */ @@ -351,6 +358,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..f4987654af 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..5c972bb183 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 "libavutil/subfmt.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, \