From patchwork Sat May 28 13:25:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35962 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp1366181pzj; Sat, 28 May 2022 06:26:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0mqvUAbiDz1tN/5Ob3xggEXKeNrNW+cX43xJtrTZJue9gKHIa7GJmbbWfWX/DYK8wpW1I X-Received: by 2002:a17:906:3a45:b0:6f4:e9e7:4ff with SMTP id a5-20020a1709063a4500b006f4e9e704ffmr41323454ejf.100.1653744399632; Sat, 28 May 2022 06:26:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653744399; cv=none; d=google.com; s=arc-20160816; b=lL10N0aD2CuQdcPO1vJI1wEwtzI3nFY4t6BKUW+svRYZRCsGytZfZ4F24r0lX5zZfy TIJgELjDvn9CF4j52Z3txwQ8W6nd5gmhxaQ8tKAYd2wCm9Z6lIUhEzAYuTFj8pBSOw3g rEwaFh633HgkBheR3BpHRa9Kbe9Vt3xBktb/G70Og2AIhSnjY2nAZrNaRQ+ysARLkoXt eo+speKBBoUyikRWiIc+9gfvZs967CKomZCeRbF3Hfm4qjN4DbYLMAhK/DQwbALrvwQX qQnogXMLjAnE0AOKwbCG4fH28v0FZ4PIfcZYVmhV8d2pUR0X9xrFBOQrFtwVPjVWiwGS D7qA== 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:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=77pS+/jtHJYjMI6CvOVvrbGk3iHeJem4CBImfLKA2gQ=; b=cp21F2sHvVfU6tjWxRWEwsMTRlUpIEavYYoSA2eCgBZjH18d9uvqxOxed+VcQzM2Cy +fAz50XlVaA1/M+XxS6UZLvOsN9vU/dQ7B/PlsZkagYQsNzqwZSdf3TsvG3oCwGfGZub td5z5md4uc+fvfkCSu2FCBD295oKlMelb2R8dqebQzYtfar56rYvbhgiZ5kuu1WcU1BT Xpa9dfAvkyzQt8HTgYTXVd3mID6y+pOwu87kYOF2ujrETiXqXdCSmp7rxyiznyoZX22p TkSYGWbjLxLved4SN7Wcnev9SdWJ3GGoDXbBHgDV4w8lSUCCM9kU+sy10JpkmK4TGVkK 67YQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=GSh7OlKz; 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 oz16-20020a1709077d9000b006fef1a9ef80si7425953ejc.397.2022.05.28.06.26.39; Sat, 28 May 2022 06:26:39 -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=@gmail.com header.s=20210112 header.b=GSh7OlKz; 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 98DE568B5C9; Sat, 28 May 2022 16:25:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E46A368B5E5 for ; Sat, 28 May 2022 16:25:32 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id c14so6649580pfn.2 for ; Sat, 28 May 2022 06:25:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=OwAbOvynqRhMS61zCf3wNHPYflVi3DT6Sol+N98Ic8k=; b=GSh7OlKz+WHHdyVoSsgjr0z4vzMkgnHV+CeGf+ova26hw6oQAzrGc13NiGZhFFs5wl ltlcc1IkO5hC4nxkd84G5+JOhB6immY8Bq9CQeugsYtZ9uqmOMthhyNhiZ2D/OPYybt3 wpx+FOBy1te/CdsHTYSBDuZfnVgJj37amMCKNsKaGNhqo0kjJGRtxPAkMKdCZyjlWrie dOEYCZOlQoI0oUB/TnUBYBUhVrfQmu/yl6sWavEvQEbOsG+TQaZyiEUlcnsel0DCx3DH yG/zMD3GkhM0H4n5mYVpIq7y34To7fI5atPyXfQPRASefJtXmK2kwvrAE5WTy0e0BUlm IA8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=OwAbOvynqRhMS61zCf3wNHPYflVi3DT6Sol+N98Ic8k=; b=WqF4WMOh8QzO/Xq51kxhGjQwdZTmbva5NCWrf+0n/HPRbup9iO9d6EDFMDIY2gr4gO 6XYgi18mu2uIme5DAmRHVosZ8sK3FVIxcExjbROTt3B3I0V0Yr2eESq8Ic3pCG5PIIQ+ KVwq80pfcPGkkIF7jFNO7TRsmOPIWbQYxCukqUCHTTwQsIUi1mHkg+JzIGqfZR6OWb4h oAsKlkJ2D+9nKo4hkI4vOZYAdk7cHtQi/x+on7+mvrBqpo29uc7nQOefuMkpfvDEJjOU XrWSvjLdR34VpaScFNFv17K1K7Ziypa9mA9qimVJebVhK8NQtGsCSPa6TAjdiK5rsrnc EiiA== X-Gm-Message-State: AOAM533bK5g78ImFe3xg8jOtiJ4Wg87RrC2Vwa2MglmEprCLZ2g3D+0p wQ+SfcWS+H5iSNAoPOVfiDhdUIHSTW6fig== X-Received: by 2002:a63:4853:0:b0:3fa:dc6:7ac2 with SMTP id x19-20020a634853000000b003fa0dc67ac2mr29673671pgk.298.1653744331333; Sat, 28 May 2022 06:25:31 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id b14-20020aa7810e000000b005183c6a21c8sm5286565pfi.165.2022.05.28.06.25.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 May 2022 06:25:30 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <8faa7a404341796e9497adbd645e20358a06d785.1653744323.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sat, 28 May 2022 13:25:05 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v4 05/23] 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 , Andriy Gelman , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: I3gYoo4oqg6x From: softworkz Signed-off-by: softworkz --- libavfilter/vf_subtitles.c | 67 ++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index 82e140e986..0ae156ad07 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -36,14 +36,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; @@ -304,8 +302,42 @@ 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 enum AVSubtitleType get_subtitle_format(const AVCodecDescriptor *codec_descriptor) +{ + if(codec_descriptor->props & AV_CODEC_PROP_BITMAP_SUB) + return AV_SUBTITLE_FMT_BITMAP; + + if(codec_descriptor->props & AV_CODEC_PROP_TEXT_SUB) + return AV_SUBTITLE_FMT_ASS; + + return AV_SUBTITLE_FMT_UNKNOWN; +} + static av_cold int init_subtitles(AVFilterContext *ctx) { int j, ret, sid; @@ -318,6 +350,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); @@ -398,13 +431,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 = 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); @@ -460,27 +497,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: