From patchwork Sun Dec 19 23:56:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32740 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3845285iog; Sun, 19 Dec 2021 15:58:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJxc5Obko/s8CO5v8JvhRo5lxvktslI5zupMtNgW4b9jv/9yWTkaAAgnGF38XB3+96P6/qWv X-Received: by 2002:a17:907:2da0:: with SMTP id gt32mr4875120ejc.449.1639958292123; Sun, 19 Dec 2021 15:58:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639958292; cv=none; d=google.com; s=arc-20160816; b=BbN3xJnk696QtaqcZIXbVUBXp9aEliEojPcTdptSzEkD97VR/LLCJwyMWOFReDV5my coEI4R4mP/0q8KMxJf3efID7o0nVRFB0B6XbteJnkFZSQXtFCBQDCO5OuSGRR61IqaBi URh57nZMe/IOt/N3zVbbyu1eUklW3oyz7eDV2au0BJsAjHP4CjxPcEftUCmx2/XapuTf P9f5gQTElcQcid0B0oZemGJ5f6m03JJWv2lieWl549m61fK8pOi5ww2M4OXHdmH+P78i If7DFhsEhbEN2EWqIozjUYop6UWIP/FVA+nrgf34HXSR6Nk7cNoSl5Uy1o8XNrp2+EXV WMrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=LnQQykmjJUY9PG7n5RUt4QhJi0Zp/P67m/GJ5Lu7cTw=; b=pJO9h5abPKaMciymiz7e9q7ljjeDCFfXnIaOgl+/Fhs9HmnBOgroyyX19XTbrbe5tO Ovt1OMOUZc/OpWu0CYKblx5ZDoQt2ol+3pPDpeenhaGrN+c63A/99l6yKNErCq2l/u5x MUaK7tA6ggLCb3pilHXlylFzap6Lnn0C7QhP/vxNrmAgzJWj3tBjtu03u3WBB0r8twlm gVqltFW+WKnrOT/iQEeBaHg+4FUbVyACVS+UWu7scFET3maS5xoykcSfxG0pJudi+hs9 OxVi6oSfKXRofDmb1WSLo5BLP1i9EBgW7e7wJQ+mEiecwmMFj55RxmUhP5ZfhHYlioBB ue5g== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 22si1960802eji.916.2021.12.19.15.58.11; Sun, 19 Dec 2021 15:58:12 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 534BB68AF04; Mon, 20 Dec 2021 01:58:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6BBB68AE56 for ; Mon, 20 Dec 2021 01:58:00 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mz640-009Uzg-0O for ffmpeg-devel@ffmpeg.org; Mon, 20 Dec 2021 00:58:00 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id z632mKCxwSgGFz632m1QjP; Mon, 20 Dec 2021 00:57:00 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=E1l9eSazYH0F0_BWe28A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 20 Dec 2021 00:56:58 +0100 Message-Id: <20211219235700.16595-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfO0T0+AMT5c4KWZW48/9sr6DOwsTFGLbZ74COUhpCmmmdtjG6RRD0jN0iT8Z5Ec/AQ8n5dxdZGkUQK16bzuFuU6HzXzEHaHJ4ahdKqdddlM6U7WGiXWW hMIhZp/jVjCjhmr3FMZi4/aRtTlKqTPIQDZe4NR2SMuZXJuhz/RDXEVU Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/ass: Faster ff_ass_add_rect() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8nZsSwUs/iNN Signed-off-by: Michael Niedermayer --- libavcodec/ass.c | 33 +++++++++++++++++++++++++++------ libavcodec/ass.h | 7 +++++++ 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/libavcodec/ass.c b/libavcodec/ass.c index 725e4d42ba1..06714678722 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -114,17 +114,31 @@ char *ff_ass_get_dialog(int readorder, int layer, const char *style, speaker ? speaker : "", text); } -int ff_ass_add_rect(AVSubtitle *sub, const char *dialog, +int ff_ass_add_rect2(AVSubtitle *sub, const char *dialog, int readorder, int layer, const char *style, - const char *speaker) + const char *speaker, unsigned *nb_rect_allocated) { - AVSubtitleRect **rects, *rect; + AVSubtitleRect **rects = sub->rects, *rect; char *ass_str; + uint64_t new_nb = 0; - rects = av_realloc_array(sub->rects, sub->num_rects+1, sizeof(*sub->rects)); - if (!rects) + if (sub->num_rects >= UINT_MAX) return AVERROR(ENOMEM); - sub->rects = rects; + + if (nb_rect_allocated && *nb_rect_allocated <= sub->num_rects) { + new_nb = FFMIN(sub->num_rects + sub->num_rects/16LL + 1, UINT_MAX); + } else if (!nb_rect_allocated) + new_nb = sub->num_rects + 1LL; + + if (new_nb) { + rects = av_realloc_array(rects, new_nb, sizeof(*sub->rects)); + if (!rects) + return AVERROR(ENOMEM); + if (nb_rect_allocated) + *nb_rect_allocated = new_nb; + sub->rects = rects; + } + rect = av_mallocz(sizeof(*rect)); if (!rect) return AVERROR(ENOMEM); @@ -137,6 +151,13 @@ int ff_ass_add_rect(AVSubtitle *sub, const char *dialog, return 0; } +int ff_ass_add_rect(AVSubtitle *sub, const char *dialog, + int readorder, int layer, const char *style, + const char *speaker) +{ + return ff_ass_add_rect2(sub, dialog, readorder, layer, style, speaker, NULL); +} + void ff_ass_decoder_flush(AVCodecContext *avctx) { FFASSDecoderContext *s = avctx->priv_data; diff --git a/libavcodec/ass.h b/libavcodec/ass.h index 2c260e4e785..4dffe923d9f 100644 --- a/libavcodec/ass.h +++ b/libavcodec/ass.h @@ -118,6 +118,13 @@ int ff_ass_add_rect(AVSubtitle *sub, const char *dialog, int readorder, int layer, const char *style, const char *speaker); +/** + * Add an ASS dialog to a subtitle. + */ +int ff_ass_add_rect2(AVSubtitle *sub, const char *dialog, + int readorder, int layer, const char *style, + const char *speaker, unsigned *nb_rect_allocated); + /** * Helper to flush a text subtitles decoder making use of the * FFASSDecoderContext.