From patchwork Mon Dec 20 18:45:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32768 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4659165iog; Mon, 20 Dec 2021 10:54:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5HCD2sHL6GY8MJo1xZRMpU1nc7ALooFqIX+ufBx/xuHC+Cii6CCsSlh2dMmttGaObwIJ1 X-Received: by 2002:aa7:da0c:: with SMTP id r12mr13661375eds.392.1640026459122; Mon, 20 Dec 2021 10:54:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640026459; cv=none; d=google.com; s=arc-20160816; b=O0cwFgzT+acb4W8d6IxDOHnW02/QftGqb/6EZiYSX+gHX2F/ZNXhnVOxHpxzRRAqn4 4Bc09CRVtjDvFqYrXX5+dbrJ0Zp6qq2RND32chN6u4yRpmeX+KrTkIE4VaioCNHGTqTH EAgi1X039rHFUjRaQ8mJWHOj7GvUKXXllAbusv8czq3xpAmT+mBU/i1KGdX0kYbknFC+ 4AoAw1NDgvxjQD9x/0j/kLjkw1XurEMsjvMQzxv5PvhJrYaeaxg5SQUrFqQ1clOTzZVg Yvie50dOs0NAU8nJxKsF91VPlAyt/ywdU1C3ONOEZ8deuxHBdB8/ob7NDEI+Tty2IX3y xcLg== 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=iEZK9plNouU7AakSGe339FcKIMAz+6qXw40fjn6dsHw=; b=m8ui4AJUiNyd18dzvLzJqAgjmzVYHx2XXU+9NgPOb29RiScpegn4hN9ZbMZUBaTRnO uuN31hUyR41HQL0BGaqjQZDZLOyw5WA9bDG5vYHYim1JrxRxtyQ6vfYgr0R9ojmnQiuB h11/yNwkzfVdoP8XsnRe2UBmcEfdUeiAknwZErNLQc5h7Vn+J3SBShE90hd9XKyUxzsl QpphOG3jvNsvI5DqkqONqwgDOmqMjrumZzW+g5HtTTH1oDyG5M6LOHQ8wH2Uc+CKNQGN WSsX+jMzaHsdebc0+vtumC1wAMRKn6UUaW0yxkkEv27liLzhVyrQHo9BXjpLmmr5WA47 Jg5g== 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 u2si9943043ejy.28.2021.12.20.10.54.18; Mon, 20 Dec 2021 10:54:19 -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 92E2668AFCC; Mon, 20 Dec 2021 20:54:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-2.mx.upcmail.net (vie01a-dmta-pe04-2.mx.upcmail.net [62.179.121.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A354068AAE6 for ; Mon, 20 Dec 2021 20:54:07 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mzNgD-00D0kQ-07 for ffmpeg-devel@ffmpeg.org; Mon, 20 Dec 2021 19:46:37 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id zNfFmFx82SgGFzNfFmXvp9; Mon, 20 Dec 2021 19:45:37 +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 19:45:37 +0100 Message-Id: <20211220184537.18148-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfBtOcbRLjYbAIuN2H9mCNdP66PGP4VJhHojrLfVS03Aeg45g+ItE7mSlJWXQKSKBpG+UkkpAci3NE79GWCpgZZ/6LGBrWRJofKWTBhUsMj0jwrUWcfvl TvP79mjbvVXzPIxc3VqAuj1i3twf2CJrHoLTbPG8qmy988osJopCr/wk Subject: [FFmpeg-devel] [PATCH] 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: SK8CsrwEow29 Signed-off-by: Michael Niedermayer --- libavcodec/ass.c | 36 ++++++++++++++++++++++++++++++------ libavcodec/ass.h | 7 +++++++ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/libavcodec/ass.c b/libavcodec/ass.c index 725e4d42ba1..a1e560d7ff6 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -114,17 +114,34 @@ 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) { + if (sub->num_rects < UINT_MAX / 17 * 16) { + new_nb = sub->num_rects + sub->num_rects/16 + 1; + } else + new_nb = UINT_MAX; + } else if (!nb_rect_allocated) + new_nb = sub->num_rects + 1; + + 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 +154,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.