From patchwork Fri Jan 14 01:13:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 33566 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp985156iog; Thu, 13 Jan 2022 17:14:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJyh7v3CI6DU8QRQ9ncvZXae8UxRLQNt5zOWwUgYEwJPS4nKzAtMRwfQb8JPBCP+us/fn4h1 X-Received: by 2002:a17:906:9b87:: with SMTP id dd7mr5388174ejc.126.1642122873837; Thu, 13 Jan 2022 17:14:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642122873; cv=none; d=google.com; s=arc-20160816; b=IbRIHkzC7fuO8cYLPSxOtWs5sk+nDLoJXC9SbqRzJukn8aVZOGG6+tvAEH2Ifjq1ei MwYsGaCJQzoHYOUi/E1+4OhdKuH6LBSSSwLDpX2wFxJFg91aDSf4XJgje5P5lax5s1j0 0FGh2s1a0H7V8qotNeEpJn9c6T6gTBhkgToNHDfaVPlm7cfNbv2AcF1IawWJpRHWtYdr D9aNGZ8jC8tFxLPRn6PrP2k9OJ6YZPLY6ZP2M3UzmgCZ1HOI3eEMv4P5oJ3TcNPWDuab nldX4oqgvIAgr1IyQJlI2t982gIL0dBAur3QC7jf40ssKNFbj/mpVVMo6g1jsFb0zx9b XdEg== 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=r8ibkPLpueec/DF00f0Mx9ijOE4UZ4PW7/P+O153zaIMr9DwwGL7VZPe52FCjLxI+5 m4+TaUz1dygkQhHBKKIOBxJI376/LY4vwnghCs+8uWNuV5GGsxo7NhAEPcjt6lvdaNAz u28U9uBpNKZy1eIgS4YHPQkekK7TXg+D5gIb+x97uEZJRthn1kPXjdH010ZLutz/RSb0 Te+KBBzoIS4sAId63f2JX+07LWFUlcA5xC8lBu6qC8Vvf16Ag+qRRaKlsj/6lS/xeBdL xWESYk8M9oEZSj3DjdsWW6MgYjUvFECjeaSmKXr71DuDPHMmPwdAgsqixsQ4ynCUTwOD MUTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=mKANRdJQ; 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 p4si2747402edj.354.2022.01.13.17.14.33; Thu, 13 Jan 2022 17:14:33 -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=mKANRdJQ; 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 3BC9568B562; Fri, 14 Jan 2022 03:13:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8523668B51B for ; Fri, 14 Jan 2022 03:13:41 +0200 (EET) Received: by mail-pg1-f171.google.com with SMTP id v25so1433252pge.2 for ; Thu, 13 Jan 2022 17:13: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=mKANRdJQxcRQMzOAtoxkvaJvgL9s8xj6nvlbXfvUtvkv/yotLMKbNEj5PJS8AdnWL8 YTYgxloYcXi3YcSpIRVFlKsBnz4MStLmU6zyG6M1nLumfOTom3UJvvJWpZCupa90F2vo uXzEN+lhAg4YV5UxGa1aET1gmh8vpwgR4bA35+6K759Shr17uvvNDzn734RnCeQcYrea YoUGIep5NKLvg+X34/VR7x4Kkzv3hWRwOVp4bXEyD3NLTu/Sq0xN3go8ge0SgiuDFUv2 cmMcbyaB74YStECw/DFMUsCnoLpkrhgg1n7AT4c+g2bv/kqvoPS9lBhtq3kNvZBePQgi 9wog== 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=UUIK2Hz5h+rWS3xr5ogL8ZRapSzx9Cui2/Rpwn9l73OSk+Lpfj9CGH95j8hXqUR0Eg dy1E0gPNbCor3I38m5N00a122FD1QIV/zZ+flvznPtsrjc1cvkNsAvYgkP7k8eXchh1G nD76FZRuo2iJLiinrXxHrzezNb4dLd04KAcpC77d14s1F0xd/fbCNC3pi+TNa2osY+tY x9u8j++IPt1nVEr+7fTelf5BgC6zTVBHyNi/8c0+eE5qxaM691Vn1Fl8qY0X+IIG99Rq /VfEU1eyAzU5oxjBfFLVru/UxSeiaE5/FyzfYxLoQG75gXvi9ZFHrhUgAQR9cCEhwpmp dCuA== X-Gm-Message-State: AOAM532oarrC73MZzg/lNkLc46IcWWIZ/zOzUTxGQFNApmSFqs74bTig lLWxxknV0+iRmQHyFT91UUReqDEr8+7cGw== X-Received: by 2002:a63:7e48:: with SMTP id o8mr6123482pgn.133.1642122819910; Thu, 13 Jan 2022 17:13:39 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id ge5sm9390381pjb.45.2022.01.13.17.13.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jan 2022 17:13:39 -0800 (PST) Message-Id: <24d5ed19fee5c38742bfabca5ee1a18a6cbabacc.1642122814.git.ffmpegagent@gmail.com> In-Reply-To: References: From: ffmpegagent Date: Fri, 14 Jan 2022 01:13:13 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 04/24] 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: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +m6ygbWQ1RcL 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: