From patchwork Thu Jan 20 03:25:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 33703 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5432148iog; Wed, 19 Jan 2022 19:26:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJzhGq86NUlHCbOfOufj00i8GKwpj6UW3pCCROBHfPI4tf0gpWYMk7IUKcUlNmTx3+oO1cK8 X-Received: by 2002:a17:907:3d89:: with SMTP id he9mr4642233ejc.623.1642649198753; Wed, 19 Jan 2022 19:26:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642649198; cv=none; d=google.com; s=arc-20160816; b=QlSXlSSgZ+nxwNMpGFdYe6N2Jk5verglmtJdYqm5vAPUq1gbfa3tfgW9kQo8Pt7gw8 jP6IykVeQ+93ElVG/32aYee2ULjLoXH+vsP3AriNd1KWkxDPqiLY0lkdLUdo5JNiFK5l cu/P7PivQch55U+Qd2297Y8H7AqcSLl3GvHsoL/VyyHb1A9pN14mK1lqL1bNvaZsfHqG kzd94qHVyb9ZAAtqibXX3W7XUup/UdYecSVA3wfTn7Gl8Xw935+X3eEgW1pW6lk0V+JA 0xBo8h2jh9rZ/B7l72p2o0uundv+MxmAH63K0BE3oOwO1ogi3YlM/rGJ1TJxhmv9qJpY eubA== 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=Gz/Qn0ewDhpg00ofGNme9RfvJONnDA1Xg0V9usnPau0=; b=icjNoV6RXMZ+MXZ8m00HTTFwBPqSd6FItuZU3A58sNbaz6wfrryOjJcAB4S1I3fynL GqRCe/m93aXL5PqQrlI7ckIFh3seYk+qMiIwdAz61/cPomGfgBxMaudAjYrA7hXl1jkC hQf0HcKDXXIiURVqfWCK75h2i+755gieDTutWS3ki4RXdNdJqU0Ddw1iZFCSNgLzhIJX jLN+AZBeCiP32c7+f8b29aSBjnz5DbqIKylBqsmmAcwLI6kTFBryK4mTPmtXG/8rq5I/ RwvB3045aQGopKffHUsHx6UO3PhSbq1hDU8a/rBP+K6XibSH7lsdjHfcchKcAldVzcO4 jj+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Hjq+LrhT; 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 sc37si1292406ejc.221.2022.01.19.19.26.38; Wed, 19 Jan 2022 19:26:38 -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=Hjq+LrhT; 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 8810E68B1DB; Thu, 20 Jan 2022 05:25:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA9A768B1C4 for ; Thu, 20 Jan 2022 05:25:41 +0200 (EET) Received: by mail-pf1-f182.google.com with SMTP id y27so14631pfa.0 for ; Wed, 19 Jan 2022 19:25:41 -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=Hjq+LrhTk81T0RkSgRWN3ltCLZH0fMgbsNmIRQgIwHh4V9gwlipQ7oBu/oFuBkqgN/ r3hcPCBeCZY/IwBdfZCMuYLiOj+vIQviEQfeIHk7PakpsXAXJoKfyhKb6yZT2bwZyzW0 xPJUZxSyxWhQO8hYzahzP/ON5omSNKGhrwpxKG8l2ff/mXBI1zyTpmN/dI3qHCp0648J 0TOdkU/mIKYvFopBTuMqRjkJr2qAhcbdo6W2ICFki/cSurZ3/Zhg+5ceNXWWoV595hsQ Jn8BJoKU6pdSjpSWbUWK7Y/D2WwKR+wPaEqO7P4dqrmQ0HJtwkqAbmB2muxXIvD27MwI OEmg== 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=2lfoS3zOcv5akjCpZWhz55wmNKRyMDg0fMk55dG+ZlsS7lohzXrzhR58MWgoMMEhEw EWXACpXgprWS8SgT2IBl2jnY38epMvkdMD1kPnFOBQXqYSEOuRRFHfjAHwTr58LWeO83 2LWzIC4mTQUYqJ33m/dEbDNYlYDEaUgU+VoujgAulS3TOo61Uml+ynaCg05ScZbO3/S4 9wJ5FieghMqMoOO8sKjCHd3DquY1nAvIKzpDRkQXyzHywg/5nuUYfVSwCimpNLM48fwF yyX2Lb0YSjXHQe24o2INtEoYQRM4JYAolC1on9Wn/HNuqdlEQtXuWPzemdDQftgG1VPJ HTYg== X-Gm-Message-State: AOAM532RLLSF5a/t6VQgtydwo0lRMK/xaHf5347mCM7x2LmuKlJEwHl2 vzdifsC4NlKxc36Z0UIaGSwmpldVZ8c= X-Received: by 2002:a63:7f0c:: with SMTP id a12mr27850819pgd.548.1642649140091; Wed, 19 Jan 2022 19:25:40 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id i1sm843373pgt.82.2022.01.19.19.25.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jan 2022 19:25:39 -0800 (PST) Message-Id: <77bd67ee37a62d2e0699bcbe58c8eca60d7dc33d.1642649134.git.ffmpegagent@gmail.com> In-Reply-To: References: From: ffmpegagent Date: Thu, 20 Jan 2022 03:25:12 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3 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 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: D6sSqXPt2b8U From: softworkz Signed-off-by: softworkz --- 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: