From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 111C24B7AD for ; Tue, 22 Jul 2025 00:47:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 06CF668CCDD; Tue, 22 Jul 2025 03:47:12 +0300 (EEST) Received: from mail-vk1-f171.google.com (mail-vk1-f171.google.com [209.85.221.171]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 770FF68CB89 for ; Tue, 22 Jul 2025 03:47:04 +0300 (EEST) Received: by mail-vk1-f171.google.com with SMTP id 71dfb90a1353d-52b2290e290so1358161e0c.1 for ; Mon, 21 Jul 2025 17:47:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753145223; x=1753750023; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8dstZf0xKD3fmT9ZNNJggFjIjQSZEGfgUkk8Qk1HLkA=; b=fSxapKW4CWbqqm3z9cNw3YpHBJd1o4X6Madi5ev7mcPcpS7XchDRnnNcXywme5LAVv MsemcHVGwjIYoT66A5dk/ZaMogyi/tVbxLW0tlQIsMjZmqDx0ODEh9urECRhBbJ/9156 wLCQ4PZGg4ZelIyLYhRQc/TUm9nRi7kpzNpdXNsNnphYOX/1JZx4XsPkLcLQAQVd+swh SHofsuJa7dxjk459Z7mFTYu+hNMUmcOM3PuS7mo66Z1+KhTCwGa1grhKR2KgGbVNGkfM R4Ypco0uUj8IVLqxiCnjaBjVKLSrOaylf4OCaKAUej/tAkhVU2lm+B6fvGfhPth9hRhN tNtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753145223; x=1753750023; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8dstZf0xKD3fmT9ZNNJggFjIjQSZEGfgUkk8Qk1HLkA=; b=Z/C+1r6aHTTl/ov7bgE7aUeGH2izTuLhncHvSCmxkGMSWQyVp6QN3gr4Lm62YNCfh6 zaV65Ws5Tar9AiDi38yJdrzCdejigx01e9ip7gwXPOnzLuWYkyTgOT1zGW4EjWlheTJS 11vd4WTNN8lLpA2apK4olV5emLCH/sW7k3xdy8Dt00nkxSeAWVr0OHPdYma8TsfpY3Oz Ip1nDQSMfXD0IQrzLDwTgIJCCBK2xldzi1+t7KHzH8imzNxiLeYRdFfIuYqZe1eKk2xJ kcCaZfNFy7HpxFq/tii1DMOHll+lUCIiJ+32mwD+MWzeAZ7yaArD7iCufyRSiF5bVTI3 9gcw== X-Gm-Message-State: AOJu0YzI6NAHP3k5iHgUJGMsVt0bdDVhPGi5NDLpcgnLpaDO7A8FL6zx IUei9qDMD64UkqT/s6nJL/nRGXO6R6LbxMKQJZu4TJ1U/hXpQLKspPrqVx/Dbg== X-Gm-Gg: ASbGncvDy0n2sLgmZKaMfNT6hGIG2GGEt0YfoiEqH2xyR7xTiNlNcvtOanVWTMWXk5P Iade4DMu/mQgcmcmbrrszP68T2nh259EK9/KzSvNJrbk/e1Lljfmfy+aIABBUioHXM9I9/7xsBw yXg3pJaogKpPrntg/OTXbCeCBLMT/RSMed7CPTF1Y1pmxnsthPGp/yK/22sYDpV5zMT0BYqcJQc EPbSrpKVwSo2u4wweuoTUiXwr0IDCAupotiQQbdB6XIhaoPJl1YQHolNt9meF0wR8rJ9JErT5yM QcmSY0q/ntCmlbUwHfnXOGp25ea87RrgHEwuMM7uMrgYDbMSn7lkGMz2sP+2cI1eY7+K4hL5rmG 70mWJGb9hBJ5oxIaS7sw= X-Google-Smtp-Source: AGHT+IGALL+QGA5MQG8ywlQ+hUILCyMIz2Qm2Pk+oRWkPZvv9ZNKLMtmj+kCk600NrZnPyfwY44PCA== X-Received: by 2002:a05:6122:1793:b0:530:5308:42ec with SMTP id 71dfb90a1353d-5373fc9ab8cmr12020991e0c.8.1753145222633; Mon, 21 Jul 2025 17:47:02 -0700 (PDT) Received: from Gryph ([2800:2121:b000:82e:a1d7:ee24:579c:2fe2]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-53764eed627sm3484929e0c.4.2025.07.21.17.47.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jul 2025 17:47:02 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Jul 2025 21:46:46 -0300 Message-ID: <20250722004647.15233-2-jamrial@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250722004647.15233-1-jamrial@gmail.com> References: <20250722004647.15233-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec: use the getters for xGA font data arrays 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- libavcodec/ansi.c | 12 ++++++------ libavcodec/bintext.c | 4 ++-- libavcodec/tmv.c | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index b58b72ef49..bde9edbe60 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -82,7 +82,7 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_PAL8; /* defaults */ - s->font = avpriv_vga16_font; + s->font = avpriv_vga16_font_get(); s->font_height = 16; s->fg = DEFAULT_FG_COLOR; s->bg = DEFAULT_BG_COLOR; @@ -217,19 +217,19 @@ static int execute_code(AVCodecContext * avctx, int c) s->args[0] = DEFAULT_SCREEN_MODE; switch(s->args[0]) { case 0: case 1: case 4: case 5: case 13: case 19: //320x200 (25 rows) - s->font = avpriv_cga_font; + s->font = avpriv_cga_font_get(); s->font_height = 8; width = 40<<3; height = 25<<3; break; case 2: case 3: //640x400 (25 rows) - s->font = avpriv_vga16_font; + s->font = avpriv_vga16_font_get(); s->font_height = 16; width = 80<<3; height = 25<<4; break; case 6: case 14: //640x200 (25 rows) - s->font = avpriv_cga_font; + s->font = avpriv_cga_font_get(); s->font_height = 8; width = 80<<3; height = 25<<3; @@ -237,13 +237,13 @@ static int execute_code(AVCodecContext * avctx, int c) case 7: //set line wrapping break; case 15: case 16: //640x350 (43 rows) - s->font = avpriv_cga_font; + s->font = avpriv_cga_font_get(); s->font_height = 8; width = 80<<3; height = 43<<3; break; case 17: case 18: //640x480 (60 rows) - s->font = avpriv_cga_font; + s->font = avpriv_cga_font_get(); s->font_height = 8; width = 80<<3; height = 60<<4; diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c index b91a741875..356042c1f0 100644 --- a/libavcodec/bintext.c +++ b/libavcodec/bintext.c @@ -93,10 +93,10 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_WARNING, "font height %i not supported\n", s->font_height); s->font_height = 8; case 8: - s->font = avpriv_cga_font; + s->font = avpriv_cga_font_get(); break; case 16: - s->font = avpriv_vga16_font; + s->font = avpriv_vga16_font_get(); break; } } diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c index ebd0e0b0bc..0eedc258c3 100644 --- a/libavcodec/tmv.c +++ b/libavcodec/tmv.c @@ -40,6 +40,7 @@ static int tmv_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AVPacket *avpkt) { const uint8_t *src = avpkt->data; + const uint8_t *cga_font = avpriv_cga_font_get(); uint8_t *dst; unsigned char_cols = avctx->width >> 3; unsigned char_rows = avctx->height >> 3; @@ -67,7 +68,7 @@ static int tmv_decode_frame(AVCodecContext *avctx, AVFrame *frame, bg = *src >> 4; fg = *src++ & 0xF; ff_draw_pc_font(dst + x * 8, frame->linesize[0], - avpriv_cga_font, 8, c, fg, bg); + cga_font, 8, c, fg, bg); } dst += frame->linesize[0] * 8; } -- 2.50.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".