From patchwork Tue Nov 24 14:41:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24026 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 0030944BE5C for ; Tue, 24 Nov 2020 16:42:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D80CD68BC9D; Tue, 24 Nov 2020 16:42:13 +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 764C168BC7E for ; Tue, 24 Nov 2020 16:42:05 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id e7so5031922wrv.6 for ; Tue, 24 Nov 2020 06:42:05 -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 :mime-version:content-transfer-encoding; bh=4Zympk01EwygHEwjYFFvo8D9Ghuvf5SjFSA6ymvwFRo=; b=YJTl/akfbOar7NhKt3feAfzNrZzLXI7FDKf+QMPCjwe/VdQ7cjc3RcNsMb8hwiypqw NtzskzOpFBi2bEARSyKNz1hiZt0m0fuGxLpD9HpGknou/bXTWv+6a5XQvJkv1ev07hHS DW2RiS8JD2QMQBRaDI6nFPrStcIQUdt02lUQBYOl3buSZIJabJxGN8FL3cFeeMVeGOlK Vc+5a2xA8fnVpJ5xyk5eQtDViBP0MAtJSs4J+vg/Zi8KKP21qrxWuHUUvkC+E1jA51o4 pCKqm7vRuZahdFbFA7zGU/bDH0IojKjH7RWHHMvCrvH2Kdx7s421CeMqTK2xa2uE8H5S a7nA== 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=4Zympk01EwygHEwjYFFvo8D9Ghuvf5SjFSA6ymvwFRo=; b=BNNLRD3ESMeNrFdEb+L3OdtLjs+LRjQ1MALC0LdWDAZ9Kys630H15/Dl/0gkLdkuFu K5VWB9HbLdOMw1pwZJTWi3yTNE7LkQInrTn1xNV36TBP+XhI7QLyJ+YsRbOvAFbg910X KW3ToJLv2JEsIoJKrMc2VpaymHDo2G2n1srKem/EsvYR9cSbKmygvhuDwTBORxoUT8Iq /qveU9VqTYQgMmafd0mh3DkvStL6qUMdnLdo/iGEqYkWBN3IKUr3xNywZcQYAqz90p/S cTNCb2XMQKNMOrxv4JkiDGpW17WuDQeGOEnPLmtG44OvDU21Hd9WX2EcfzAEQIQ6lhPT GANA== X-Gm-Message-State: AOAM5333NfOzEZWJRYYWqDRnmB2sp0JFmnnc5/bKUk1dMMevPsFobtdT TSRQOmEKJ2h2HK+NTKLqVHQHqhnRJ8whjw== X-Google-Smtp-Source: ABdhPJzif+liV+aizObnXsJaUP9FdopbzvMx7wx3sjJ84IU6gYGNrO+QsNBjoxuQVOZdX5VIyqLi8A== X-Received: by 2002:a5d:65c5:: with SMTP id e5mr4859687wrw.113.1606228924625; Tue, 24 Nov 2020 06:42:04 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id 90sm26453232wrl.60.2020.11.24.06.42.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 06:42:04 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Nov 2020 15:41:21 +0100 Message-Id: <20201124144122.1994769-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201124144122.1994769-1-andreas.rheinhardt@gmail.com> References: <20201124144122.1994769-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/mpeg12enc: Reindentation 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12enc.c | 114 ++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 59 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index b069f2db64..2466db8a91 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1037,74 +1037,70 @@ void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64], static av_cold void mpeg12_encode_init_static(void) { - int f_code; - int mv; - int i; + ff_rl_init(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]); + ff_rl_init(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]); - ff_rl_init(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]); - ff_rl_init(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]); + for (int i = 0; i < 64; i++) { + mpeg1_max_level[0][i] = ff_rl_mpeg1.max_level[0][i]; + mpeg1_index_run[0][i] = ff_rl_mpeg1.index_run[0][i]; + } - for (i = 0; i < 64; i++) { - mpeg1_max_level[0][i] = ff_rl_mpeg1.max_level[0][i]; - mpeg1_index_run[0][i] = ff_rl_mpeg1.index_run[0][i]; - } + init_uni_ac_vlc(&ff_rl_mpeg1, uni_mpeg1_ac_vlc_len); + init_uni_ac_vlc(&ff_rl_mpeg2, uni_mpeg2_ac_vlc_len); - init_uni_ac_vlc(&ff_rl_mpeg1, uni_mpeg1_ac_vlc_len); - init_uni_ac_vlc(&ff_rl_mpeg2, uni_mpeg2_ac_vlc_len); - - /* build unified dc encoding tables */ - for (i = -255; i < 256; i++) { - int adiff, index; - int bits, code; - int diff = i; - - adiff = FFABS(diff); - if (diff < 0) - diff--; - index = av_log2(2 * adiff); - - bits = ff_mpeg12_vlc_dc_lum_bits[index] + index; - code = (ff_mpeg12_vlc_dc_lum_code[index] << index) + - av_mod_uintp2(diff, index); - mpeg1_lum_dc_uni[i + 255] = bits + (code << 8); - - bits = ff_mpeg12_vlc_dc_chroma_bits[index] + index; - code = (ff_mpeg12_vlc_dc_chroma_code[index] << index) + - av_mod_uintp2(diff, index); - mpeg1_chr_dc_uni[i + 255] = bits + (code << 8); - } + /* build unified dc encoding tables */ + for (int i = -255; i < 256; i++) { + int adiff, index; + int bits, code; + int diff = i; - for (f_code = 1; f_code <= MAX_FCODE; f_code++) - for (mv = -MAX_DMV; mv <= MAX_DMV; mv++) { - int len; + adiff = FFABS(diff); + if (diff < 0) + diff--; + index = av_log2(2 * adiff); - if (mv == 0) { - len = ff_mpeg12_mbMotionVectorTable[0][1]; - } else { - int val, bit_size, code; - - bit_size = f_code - 1; - - val = mv; - if (val < 0) - val = -val; - val--; - code = (val >> bit_size) + 1; - if (code < 17) - len = ff_mpeg12_mbMotionVectorTable[code][1] + - 1 + bit_size; - else - len = ff_mpeg12_mbMotionVectorTable[16][1] + - 2 + bit_size; - } + bits = ff_mpeg12_vlc_dc_lum_bits[index] + index; + code = (ff_mpeg12_vlc_dc_lum_code[index] << index) + + av_mod_uintp2(diff, index); + mpeg1_lum_dc_uni[i + 255] = bits + (code << 8); - mv_penalty[f_code][mv + MAX_DMV] = len; + bits = ff_mpeg12_vlc_dc_chroma_bits[index] + index; + code = (ff_mpeg12_vlc_dc_chroma_code[index] << index) + + av_mod_uintp2(diff, index); + mpeg1_chr_dc_uni[i + 255] = bits + (code << 8); + } + + for (int f_code = 1; f_code <= MAX_FCODE; f_code++) + for (int mv = -MAX_DMV; mv <= MAX_DMV; mv++) { + int len; + + if (mv == 0) { + len = ff_mpeg12_mbMotionVectorTable[0][1]; + } else { + int val, bit_size, code; + + bit_size = f_code - 1; + + val = mv; + if (val < 0) + val = -val; + val--; + code = (val >> bit_size) + 1; + if (code < 17) + len = ff_mpeg12_mbMotionVectorTable[code][1] + + 1 + bit_size; + else + len = ff_mpeg12_mbMotionVectorTable[16][1] + + 2 + bit_size; } + mv_penalty[f_code][mv + MAX_DMV] = len; + } + - for (f_code = MAX_FCODE; f_code > 0; f_code--) - for (mv = -(8 << f_code); mv < (8 << f_code); mv++) - fcode_tab[mv + MAX_MV] = f_code; + for (int f_code = MAX_FCODE; f_code > 0; f_code--) + for (int mv = -(8 << f_code); mv < (8 << f_code); mv++) + fcode_tab[mv + MAX_MV] = f_code; } av_cold void ff_mpeg1_encode_init(MpegEncContext *s)