From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id AEEAA40462
for <ffmpegdev@gitmailbox.com>; Thu, 20 Jan 2022 02:49:36 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD55968B1FD;
Thu, 20 Jan 2022 04:48:52 +0200 (EET)
Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com
[209.85.216.50])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65CD168B1D8
for <ffmpeg-devel@ffmpeg.org>; Thu, 20 Jan 2022 04:48:44 +0200 (EET)
Received: by mail-pj1-f50.google.com with SMTP id
v11-20020a17090a520b00b001b512482f36so1654021pjh.3
for <ffmpeg-devel@ffmpeg.org>; Wed, 19 Jan 2022 18:48:44 -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=5bf17VR0/ZJjwZK6zV/qDNkrzv1wJQUHu4/lfHYjj/M=;
b=pTrCGhCBl2qbZ5o53eCnLV/4mACa4OzIbSv6LqwM+JXnC4WBExbQJypKOPTGfEddsv
v2/diCo/9UbatQkvYHVMCgw0Mpmr4jhQmIIwkwlfkQLoe/7L6JOPeVfJiw6HzBneKCwM
CYJlyX9Pp9J7sZ82l9/i3wcrUYG9OqKfJ+EOZ5OZVJMQImffNCEJIiKX5RNYHWcfvXJ5
3/BNvdgELvxfvUFkVdHD9xNh8xNkqvT+yDjxml7Oh8dKejIdbetbaiUhQU/Y30SO9Dkn
LmQEjEXhW8xDMSvAY6raEPfcRJogW5Nd4wtFGfkJoFr4UhPSdZualcKYT9fQdwIOGEeA
7OLg==
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=5bf17VR0/ZJjwZK6zV/qDNkrzv1wJQUHu4/lfHYjj/M=;
b=D7mdZ5AHmsDN4uO5TCLligesA+zQD7hJtqwIaUgQzoNHQXUo1HEJet+vTNmQls+zHZ
VfxusSQnlU3c7GYm7t72VZQWCowy+dVc/p/cbTUfO5KPnQDSVWu30ELBzxMlOxGfbo5h
j9kc20Zw4RLGsiZRgbSj0cruVJhmc6YnZ8X1vO5eptsmRYV+IXmfmEsyfdpyI2HCfafq
4fLYS5j8ihYHMtj8AkEMf5bwBcVm+0J31KYAG+wysvT83Y4EAo9azMlSHeOZO7OtiR40
KSOF6JWExqSPMSAOerWyLo/9u0pfM/h0jy9ofocesLrUM6byjZ0tJferT4fVTLeBSW4+
4/AA==
X-Gm-Message-State: AOAM530j0klkCibYcDOeiek4PwhSNR57vBTxP1ne5Qe481ubc9vo+c5m
nhtLiMTrjO5uBettE11G0xIFf2ONRuA=
X-Google-Smtp-Source: ABdhPJzZFjI+Dk4zJg0pggmB2eHByPNDJQt6GPvljqtksH2ZRRO1d1qkzq2eAFGT0LXXFfLpfKftkg==
X-Received: by 2002:a17:903:32c2:b0:14a:2099:eb38 with SMTP id
i2-20020a17090332c200b0014a2099eb38mr36178393plr.58.1642646922730;
Wed, 19 Jan 2022 18:48:42 -0800 (PST)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id f13sm912668pfn.141.2022.01.19.18.48.42
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Wed, 19 Jan 2022 18:48:42 -0800 (PST)
Message-Id: <e326e964923610d3c63e7ba210fcd1a925bc95b6.1642646916.git.ffmpegagent@gmail.com>
In-Reply-To: <pull.18.v2.ffstaging.FFmpeg.1642646916.ffmpegagent@gmail.com>
References: <pull.18.ffstaging.FFmpeg.1642122813.ffmpegagent@gmail.com>
<pull.18.v2.ffstaging.FFmpeg.1642646916.ffmpegagent@gmail.com>
From: ffmpegagent <ffmpegagent@gmail.com>
Date: Thu, 20 Jan 2022 02:48:14 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v2 04/26] avfilter/subtitles: Update
vf_subtitles to use new decoding api
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Michael Niedermayer <michael@niedermayer.cc>,
softworkz <softworkz@hotmail.com>,
Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/e326e964923610d3c63e7ba210fcd1a925bc95b6.1642646916.git.ffmpegagent@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: softworkz <softworkz@hotmail.com>
Signed-off-by: softworkz <softworkz@hotmail.com>
---
libavfilter/vf_subtitles.c | 56 +++++++++++++++++++++++++++++---------
1 file changed, 43 insertions(+), 13 deletions(-)
diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
index 3fc4eeb63d..25e217e845 100644
--- a/libavfilter/vf_subtitles.c
+++ b/libavfilter/vf_subtitles.c
@@ -35,14 +35,12 @@
# include "libavformat/avformat.h"
#endif
#include "libavutil/avstring.h"
-#include "libavutil/imgutils.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "drawutils.h"
#include "avfilter.h"
#include "internal.h"
#include "formats.h"
-#include "video.h"
typedef struct AssContext {
const AVClass *class;
@@ -292,6 +290,29 @@ static int attachment_is_font(AVStream * st)
return 0;
}
+static int decode(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AVPacket *pkt)
+{
+ int ret;
+
+ *got_frame = 0;
+
+ if (pkt) {
+ ret = avcodec_send_packet(avctx, pkt);
+ // In particular, we don't expect AVERROR(EAGAIN), because we read all
+ // decoded frames with avcodec_receive_frame() until done.
+ if (ret < 0 && ret != AVERROR_EOF)
+ return ret;
+ }
+
+ ret = avcodec_receive_frame(avctx, frame);
+ if (ret < 0 && ret != AVERROR(EAGAIN))
+ return ret;
+ if (ret >= 0)
+ *got_frame = 1;
+
+ return 0;
+}
+
AVFILTER_DEFINE_CLASS(subtitles);
static av_cold int init_subtitles(AVFilterContext *ctx)
@@ -306,6 +327,7 @@ static av_cold int init_subtitles(AVFilterContext *ctx)
AVStream *st;
AVPacket pkt;
AssContext *ass = ctx->priv;
+ enum AVSubtitleType subtitle_format;
/* Init libass */
ret = init(ctx);
@@ -386,13 +408,17 @@ static av_cold int init_subtitles(AVFilterContext *ctx)
ret = AVERROR_DECODER_NOT_FOUND;
goto end;
}
+
dec_desc = avcodec_descriptor_get(st->codecpar->codec_id);
- if (dec_desc && !(dec_desc->props & AV_CODEC_PROP_TEXT_SUB)) {
+ subtitle_format = avcodec_descriptor_get_subtitle_format(dec_desc);
+
+ if (subtitle_format != AV_SUBTITLE_FMT_ASS) {
av_log(ctx, AV_LOG_ERROR,
- "Only text based subtitles are currently supported\n");
- ret = AVERROR_PATCHWELCOME;
+ "Only text based subtitles are supported by this filter\n");
+ ret = AVERROR_INVALIDDATA;
goto end;
}
+
if (ass->charenc)
av_dict_set(&codec_opts, "sub_charenc", ass->charenc, 0);
@@ -448,27 +474,31 @@ static av_cold int init_subtitles(AVFilterContext *ctx)
dec_ctx->subtitle_header_size);
while (av_read_frame(fmt, &pkt) >= 0) {
int i, got_subtitle;
- AVSubtitle sub = {0};
+ AVFrame *sub = av_frame_alloc();
+ if (!sub) {
+ ret = AVERROR(ENOMEM);
+ goto end;
+ }
if (pkt.stream_index == sid) {
- ret = avcodec_decode_subtitle2(dec_ctx, &sub, &got_subtitle, &pkt);
+ ret = decode(dec_ctx, sub, &got_subtitle, &pkt);
if (ret < 0) {
av_log(ctx, AV_LOG_WARNING, "Error decoding: %s (ignored)\n",
av_err2str(ret));
} else if (got_subtitle) {
- const int64_t start_time = av_rescale_q(sub.pts, AV_TIME_BASE_Q, av_make_q(1, 1000));
- const int64_t duration = sub.end_display_time;
- for (i = 0; i < sub.num_rects; i++) {
- char *ass_line = sub.rects[i]->ass;
+ const int64_t start_time = av_rescale_q(sub->subtitle_timing.start_pts, AV_TIME_BASE_Q, av_make_q(1, 1000));
+ const int64_t duration = av_rescale_q(sub->subtitle_timing.duration, AV_TIME_BASE_Q, av_make_q(1, 1000));
+ for (i = 0; i < sub->num_subtitle_areas; i++) {
+ char *ass_line = sub->subtitle_areas[i]->ass;
if (!ass_line)
- break;
+ continue;
ass_process_chunk(ass->track, ass_line, strlen(ass_line),
start_time, duration);
}
}
}
av_packet_unref(&pkt);
- avsubtitle_free(&sub);
+ av_frame_free(&sub);
}
end:
--
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".