From patchwork Sat Nov 27 19:37:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31779 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp4019515iob; Sat, 27 Nov 2021 11:39:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJwhQQpgUBf9UVR4DW5bHlPbiV1HTYaydSx7V4pCDb0/0iisHgchN/iQWJevRHGjwOengg2J X-Received: by 2002:a05:6402:170a:: with SMTP id y10mr59166487edu.324.1638041973160; Sat, 27 Nov 2021 11:39:33 -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 m2si20633859edc.497.2021.11.27.11.39.32; Sat, 27 Nov 2021 11:39:33 -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=WcSY58SB; 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 C134668AE42; Sat, 27 Nov 2021 21:38:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11olkn2050.outbound.protection.outlook.com [40.92.20.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 952DB68AC9C for ; Sat, 27 Nov 2021 21:38:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=COa6d+M3ksyQC+8Hl7TmmXqx6DB1+QtlzH/fOPHtn/PgAh2h0Nh/tQM+3EbjCaAteSR97Ouw8yfZucMkIK3mAUlfaTRff8BHcaxRtfbLER3zN92w4mTGzvEFdMNz69dseQYPSAwXvmT5CYsb+cLM+TREKXyMl6aIE5vNiwHDfep/a2O4qd+SzrqyivqdoWuVZxFwfFVVVLaLl8pULbXhViSHUoG46PKcP6V7/rg7jiC6zWloFAlzILWtPmpQ7sX13eZn4nTqygtHedILxODw28V1j+g/kqdzBENaSLRHir4wJ3ZjpWNYP1dhBP8YNwoyUG5+rtSaf5JYshz/uu/JvA== 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=cEvzlXNW6hTLgF9LJJcRpnGoBBdEw8fYjVABkUzWUUaugJnlZX0mcRXjRgWweAOFflGOC1gHsOGArUtkZvmLEOMu2EAjiyZG482kIA6DVRj7PeZQ04QuYml73uwX5kZrSZEv4cHQVbz2Oc/qxMXfM3PaJqQiQsbtmIaqhw3qkDIr9rEQdW6e6NQPIN0zJF23tmLKkOfeu7rjr26MtN3fgHkpvzHnTv4fVA1uugN1DZJ2i4VYrtCGjz/L0/aKkMtTRB2WQ7Y+nEzaPM4xJFy2NG/7rndjwkLs6jMhlo0vQz/tH7kq7teOR/MMqMWeGNB+AmebzAEl2sdBr+QrPuUIfw== 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=WcSY58SBuuMPoPrc6eEYErUXck5ieMrBz+yo0NHAnuQdlTfoyCO8Oz5UOSAANO1LgWFvh6Y+58/YtRXA6UFsALzw4J8Tgiqf/JVB111WFB4+o1r5ezmcIGIEGo+Yg9VIepCUGA8PQYmU7RmJZ/+8690Z1LNRYuuMX5dupsfUUpP+ZS3OkeiM3Kl5T3PUdn5OjMWhEhWK5QMTX8LeQWQw2uw/tAeNDaVMin9SoUPbdTO7I3+cMVk+O12EWg4rswMp20b9x8wM/GjOvMmLeVXn2GjuaEUAvgLgbG4UEvM0KG/XgyQXEpxaptWOahjOOhfHNxI1POWk2FZk43ummmCu+g== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0398.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:5::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Sat, 27 Nov 2021 19:37:56 +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; Sat, 27 Nov 2021 19:37:56 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v17 09/19] avfilter/avfilter: Handle subtitle frames Thread-Index: AQHX48ZGtoCBMDxA1UOQRfikJb3H4A== Date: Sat, 27 Nov 2021 19:37:55 +0000 Message-ID: References: <7463f4e16ad074b56143d86846344e23a3594ef3.1638041335.git.softworkz@hotmail.com> <2931036119e295dd393764444287c4dd80d423f8.1638041335.git.softworkz@hotmail.com> <8aacfe4a7c5e4726ed39d46acaaef90bf5814218.1638041335.git.softworkz@hotmail.com> <8d80df6d4b54df71b170bbe8c354affd37137f8a.1638041335.git.softworkz@hotmail.com> <5e1287cba1f2ec854a8f50e46e4a8f59946d5371.1638041335.git.softworkz@hotmail.com> In-Reply-To: <5e1287cba1f2ec854a8f50e46e4a8f59946d5371.1638041335.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: [QKcc4zX8kEMTbm7j951umvXJqE83jmRy] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: abbf65f0-faae-41fe-f49a-08d9b1dd6938 x-ms-traffictypediagnostic: DM8P223MB0398: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: YttlpERO0CQ0arDkav8xAeiIAIJxmwx63mGjA8x2CC22aLOIYljkH4l4gUNf3MhkdW9pFYnAJfocJi0fXHoZXpUB60+jEEbSoi7d0s9k3U8INXhpesGgPUnUycve9pZiOyVyVLZz/CHc+xaevuhAw+j1BI/OVZQ2sQQohwBYN3ysxVW2joBwPcreYJRqu8T9cNGhLIOpzPkCBxhv5Z+t0vLDosiprDbGNN2sZscQlmD0e+RzxVWK6hwYFnbJzlf2JgsXPZQADTUsS8q0yoaFijpsEKEkYdR4attRZTfgaMzp4/IKPgpGjPoloCg/b711IgRQY8PJ/MPHEfKGNM1YiCf+/eyG8pGFs/tiqd7m6i7v8VI6qVTuJrnxFZH0+KvTh9uYEZhKbATv49puIVsqfkzX8k2kv+y5b6d99NG2NVkQsZIiJsIEFNGRRFiTiFdrz8gq88p4xF4PGOwSJ0vStNyN5uRzjka+3XcxTEXwrNB2z0hO6ryAbq9qtKkIOG3QAXSOn77F/q69Xprb/lmJ9ndnRQ5MUcfWTnBtIAlcdOgkee5/6ktsqLIFQPGd95FkEG3aaPT/jC5QPhmMeyAWWg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: xfkvwX0ScB6SRBUZLYMwHSLo61FK/Ai2SUsACl5UK2zs7AzFq2ojgiJJOqKU+vwkORovtgrwcSgCe87IPIGKeHlGjDo93jmq0yZ9vBN6eY2ELPp820DYdq+XwyAF1LcBdxyKI6Qg2ubyFXJfNP5iI7YkAUcTrto65wFNwO2x7uohr+dfUP0o8eJpGydWATfpobCvQYqhzhacku57OYZbj/1WexakuL8f3Gw98n6iW05CQwoyTDlpIaUXU/7hfK9ezQe/mZsub7YuC2gmsNNgsO0tFkc/YnmpwGHZK9AJDDxT/GYyvKRT2HPF2ZeLO0aBVlbB+hi4jIropSpdy5C6qEIRV/jA/GT0Tc3Cl3VR0o1EyUMVP8UX5mVPbApwmUmqiOVJdKZOsg/J9yXR4sjzoht90TKLae5NMbVjzcYVotfDgeZkUiMT5wp+8011YnHL05uiLTt2AlcAQniB/gd2dAAgQB7TvW4YnuwcuEwsi8TEMKvehxLUdlGNV3mEnMOy5sHwWRo+tqKV/xma7mlA8+ldDQyqeKMNu4MOy+Pm9QxAoc4ktGyCc+mOWwYbt/okS92tT8FiXQLibKkYKsIGa1w2k2fMXTLUkOG5wjMLbVh9a2OEhtDxRxNnL5jVk4pkjNU1oTj5OWqJ0nSDGoa8wq/HBGe+AkjDDLDbKP2gCll6qzkeTDimZpFgOWkSStMHc5sbPn7tt1peO7XFakwEKQ== 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: abbf65f0-faae-41fe-f49a-08d9b1dd6938 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Nov 2021 19:37:55.9640 (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: DM8P223MB0398 Subject: [FFmpeg-devel] [PATCH v17 09/19] 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: xKf8J75Y6FOk 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, \