From patchwork Sat Oct 17 18:22:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23042 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0170C44B29E for ; Sat, 17 Oct 2020 21:23:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E3B6868BAA2; Sat, 17 Oct 2020 21:23:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E9A168BA02 for ; Sat, 17 Oct 2020 21:23:17 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id h7so7028071wre.4 for ; Sat, 17 Oct 2020 11:23:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vGgzA8wSlaSRjxQnnKr+R/Ek1pvjFKLvcK2UHCcXn8g=; b=WvbH7eCk2LdyrfSiFhrTZ+jg0BnvwOQ02l7gfU/zHajENCaRDFwAtQlwIdbLX4x5Rl +kSmo5dUcyWZXHZYNqHwXNDw3FSALNmbf5LJIpZyvTZ2uhKQ62nRp/i9wlmMPYO4xpNj /fQAsvL1p+AJeNq1kViPHozZ9P9ly5cYkeqyG8vIFcAzRUjy8/qwm+N9o4GpBX3eniI4 jwJh58lYJo6Lz0cy16HQppt7UXroH+/bMaUfF5buksDyq4THmYCFSXLUv/7VAu3Z5xJI QbkegYM7c13Z2U3cVeqr0GCmSqDvKL5tiAS29/heauj1oRw1llpWHMjNFBibmq43jee4 ggIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vGgzA8wSlaSRjxQnnKr+R/Ek1pvjFKLvcK2UHCcXn8g=; b=KWgDs4HBosBMeppzOweRyR5DuZlpcFdc3J0yI1JBEp4d/X9o+/96xIDvoFUNtJ6CdP RQLzPDEb6N0LOvjf625cpNkizY/gz3rR9Z4i7aI92OG/qNY+90wxs2xF/9/OMZo3mjRL QTPtVEkynZdPqKvjqXM2nJ0SirxJK2U0uh0TUDbjzDIYI4L1Qg0J/kim3tvOgk+CybuS Lw+UFIwTV7M/ypqVO2SAsUfnUBHpUZB+yaYfkMfHJrGRv6+muiEiiU0IZo/+HoP38OS7 v8AIRNzJq+CfGHd56ViCdShIJwPQfVt1XTGvHmMZRSZdMcgH5dA0IfQmGD+ERKqwF4z6 +nnA== X-Gm-Message-State: AOAM530bJ1J7AgQoY3NdMDDxl1Z9exPYecy7wUgwuOy+3wyKibbWAH9S BAhb9v0zjhkTEWu/erpL5pDR4Ph1hec= X-Google-Smtp-Source: ABdhPJzPrp3vhEN8nId2mBzhPzypAHNv0xSVhnd8WqSLBKE0cVCzB9kNM6loqt41BmbqMg+qTjPIPw== X-Received: by 2002:a5d:4f0b:: with SMTP id c11mr11018600wru.316.1602958996388; Sat, 17 Oct 2020 11:23:16 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id d20sm10440688wra.38.2020.10.17.11.23.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 11:23:15 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Oct 2020 20:22:41 +0200 Message-Id: <20201017182248.577108-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201017182248.577108-1-andreas.rheinhardt@gmail.com> References: <20201017182248.577108-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/11] avcodec/movtextdec: Simplify finding default font X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" There is no need to walk through the list of fonts twice. Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index e46c932c20..974118c4c1 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -145,7 +145,7 @@ static void mov_text_cleanup_ftab(MovTextContext *m) static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m) { uint8_t *tx3g_ptr = avctx->extradata; - int i, font_length, remaining = avctx->extradata_size - BOX_SIZE_INITIAL; + int i, j = -1, font_length, remaining = avctx->extradata_size - BOX_SIZE_INITIAL; int8_t v_align, h_align; unsigned ftab_entries; StyleBox s_default; @@ -230,6 +230,8 @@ static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m) for (i = 0; i < m->ftab_entries; i++) { m->ftab[i].fontID = AV_RB16(tx3g_ptr); + if (m->ftab[i].fontID == m->d.fontID) + j = i; tx3g_ptr += 2; font_length = *tx3g_ptr++; @@ -247,10 +249,8 @@ static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m) m->ftab[i].font[font_length] = '\0'; tx3g_ptr = tx3g_ptr + font_length; } - for (i = 0; i < m->ftab_entries; i++) { - if (m->d.fontID == m->ftab[i].fontID) - m->d.font = m->ftab[i].font; - } + if (j >= 0) + m->d.font = m->ftab[j].font; return 0; }