From patchwork Thu Dec 10 11:16:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24499 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 11AC444A03C for ; Thu, 10 Dec 2020 13:24:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D18E868A8F1; Thu, 10 Dec 2020 13:19:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 446CF68A865 for ; Thu, 10 Dec 2020 13:19:18 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id w206so2571739wma.0 for ; Thu, 10 Dec 2020 03:19:18 -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=DyFn660x5v8IPYUOji8uKPtWDtDMsD+bsaYJFXfnLPI=; b=dP+Uf5fXC/y1CoVLXkz6657fLcZmRE9WMN3sS3B1byPdZE1dYnesz0ReKQFdIhLAqU XgemmvSuHjYv/PSlk78agA4KRVNlsB4rsD9e0pZFraXeG76ucrhEPBrI3dpeLHZ6xKGh NFNQzuDYDskEqacQkN+DoD1RV09h39gbBrs8tvJE42caFraCdpQtd+dRc4ZC01QoLT+X VEnRAzqwUDOWsGADBF4EyG8v+I2MQHPblbILy2WZGHr1X/bSneapBPegQSAm4vkLEkBh BwAGFuqiNy6fhBhY1fIZTRgRdk/BzckhE4/1SwCiNyc5vNb2iHox7jqiyIbyW5C+Hfwf Rc3g== 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=DyFn660x5v8IPYUOji8uKPtWDtDMsD+bsaYJFXfnLPI=; b=PWO2L7HWtW999gZ/teiGQL3P5tIsI5lSuShT7zSVJeZ8Q356LB+lZNO5JJcdnywXJy srXomBFDIrmXGGKLPMgzIH6j1Ay88xL7lPdXH7DHM4Qg7QyH6EcHNbWjsJx04OutDJY1 nCVliEdEFTBFdRvnynSJqclYZd9H+GyvH1PTkxxDcKccNvz+8JF+Ebw3zEoeKRLZkv5J M/vwIeqjarHF24AdJW6HMwjnw+iYRh2AO5JM+ldifRAFTDlETAO9iwpMGe6V+vDI3Yr3 B7h9vuiCfGP4ZKJQyVGMB7qrnVEnqJ9x3StfP/BOSCK3aLjgedsUugMNxy480cMVtjaY TOUg== X-Gm-Message-State: AOAM532DBu4KNCJv+FJBx/Ax9inHSWqQvKI5tXpka8i+QWMmKJ5okkKb i+lcrsiZfciR0esxsJls9Q1HMrVPuGzUCg== X-Google-Smtp-Source: ABdhPJyF3JVMi/CGXyukQ/549f2vpOGYlypAR/+Ko1pGq4zm20mPjqoJ4n4fSDWs2dDbm0pD216zrA== X-Received: by 2002:a1c:f617:: with SMTP id w23mr7492446wmc.52.1607599157469; Thu, 10 Dec 2020 03:19:17 -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.19.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 03:19:16 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Dec 2020 12:16:49 +0100 Message-Id: <20201210111657.2276739-32-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 31/39] avcodec/msmpeg4: 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" Forgotten in/after f5957f3fe2b8dfda13a9750acc3e3a03cd5d39c9. Signed-off-by: Andreas Rheinhardt --- libavcodec/msmpeg4.c | 91 ++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index ea1083c1a0..93b6e4bbbb 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -53,56 +53,55 @@ * except that it is inverted. */ static av_cold void init_h263_dc_for_msmpeg4(void) { - int level, uni_code, uni_len; - - for(level=-256; level<256; level++){ - int size, v, l; - /* find number of bits */ - size = 0; - v = abs(level); - while (v) { - v >>= 1; - size++; - } + int level, uni_code, uni_len; + + for (level = -256; level < 256; level++) { + int size, v, l; + /* find number of bits */ + size = 0; + v = abs(level); + while (v) { + v >>= 1; + size++; + } - if (level < 0) - l= (-level) ^ ((1 << size) - 1); - else - l= level; - - /* luminance H.263 */ - uni_code= ff_mpeg4_DCtab_lum[size][0]; - uni_len = ff_mpeg4_DCtab_lum[size][1]; - uni_code ^= (1< 0) { - uni_code<<=size; uni_code|=l; - uni_len+=size; - if (size > 8){ - uni_code<<=1; uni_code|=1; - uni_len++; - } + if (level < 0) + l = (-level) ^ ((1 << size) - 1); + else + l = level; + + /* luminance H.263 */ + uni_code = ff_mpeg4_DCtab_lum[size][0]; + uni_len = ff_mpeg4_DCtab_lum[size][1]; + uni_code ^= (1 << uni_len) - 1; //M$ does not like compatibility + + if (size > 0) { + uni_code <<= size; uni_code |= l; + uni_len += size; + if (size > 8) { + uni_code <<= 1; uni_code |= 1; + uni_len++; } - ff_v2_dc_lum_table[level + 256][0] = uni_code; - ff_v2_dc_lum_table[level + 256][1] = uni_len; - - /* chrominance H.263 */ - uni_code= ff_mpeg4_DCtab_chrom[size][0]; - uni_len = ff_mpeg4_DCtab_chrom[size][1]; - uni_code ^= (1< 0) { - uni_code<<=size; uni_code|=l; - uni_len+=size; - if (size > 8){ - uni_code<<=1; uni_code|=1; - uni_len++; - } + } + ff_v2_dc_lum_table[level + 256][0] = uni_code; + ff_v2_dc_lum_table[level + 256][1] = uni_len; + + /* chrominance H.263 */ + uni_code = ff_mpeg4_DCtab_chrom[size][0]; + uni_len = ff_mpeg4_DCtab_chrom[size][1]; + uni_code ^= (1 << uni_len) - 1; //M$ does not like compatibility + + if (size > 0) { + uni_code <<= size; uni_code |= l; + uni_len +=size; + if (size > 8) { + uni_code <<= 1; uni_code |= 1; + uni_len++; } - ff_v2_dc_chroma_table[level + 256][0] = uni_code; - ff_v2_dc_chroma_table[level + 256][1] = uni_len; - } + ff_v2_dc_chroma_table[level + 256][0] = uni_code; + ff_v2_dc_chroma_table[level + 256][1] = uni_len; + } } av_cold void ff_msmpeg4_common_init(MpegEncContext *s)