From patchwork Sat Sep 11 08:26:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30138 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2241832iov; Sat, 11 Sep 2021 01:26:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIGzOxWJ/qq/iEty+HfhcQnwtHVBdP6BAZmCQIg2bXmBjxCI24wzo/UhhgiLI+sQAQzQOP X-Received: by 2002:a17:907:9602:: with SMTP id gb2mr1732898ejc.354.1631348812538; Sat, 11 Sep 2021 01:26:52 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h19si1221355edb.5.2021.09.11.01.26.51; Sat, 11 Sep 2021 01:26:52 -0700 (PDT) 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=PHZjcpwk; 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 2E0E768A774; Sat, 11 Sep 2021 11:26:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10olkn2092.outbound.protection.outlook.com [40.92.40.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6AFF68A0BF for ; Sat, 11 Sep 2021 11:26:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qw0G5i0VCbk5xu64poWcWi2Y4+T2Mdusrl+opC3hUWAFP0+MCdmpq+Irux0EdJoOpHqj6/vnawWdN/Kor7wmsPvZWKd8hJSYPfLGv//bZRrG5bCbu+vTMqBTKamnS4DmAuSXUt7HnYpRVPhpN0UjC+9TJ/mza0GFUtu54JYZncDpcQLbT76Nf8ZGg/ay1AYXQd7RJ5TFp4/1ia8GQ/OO42POFDkGqgRxKP9a03dsWqI280rR3zbgzjoe/bcWol2zmp2ACJpn7qSogpp/El656WcorML8UFGmBNQ2WW4Ghjg/1QXVxdbRyahdeuPiZp/izeA7PRddqHi3nt8BTxyK3w== 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; bh=F7KiL0JgeBQiLvU1j+IFUBxLV16yq73XsRMrhvmcWuA=; b=kUB2mhT9nHl6qDoZuJNcoklnTO0jyk9vpdCX6nQqCgkKgFbSVOZG98U2za+fHxeh/7iPcJPJB8H+jxkHYrzIwdAUTVT9oj5gqh1n/s3cZibl2Ky4fqAz3cn6WNiUQBk/jRiDhldztZ6pW6aTePbrNkAUGMJmicbtuprXWL4P/ViQewL9IehVReuhOmnqocA2nZnhKoeRORDm+EObs9dCZh8CzdMaUk2roB/gd79ZrstvmL5lkO0o/6F4qa/pREi/rOa7b6bWIB74JmqqFWdeeKdgjchT4eBBYdeJDVjVGoCegeSmy5R7Q9W935RQ+HzeNE4VKTQzUS3Z6daqoqGRxA== 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=F7KiL0JgeBQiLvU1j+IFUBxLV16yq73XsRMrhvmcWuA=; b=PHZjcpwk0NeZA/M/gm2W7qwtPZYALJP4fyOQCDwr2x2RTAen5PbDtfLlKeNZhHjvTYnQ0AVG5KipTFCIskk3BgQhIRLNMGu9dxIvw4YO1mUdgOG5uvwLvz1U9PZ6j1lGnM4BWZptSarSo8mqNGVBbjQLD0cGuzWOL97Xe9UctFyr6sO+GF9LcTCRuWMLGjkgjQcjoShNVD4HcZAITeWkc+o2Y66s/LexygXqrVL7CFBqt7onEbZ81frBVIETL/yrGpdR5j43jd52f0FayjPzDi07CR6Jh2WQnq+Zrc+GRPyJYloNFSZj4JghmWk6TVG77eHC47j4ZY8bt5ATM1/WtA== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5549.namprd04.prod.outlook.com (2603:10b6:208:db::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Sat, 11 Sep 2021 08:26:39 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4500.018; Sat, 11 Sep 2021 08:26:39 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v4 10/18] avfilter/avfilter: Handle subtitle frames Thread-Index: Ademwa4RENQmESvjRp+XyMA4pmFCDg== Date: Sat, 11 Sep 2021 08:26:39 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [etMh9nC52vEiPqDd89HFPnGUEWbxnRgC3g+P3Cw07kA=] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b7ac204b-32a5-4950-3102-08d974fde0c5 x-ms-traffictypediagnostic: MN2PR04MB5549: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: IcIgp3AOa36DHsF6e3emSzYjgK+CnUaXDMxCKkHTbzOaZ5AUaGH/HH+joF80Y1S3q0NrrvD3nuRrqBqAtIEKX+6555mHZxa5NdxzATlnDOIbq8h6n9gd7uhtFjTH3Xwye0mCnnBy4vRO67TruI9+TzA/beUTEHqWt3W0FdXRv4Ml9hll0899hmQU4zVNuSwplo2n1jN3uDP3apVIbACs5V7+pB6jCUnbkkgGkKLfkGLhpY1aBq41T1Z7YV1U1xou5KbJU+jjfeOX/7EF8PDf6qeC4EhKLgvMOCS/mv2dgtk9qm3oYNXJGXobhV0VbIxjn7NmyqXSXKKiShV6Wn7eOb3DytHKwyOaoCbAx0qGzqB3fPvsi2pDSqK7sRXmRNL+16ly3akt3/jYe1n5ZV+ybV4NyqOhhAwxZi1fb9mdKxWGWpeAqSbtLq1NrQA/TxeR x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: H0HEE/CQ0jo/iwOP5C8RwDU1AVJK0ijWkeZ7C46vINyHz6VgB71g50gKXQYYUZf8XP+gFBQIQoNR7U2azp/ewPFi38ENZaonPwkUyHz8Pn7NU0U29TwttY7Cd+N75CqZt6nrpIbOvTmUJtAIBz7v8Q== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: b7ac204b-32a5-4950-3102-08d974fde0c5 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Sep 2021 08:26:39.5053 (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: MN2PR04MB5549 Subject: [FFmpeg-devel] [PATCH v4 10/18] 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: Q6F3b5X0U1jd Signed-off-by: softworkz --- libavfilter/avfilter.c | 8 +++++--- libavfilter/avfiltergraph.c | 5 +++++ libavfilter/formats.c | 14 ++++++++++++++ libavfilter/formats.h | 3 +++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index a04f8ed62f..961e55e7b4 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -56,7 +56,8 @@ void ff_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 @@ void ff_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/avfiltergraph.c b/libavfilter/avfiltergraph.c index 45b028cd9c..7a5a4ea419 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -314,6 +314,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"); } @@ -444,6 +446,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 1bf7d36195..704774d763 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" @@ -430,6 +431,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_all_formats(enum AVMediaType type) { AVFilterFormats *ret = NULL; @@ -447,6 +454,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; diff --git a/libavfilter/formats.h b/libavfilter/formats.h index 471cb42bc4..25ae511fc1 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. */