From patchwork Thu Jan 20 02:48:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 33682 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5409480iog; Wed, 19 Jan 2022 18:50:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJyOT7Sqe5qcAWK5hISa/MWxo9G282iWZi+M5fu9e/PgDfDbm5CGu4A0bW50+r9KDKpxN3z5 X-Received: by 2002:a05:6402:5250:: with SMTP id t16mr18439672edd.276.1642647051738; Wed, 19 Jan 2022 18:50:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642647051; cv=none; d=google.com; s=arc-20160816; b=0G7vCDNWOG/Kn6Lae4QYEMMy+2h72peNp2EcUXdVQUS9UKMMHCD/X4OZLnMMac/K0B Baqz857nocw8SgvAhRtuY2fktG/UPV4JUX/IP1XR2fz65BNgWGePhI+gzEQ6SPWw6CIJ 3PVEE9yHwB04sBVWS0y5tgdLbxX4K9gR2z1PEByneJjPR619jaQ8SF3XvujPXf0Nlaxm 6QOI94yz482PyDK6QevbiMYobXxQuXUMZSXrxP9NWfyl0FpETuADa52IPWkbj3w1acHp 38EckZlnhYYqIWxxN6HyCfAUs+FOQSpRE3i345j1joUMfBzVQIOGtxDaoXv2YcrEj/vL jntw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:from:references :in-reply-to:message-id:dkim-signature:delivered-to; bh=0jJFOjM+SNwtYHP4xV5SxFdRL4hEh27q+T9SwZxRjI0=; b=GcpBBwpHsdfFI2wh1CeHfyRDbuJhkllE1GMRvNVdGq3t7/paqgvK9XaF9cFMqRb2eb 8gL2UZcxE7AoyAkVKKOzFgKKUE9Aq5JPl7g/MEl6gKuZrK5mvR1CydneH3kR6YagVvxy 7XbO7A/m/S277XFKLuu5xZx1BmaEXxliKMeeuMk0oAp8SkLCsjKjRLvfLkejZFHVbge7 dfjPYtohm3buZpK26t5uNfpr85jqQVDccP94s2riTFyRc6BJJrNGcFDr6WOt6CMGFPWd 5v+LG+RHNqWwfQArmEi1J2pXTj8NSg7BYEUoR8DmYUVyZlMqF7RKK6/fdWprwR9Lxbaz UmrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=WuPE2W2L; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dd18si1366694ejc.810.2022.01.19.18.50.51; Wed, 19 Jan 2022 18:50:51 -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=@gmail.com header.s=20210112 header.b=WuPE2W2L; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9EE3B68B234; Thu, 20 Jan 2022 04:49:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B09868B1D9 for ; Thu, 20 Jan 2022 04:48:48 +0200 (EET) Received: by mail-pj1-f48.google.com with SMTP id d5so1995207pjk.5 for ; Wed, 19 Jan 2022 18:48:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=g6eBESuZzneX5zzYySSkWZTd5rQbqeKeBwqCcRu3PTA=; b=WuPE2W2L5WcdnNM0NAYj1vKSlWFbMiP0rImoFiIVqSDut3CLniNBqSrFGgUXilVo9A pVELwiiP3mkVvi7secitSvb32+DvOGqsBWlucYoW/JPyX4/RTEyGkPP/MYvhmuLsB7cl jfmPqD0ngj5GRJUZvfZHmcwOS5PwW0Oq+16i0rNNYCIMJ94Y0ujjT2rDVfFdhXG6Qipz tA33gYn4K0CgKmUJTiZmu62awL0cNOoOKIohdUEiUHir8ieXRgp3htq2+4K3dHs1DSUE zA4l29Tm6YnLQ/PdI1pnNBJFypSLtqjIEZnUzcaitETmuJIoPZpPWckXqNHoXaEY4Vq3 ZG0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=g6eBESuZzneX5zzYySSkWZTd5rQbqeKeBwqCcRu3PTA=; b=fTCfv5bt7Pxskz70VQKhrkCmlMw79CY56sSvUVGyGY2pH7/1WYfqWQoo6BVt67A0Wd 50v1LdRimFpvbqzUoxhqqmjmdoftphMR36wriX1v3FRoM9wGziGNQKVsSNqbaJQp3jw/ ltw9j+NItZORloHn0JSj7wzMz9lX6X0zypJTot7Nk8T7mFP89/W8xrPRVPMdMqiEIK9e fS87Ziufb8CczE+wTwZP8zBbMVZvUYWhMjhytPdOkQJegJynnIvT6hPm7gML2wHjKdZL kxH4fTMXip1VcFikBWFrBWPA12xRFnT9aIxUQEq6gmewnMqteHK8oMr7Dv/oUrH2VKfN 1g2g== X-Gm-Message-State: AOAM533lbAHT5cecTk8mRGBDyTT6KKdPQjKETObwDbYjk1HIwkL2qong ZhAfQ2QrUPMR49odNlTbIot+H3g9taU= X-Received: by 2002:a17:90b:4b4c:: with SMTP id mi12mr7990028pjb.85.1642646926719; Wed, 19 Jan 2022 18:48:46 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id a3sm808218pgv.89.2022.01.19.18.48.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jan 2022 18:48:46 -0800 (PST) Message-Id: In-Reply-To: References: From: ffmpegagent Date: Thu, 20 Jan 2022 02:48:18 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 08/26] avfilter/subtitles: Add subtitles.c for subtitle frame allocation 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 Cc: Michael Niedermayer , softworkz , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: njlQpUq6LRCy From: softworkz Analog to avfilter/video.c and avfilter/audio.c Signed-off-by: softworkz --- libavfilter/Makefile | 1 + libavfilter/avfilter.c | 4 +++ libavfilter/internal.h | 1 + libavfilter/subtitles.c | 63 +++++++++++++++++++++++++++++++++++++++++ libavfilter/subtitles.h | 44 ++++++++++++++++++++++++++++ 5 files changed, 113 insertions(+) create mode 100644 libavfilter/subtitles.c create mode 100644 libavfilter/subtitles.h diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 1adbea75bd..283dd436cd 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -19,6 +19,7 @@ OBJS = allfilters.o \ framequeue.o \ graphdump.o \ graphparser.o \ + subtitles.o \ video.o \ OBJS-$(HAVE_THREADS) += pthread.o diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 7362bcdab5..df5b8f483c 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -43,6 +43,7 @@ #include "formats.h" #include "framepool.h" #include "internal.h" +#include "subtitles.h" #include "libavutil/ffversion.h" const char av_filter_ffversion[] = "FFmpeg version " FFMPEG_VERSION; @@ -1475,6 +1476,9 @@ int ff_inlink_make_frame_writable(AVFilterLink *link, AVFrame **rframe) case AVMEDIA_TYPE_AUDIO: out = ff_get_audio_buffer(link, frame->nb_samples); break; + case AVMEDIA_TYPE_SUBTITLE: + out = ff_get_subtitles_buffer(link, link->format); + break; default: return AVERROR(EINVAL); } diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 1099b82b4b..fc09ef574c 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -90,6 +90,7 @@ struct AVFilterPad { union { AVFrame *(*video)(AVFilterLink *link, int w, int h); AVFrame *(*audio)(AVFilterLink *link, int nb_samples); + AVFrame *(*subtitle)(AVFilterLink *link, int format); } get_buffer; /** diff --git a/libavfilter/subtitles.c b/libavfilter/subtitles.c new file mode 100644 index 0000000000..951bfd612c --- /dev/null +++ b/libavfilter/subtitles.c @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2021 softworkz + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/common.h" + +#include "subtitles.h" +#include "avfilter.h" +#include "internal.h" + + +AVFrame *ff_null_get_subtitles_buffer(AVFilterLink *link, int format) +{ + return ff_get_subtitles_buffer(link->dst->outputs[0], format); +} + +AVFrame *ff_default_get_subtitles_buffer(AVFilterLink *link, int format) +{ + AVFrame *frame; + + frame = av_frame_alloc(); + if (!frame) + return NULL; + + frame->format = format; + frame->type = AVMEDIA_TYPE_SUBTITLE; + + if (av_frame_get_buffer2(frame, 0) < 0) { + av_frame_free(&frame); + return NULL; + } + + return frame; +} + +AVFrame *ff_get_subtitles_buffer(AVFilterLink *link, int format) +{ + AVFrame *ret = NULL; + + if (link->dstpad->get_buffer.subtitle) + ret = link->dstpad->get_buffer.subtitle(link, format); + + if (!ret) + ret = ff_default_get_subtitles_buffer(link, format); + + return ret; +} diff --git a/libavfilter/subtitles.h b/libavfilter/subtitles.h new file mode 100644 index 0000000000..4a9115126e --- /dev/null +++ b/libavfilter/subtitles.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2021 softworkz + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFILTER_SUBTITLES_H +#define AVFILTER_SUBTITLES_H + +#include "avfilter.h" +#include "internal.h" + +/** default handler for get_subtitles_buffer() for subtitle inputs */ +AVFrame *ff_default_get_subtitles_buffer(AVFilterLink *link, int format); + +/** get_subtitles_buffer() handler for filters which simply pass subtitles along */ +AVFrame *ff_null_get_subtitles_buffer(AVFilterLink *link, int format); + +/** + * Request a subtitles frame with a specific set of permissions. + * + * @param link the output link to the filter from which the buffer will + * be requested + * @param format The subtitles format. + * @return A reference to the frame. This must be unreferenced with + * av_frame_free when you are finished with it. +*/ +AVFrame *ff_get_subtitles_buffer(AVFilterLink *link, int format); + +#endif /* AVFILTER_SUBTITLES_H */