From patchwork Sat Sep 11 06:02:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30113 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2168100iov; Fri, 10 Sep 2021 23:04:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9xK13OfXNHd/gKRfd0LIptmWaqdelvXEkfLRvqqI4DaWYZr5lWKNFnjjom+CU/jhF8Znd X-Received: by 2002:a17:906:7714:: with SMTP id q20mr1393422ejm.551.1631340296757; Fri, 10 Sep 2021 23:04:56 -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 n15si1179886ejd.124.2021.09.10.23.04.56; Fri, 10 Sep 2021 23:04:56 -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=NaDD2qFS; 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 8A2F168A733; Sat, 11 Sep 2021 09:03:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2078.outbound.protection.outlook.com [40.92.19.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 13E9468A5E7 for ; Sat, 11 Sep 2021 09:03:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lz1Akrh6tb8qEcmzyJvc4Gsz6aR6zakKD0GmFPOdEzyV8a3cfhV551n4pEK44v9DLqi9h2IvTziAhSJ4qxnAZYUwVftmp+hiEGc6BnliexoWCpTebUfuyrkf/9rfw49G4Fjbhp4e3bRC9aAjRtvGo3+wN45OKzNKbpANHKQK+S7U2XF0qHS4nQUYXpanhZo7Js3ACpsmEVv5hXujbOU1FxJ5Ei7mDlX/jw+B0cPdTsFKdVJdICn3NxpOepox8McWmovsfxkf/hqJOiB5rTLfcpzRLCYD79d4NW3ce2HJCFyUyttwkfhkiPKqGi4gAECNjVYVJxDrCIBwA/+YoL8qEQ== 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=cwNUTg9oRNBayjQa5urHlyHbe6Bssh/zKVyAxWB7QHhT8XimktMXEEVefYodgJEJa8eHDy5dMcrZqIO8fqTcUPO8QMOx/q1r+rxBkYsshtQGo8HesoxiLxcoOdGUmOmpTzWK8dpZXvs2gYz1orVy1H1N6tPKtKgi8SKT+YjR/j+dm5lbF8BJM6Kp+2cGeRlZlrZ97MaDmuZKsVXJjf6MeFC3Ey2sGarMoqLjwAK/ODKDRaIA2/qaoVO70nU6MgZ2aPXWAXAb0gnDTgBO1nPUgHYdLF513ehfy+yffem23Wdt+Q1fXkWjU2yfiibssvPzOPxG/tmtRRSW4V4jQ/J+mQ== 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=NaDD2qFSGbnHnw8FPDhQzRYXK4a9dijQ5I4XKmpbuUHxRjhxG3GUCP3YoXZLsH01sOyFjBKITLoTHDjyhWj+Xlu6Pk+FF06edj8LNM4K+9QpeyCCeYc8x2pqamGQnnbIriW2FCp1zjPPbmlGxXVXvb3d1MbHZfEsywCBGL71dL4281Ha4ZYrriiG4mi2XKHjS9RZL6JJNRp5M1kZAxKjBRxKpK40uGulkNwtfshIvmJp+kIYnkzFqW7ig5PCJuy2iit/Lg7HQa0jVI+ikohTHr1IjY8QbyRxephLLbXRKoc8zOghloRbCjM4bSace3g+yt1vFzdZ3LwRGmM6mjZltA== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5776.namprd04.prod.outlook.com (2603:10b6:208:a2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 06:02:56 +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 06:02:56 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v3 10/18] avfilter/avfilter: Handle subtitle frames Thread-Index: Ademwa4RTEBxTn8FSGa0mXu3u8AkwQ== Date: Sat, 11 Sep 2021 06:02:56 +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: [GbCMza5yCTy6O+KR/HiQ5pGCVHbG46FsrBjhAQKoXR8=] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f0f702ca-8540-4399-9adc-08d974e9cd3e x-ms-traffictypediagnostic: MN2PR04MB5776: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: imsFPtxwfT+gjSYdmfIEzoArAmr9n5aseL0QxKuxCrDryUoAXtJqzNZZBA2SjWsFzp5wE4W2B0me1VV+j/BcSw7gUmjiwkdSAA3VY3ELCD6nBdV6Sh87iYy3QAhaymVRU4B88KeVU0h2Y5XE3/7+Xoh5yf+jXDB6JabOp3FrP6c6Sy2CxTRaDGzzc1YeAPNa7DvKjGRyyIMwVF1eb0VDI4NVtU0T2JmppnfNJMzIvOcH7qBxOcHq79hDVCsI1rw/pJ03qkg1fp+18esseqkb+6Y5t5UXnHKxTgTgLNr9U4f/e4hlJpyNc/xeDqpa9Nfa1x0xNuZUPwMLm6PXM5S8beEJtRWXJisc5OYQNTzuAx3lTEj+PguGKT++YEzWBJEgBMHDqSdf3oGEB9wtqXFznvTnHG2OnuGvn7eejRoW24rh0Pu5lDGWjAm+LpsBtJeU x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: hNv+hPiES063Dghag8+MuJyehhvYxq+cDLFh67ZEtB3fUvP1uK+YJNFbyxN9IZ0hUHMhM908afesj2CjHhLBIkzi1jDqRrfKPoQGKNXGo4lt4wNysDwSgpsnzp87tIqNg4RR27OM7bI28AI8TMYMrw== 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: f0f702ca-8540-4399-9adc-08d974e9cd3e X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Sep 2021 06:02:56.8940 (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: MN2PR04MB5776 Subject: [FFmpeg-devel] [PATCH v3 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: QZbAriM3VKfu 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. */