From patchwork Thu Dec 10 11:16:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24480 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 A281944AF7C for ; Thu, 10 Dec 2020 13:19:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 884D568A1B9; Thu, 10 Dec 2020 13:19:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 10AAF68A0F1 for ; Thu, 10 Dec 2020 13:18:58 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id m5so5060423wrx.9 for ; Thu, 10 Dec 2020 03:18:58 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=RRWZDu0VtsN4c3cDT2Dt06XQGuuWG/HGdpwtTLrQlCM=; b=WBuPafolkrO8VVzvd5kVnN3SokZ6zABXMZGAuEh7HuLt65RJF3J2cMrZII9KT8kXmr el+jQWFz3S+UoHnEBWMYgUYHa6Gnl3KysLaYqLbWMLAv+QthdjyJXEpKMKMwPe5N4MVD hDXyuT+MDrJN5toDz+OOavuacrDqqFquCtW3LHGemnz4heexIOy4bJMms2BqOYkXjwJB gbNvM49ifYXcGuMim9VAv9ALrwRPu85AIrqOWAyj5TuWAwDmDbz1VdWxc4Iwe4VIfnvJ YVGCH0V4EpC7HGdopaLowztbCnNBuXlXPCNQXPtWt3w9ecW4UXqsuGRsZtiD2od4wTRu y+yQ== 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:reply-to:mime-version:content-transfer-encoding; bh=RRWZDu0VtsN4c3cDT2Dt06XQGuuWG/HGdpwtTLrQlCM=; b=fNOLbe/8fuExc9IWMUDi21WpPk6v6m8/WK+4DebRDIHRr6CBa17tHlw1ryoD5BgAww UUSWBbM9No1YA8nvnYEUk8+nQ2uWajXTTKruNxJVsTApTfU1Q6JkKipBxLKbpEVu/fbL eoTg3phz9fo2A/ZcGBHEGYAkcRYkHDn2pMeAIoL/pnHy/RJxXkk2Yu7W+2SSsZlK4Rw/ UuRnsWPl+3VDqM1mXpooH/oKZ6RMRFnn0vEjia1CuvMfxNTsPJxcpwb0SstCU5xmcIML DWSJq0PYqf0lR1EGd12sDhuzwj9XJMP0VdbpHDS+KH1on2BlDakw9UOkaVp9Xgx6OQlP ed7Q== X-Gm-Message-State: AOAM531dFcEiCWTVgcdxjX2Oatoy/O/+Fh50b5rq4TOo20fSErv4MMyM EMn6gGLcD589Lv5mLXTHISxSdbG3w/lIBw== X-Google-Smtp-Source: ABdhPJybwvfSXNI6E+bEIEglFBkZy6d0QX2wJpPY0NyQtjFFRzUVAAK4UzrERSy9KrxKbCUTr1QJHQ== X-Received: by 2002:adf:82c5:: with SMTP id 63mr7744082wrc.38.1607599137377; Thu, 10 Dec 2020 03:18:57 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id s133sm8942330wmf.38.2020.12.10.03.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 03:18:56 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Dec 2020 12:16:30 +0100 Message-Id: <20201210111657.2276739-13-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> References: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/39] avcodec/msmpeg4dec: Reuse identical RL VLCs 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" Some of the RLTables used by msmpeg4dec actually coincide with other RLTables: ff_rl_table[5] coincides with ff_h263_rl_inter (and ff_rl_table[2] with ff_mpeg4_rl_intra). Given that ff_h263_rl_inter is always initialized before msmpeg4dec's RLTables are initialized, one can just reuse the VLC tables by copying the pointers; after all, there are no ownership issues for static data. This saves 70912B from the .bss segment, translating into actual memory savings when this decoder is actually used. Signed-off-by: Andreas Rheinhardt --- libavcodec/msmpeg4dec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index 882dd22dbd..06e9707b65 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -322,7 +322,10 @@ av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx) INIT_FIRST_VLC_RL(ff_rl_table[2], 554); INIT_VLC_RL(ff_rl_table[3], 940); INIT_VLC_RL(ff_rl_table[4], 962); - INIT_VLC_RL(ff_rl_table[5], 554); + /* ff_rl_table[5] coincides with ff_h263_rl_inter which has just been + * initialized in ff_h263_decode_init() above. So just copy the VLCs. */ + av_assert1(ff_h263_rl_inter.rl_vlc[0]); + memcpy(ff_rl_table[5].rl_vlc, ff_h263_rl_inter.rl_vlc, sizeof(ff_rl_table[5].rl_vlc)); mv = &ff_mv_tables[0]; INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, mv->n + 1,