From patchwork Tue Nov 10 10:47:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23515 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 9B30C44A3F2 for ; Tue, 10 Nov 2020 12:59:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 96FBE68BEA3; Tue, 10 Nov 2020 12:50:16 +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 A80ED68BE7C for ; Tue, 10 Nov 2020 12:50:08 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id o15so4303687wru.6 for ; Tue, 10 Nov 2020 02:50:08 -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=vYhJpbX9q2b/sMifFQ0MWiEnttXw53smXvPhK0GQYI4=; b=czFEZ/PXER89XsHBnA0+/iskkxiaj2RX+2pQLKZZGTJxe9EbcMwsIkT5kHeafu2g8c 0qb5W8hIlJ/JR7PtsidXNyOoy9uKvbAQEWAkJXk4h+2dZhD3gkUahndrCGno9ckYmrb6 Vy6tskkvLMwmArX34tDZsh87XZy713DJvBAP9yEdcBVLy4AyHYu+AT2v2w7Ztbai6+Gz zh5Avxuc8Tz49plbh6rrxvDJBQN7LVaGl+Ui+HgN8RbRemA95y5FJcTFPK1KqlsURP2r ybf/jLl1gAPj9HsVEjG5OaoRi02XVJCLmv3LyyGREHa6suuRohuHYm/9dy6NuEn0t9xL cmTQ== 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=vYhJpbX9q2b/sMifFQ0MWiEnttXw53smXvPhK0GQYI4=; b=rfvj/d0m8TJwTO8vjgOpYhRKa4TYOtAfB3YR/364XwcAvKYE8Y4ds3ooPrtFm97j8K wmKxcozDAKQCzLA2Sv/gVSPThcNTMfYETV80ppgf3GuLqNLg4UWJGAfBZbKoLwoVVlKa 2cxN2Lnk+thfD4avqv5R7G1oVnwaArJCDo6Zvpjuve91sp9f/wZXnYXiP5BMLTkIktmV X7BL/3yQYtB4Uv8T0jo9MF9/QAnSkd+ya6VC3RY2jHkaXm8afrTuWKV5lxVVl6wpFB29 seWcow0JBVO7fy7yAd68sEfoDcrD1HcddLDmRj3IrCOKj3zfpEuecP7Lr0dXKg36tfHu fdgA== X-Gm-Message-State: AOAM533tqp6dvvjUFeIa6nVcb5PBlhLEpVM1nGNd7clfvrPy/4nJisNG yGFOqeQGzafxFjOVh1oGOCBpNs8ANpc= X-Google-Smtp-Source: ABdhPJwsgHM4xExJOAfdJq94qxyCzC4UhypOaJfNc4hGkEYVwMrHnkx9hqtt2ApUN4dSN9n20nYNPw== X-Received: by 2002:a5d:5701:: with SMTP id a1mr605931wrv.120.1605005407675; Tue, 10 Nov 2020 02:50:07 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id l24sm2572543wmi.7.2020.11.10.02.50.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:50:07 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:47:45 +0100 Message-Id: <20201110104851.321029-49-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> References: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 048/114] avcodec/mobiclip: 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/mobiclip.c | 132 +++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index e4a2594954..2d3225f464 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -160,80 +160,80 @@ static const uint8_t mv_len[16] = static const uint8_t mv_bits[2][16][10] = { { - { 2, 3, 3, 5, 5, 4, 4, 5, 5, 2 }, - { 2, 3, 4, 4, 3, 4, 4, 2 }, - { 3, 4, 4, 2, 4, 4, 3, 2 }, - { 1, 3, 4, 5, 5, 3, 3 }, - { 2, 4, 4, 3, 3, 4, 4, 2 }, - { 2, 3, 4, 4, 4, 4, 3, 2 }, - { 2, 3, 4, 4, 4, 4, 3, 2 }, - { 2, 2, 3, 4, 5, 5, 2 }, - { 2, 3, 4, 4, 3, 4, 4, 2 }, - { 2, 4, 4, 3, 4, 4, 3, 2 }, - { 2, 3, 3, 5, 5, 4, 3, 2 }, - { 2, 3, 4, 4, 3, 3, 2 }, - { 1, 4, 4, 3, 3, 4, 4 }, - { 2, 3, 4, 4, 3, 3, 2 }, - { 2, 3, 4, 4, 3, 3, 2 }, - { 3, 3, 2, 2, 3, 3 }, + { 2, 3, 3, 5, 5, 4, 4, 5, 5, 2 }, + { 2, 3, 4, 4, 3, 4, 4, 2 }, + { 3, 4, 4, 2, 4, 4, 3, 2 }, + { 1, 3, 4, 5, 5, 3, 3 }, + { 2, 4, 4, 3, 3, 4, 4, 2 }, + { 2, 3, 4, 4, 4, 4, 3, 2 }, + { 2, 3, 4, 4, 4, 4, 3, 2 }, + { 2, 2, 3, 4, 5, 5, 2 }, + { 2, 3, 4, 4, 3, 4, 4, 2 }, + { 2, 4, 4, 3, 4, 4, 3, 2 }, + { 2, 3, 3, 5, 5, 4, 3, 2 }, + { 2, 3, 4, 4, 3, 3, 2 }, + { 1, 4, 4, 3, 3, 4, 4 }, + { 2, 3, 4, 4, 3, 3, 2 }, + { 2, 3, 4, 4, 3, 3, 2 }, + { 3, 3, 2, 2, 3, 3 }, }, { - { 3, 4, 5, 5, 3, 5, 6, 6, 4, 1 }, - { 2, 3, 4, 5, 5, 2, 3, 3 }, - { 2, 4, 4, 3, 3, 4, 4, 2 }, - { 1, 4, 4, 3, 4, 4, 3 }, - { 3, 3, 2, 4, 5, 5, 3, 2 }, - { 3, 4, 4, 3, 3, 3, 3, 2 }, - { 1, 3, 3, 4, 4, 4, 5, 5 }, - { 1, 4, 4, 3, 3, 4, 4 }, - { 2, 4, 4, 3, 3, 4, 4, 2 }, - { 1, 3, 3, 4, 4, 4, 5, 5 }, - { 2, 3, 4, 4, 4, 4, 3, 2 }, - { 2, 3, 3, 4, 4, 3, 2 }, - { 1, 4, 4, 3, 3, 4, 4 }, - { 1, 4, 4, 3, 3, 4, 4 }, - { 2, 3, 3, 4, 4, 3, 2 }, - { 2, 3, 3, 3, 3, 2 }, + { 3, 4, 5, 5, 3, 5, 6, 6, 4, 1 }, + { 2, 3, 4, 5, 5, 2, 3, 3 }, + { 2, 4, 4, 3, 3, 4, 4, 2 }, + { 1, 4, 4, 3, 4, 4, 3 }, + { 3, 3, 2, 4, 5, 5, 3, 2 }, + { 3, 4, 4, 3, 3, 3, 3, 2 }, + { 1, 3, 3, 4, 4, 4, 5, 5 }, + { 1, 4, 4, 3, 3, 4, 4 }, + { 2, 4, 4, 3, 3, 4, 4, 2 }, + { 1, 3, 3, 4, 4, 4, 5, 5 }, + { 2, 3, 4, 4, 4, 4, 3, 2 }, + { 2, 3, 3, 4, 4, 3, 2 }, + { 1, 4, 4, 3, 3, 4, 4 }, + { 1, 4, 4, 3, 3, 4, 4 }, + { 2, 3, 3, 4, 4, 3, 2 }, + { 2, 3, 3, 3, 3, 2 }, } }; static const uint8_t mv_syms[2][16][10] = { { - { 1, 8, 9, 4, 3, 2, 7, 5, 6, 0 }, - { 0, 9, 5, 4, 2, 3, 8, 1 }, - { 3, 9, 5, 0, 4, 8, 2, 1 }, - { 1, 3, 4, 8, 5, 2, 0 }, - { 0, 5, 4, 8, 2, 3, 9, 1 }, - { 0, 3, 5, 9, 4, 8, 2, 1 }, - { 0, 3, 9, 5, 8, 4, 2, 1 }, - { 0, 2, 3, 4, 8, 5, 1 }, - { 0, 3, 8, 4, 2, 5, 9, 1 }, - { 2, 8, 9, 3, 5, 4, 0, 1 }, - { 0, 4, 3, 8, 9, 5, 2, 1 }, - { 0, 4, 8, 5, 3, 2, 1 }, - { 1, 9, 4, 2, 0, 5, 3 }, - { 2, 4, 9, 5, 3, 0, 1 }, - { 0, 4, 9, 5, 3, 2, 1 }, - { 5, 4, 1, 0, 3, 2 }, + { 1, 8, 9, 4, 3, 2, 7, 5, 6, 0 }, + { 0, 9, 5, 4, 2, 3, 8, 1 }, + { 3, 9, 5, 0, 4, 8, 2, 1 }, + { 1, 3, 4, 8, 5, 2, 0 }, + { 0, 5, 4, 8, 2, 3, 9, 1 }, + { 0, 3, 5, 9, 4, 8, 2, 1 }, + { 0, 3, 9, 5, 8, 4, 2, 1 }, + { 0, 2, 3, 4, 8, 5, 1 }, + { 0, 3, 8, 4, 2, 5, 9, 1 }, + { 2, 8, 9, 3, 5, 4, 0, 1 }, + { 0, 4, 3, 8, 9, 5, 2, 1 }, + { 0, 4, 8, 5, 3, 2, 1 }, + { 1, 9, 4, 2, 0, 5, 3 }, + { 2, 4, 9, 5, 3, 0, 1 }, + { 0, 4, 9, 5, 3, 2, 1 }, + { 5, 4, 1, 0, 3, 2 }, }, { - { 8, 2, 3, 6, 1, 7, 5, 4, 9, 0 }, - { 9, 2, 3, 5, 4, 1, 8, 0 }, - { 0, 5, 4, 2, 9, 3, 8, 1 }, - { 1, 5, 4, 2, 8, 3, 0 }, - { 2, 9, 8, 3, 5, 4, 0, 1 }, - { 3, 5, 4, 2, 9, 8, 0, 1 }, - { 1, 2, 0, 9, 8, 3, 5, 4 }, - { 1, 8, 5, 2, 0, 4, 3 }, - { 0, 5, 4, 2, 8, 3, 9, 1 }, - { 1, 2, 0, 9, 8, 3, 5, 4 }, - { 0, 3, 9, 8, 5, 4, 2, 1 }, - { 0, 4, 3, 8, 5, 2, 1 }, - { 1, 5, 4, 2, 0, 9, 3 }, - { 1, 9, 5, 2, 0, 4, 3 }, - { 0, 5, 3, 9, 4, 2, 1 }, - { 0, 4, 5, 3, 2, 1 }, + { 8, 2, 3, 6, 1, 7, 5, 4, 9, 0 }, + { 9, 2, 3, 5, 4, 1, 8, 0 }, + { 0, 5, 4, 2, 9, 3, 8, 1 }, + { 1, 5, 4, 2, 8, 3, 0 }, + { 2, 9, 8, 3, 5, 4, 0, 1 }, + { 3, 5, 4, 2, 9, 8, 0, 1 }, + { 1, 2, 0, 9, 8, 3, 5, 4 }, + { 1, 8, 5, 2, 0, 4, 3 }, + { 0, 5, 4, 2, 8, 3, 9, 1 }, + { 1, 2, 0, 9, 8, 3, 5, 4 }, + { 0, 3, 9, 8, 5, 4, 2, 1 }, + { 0, 4, 3, 8, 5, 2, 1 }, + { 1, 5, 4, 2, 0, 9, 3 }, + { 1, 9, 5, 2, 0, 4, 3 }, + { 0, 5, 3, 9, 4, 2, 1 }, + { 0, 4, 5, 3, 2, 1 }, } }; @@ -300,11 +300,11 @@ static av_cold int mobiclip_init(AVCodecContext *avctx) INIT_VLC_STATIC_FROM_LENGTHS(&rl_vlc[0], MOBI_RL_VLC_BITS, 104, bits0, sizeof(*bits0), - syms0, sizeof(*syms0), sizeof(*syms0), + syms0, sizeof(*syms0), sizeof(*syms0), 0, 0, 1 << MOBI_RL_VLC_BITS); INIT_VLC_STATIC_FROM_LENGTHS(&rl_vlc[1], MOBI_RL_VLC_BITS, 104, bits0, sizeof(*bits0), - syms1, sizeof(*syms1), sizeof(*syms1), + syms1, sizeof(*syms1), sizeof(*syms1), 0, 0, 1 << MOBI_RL_VLC_BITS); for (int i = 0; i < 2; i++) { static VLC_TYPE vlc_buf[2 * 16 << MOBI_MV_VLC_BITS][2];