From patchwork Sat Jul 23 05:16:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36896 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp826270pzb; Fri, 22 Jul 2022 22:16:29 -0700 (PDT) X-Google-Smtp-Source: AGRyM1stOqHbsPbJtkQAFtNZj9EDGN/aExK41jt76D5JQJnXEgfX+/Wi6td1aB1p7flP9cWxylBr X-Received: by 2002:a50:fd09:0:b0:43b:c338:528 with SMTP id i9-20020a50fd09000000b0043bc3380528mr2888867eds.353.1658553389018; Fri, 22 Jul 2022 22:16:29 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n8-20020a170906724800b0070d5a5343a3si7219333ejk.353.2022.07.22.22.16.28; Fri, 22 Jul 2022 22:16:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=W71erSPQ; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B75D568064B; Sat, 23 Jul 2022 08:16:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073013.outbound.protection.outlook.com [40.92.73.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4150268B4C4 for ; Sat, 23 Jul 2022 08:16:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CU0eBTQpHTZyiI3sBIwiqB8D6hI8cpSljdixJ241ruVNlzhLPcxyaKq2+AmBLPPDv/ukmLaVG3yQInlTANDD4LexpSyQlyLNW54bMQVSSRhm4MsDiTf4JNcpK5fXQ7e6yIDP2gZ4Qxm5N7cfp/5EU8A47TgX8Ec7iXaWBDAhVzR74+JkPgpRzLN6v/aiXaIYgMNHvG4PF4W9euRxa85/jEGm/Ne6vXyD0BMfKdl/r0VfwFKAMZ/ToVS53aOdknleA1LDZZvyLwvqlNZujob1b/OjRGH5/hT4v1nId2YjW5n7zyJ1/ymwsebiDry9DqQR3bMXdbegj/aTwmeV5jhmCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=b/ksQdVWUqCbrh1ET9IHRS3YcdS8tiR/b64OwxxYFC4=; b=fWvBHi6MLtWy/zNMPYAGdp0NVf+5tMlk0b+xupy6KWRjUBuJvcVFrz2xXLxtUlFa8LNlx1agZAvPY18pafFlXji7McRKcwPNMP1cCGBcnbzZfAGTN3XF0ZSYzHKnQT66O0RkAgVgxvguINnZe8UXZUOLVdvQa/BIEwwQj7WPlcUj9+57Y3dTKLWi+Z+80vcZLzDT1bhalE7Snb2RHLRSyoAtJxuGJEoByvc6LW3aB2sIFeCIZ4T/jR532IUefx8u3D/Np6AlS5nRK4Y5+T+BQCwHYqoe/X+kDA8ASXVxY8wjQ/jy+P3hY6D6XP9qqgM5xcFIxNzkxdfvtDOJmRX3AA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b/ksQdVWUqCbrh1ET9IHRS3YcdS8tiR/b64OwxxYFC4=; b=W71erSPQmi0x1Haq+V6hNAsv4Ozd0sqNdz356BCb2tNH08boxpd0i0nfqHPPnQHgsdghPk6LI030whVsq87Ej5mcYHhKODhDFocQbsgOBIbStiC9ZMlqEvSfF3aX7CyGIcimhi3KQthdgogIRzvZRk+e1dSZed/59Xz+Wzl3MUwTdLBaZYmMx5dPkow8E3Xj7nPhzQJoKHuf/rC6ZM+1OXxShAFMLwKCgArjZf8WN/hJ9sl1J9Otcs23LGjxSfRhAdZExBYw5NqwkI73SqRtZ/HaRmbqW0YsgoZ0EvSCBuAazMhJ+CxlV+srAcKY7CqQtNRI3gi9IuElOCWVKeUwBg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU0PR01MB10211.eurprd01.prod.exchangelabs.com (2603:10a6:10:315::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.20; Sat, 23 Jul 2022 05:16:18 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5458.020; Sat, 23 Jul 2022 05:16:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jul 2022 07:16:07 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [I9l9h+Q8Qm/7vdGPAFbTXI7PeEeZG6mn] X-ClientProxiedBy: FR3P281CA0037.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220723051610.287773-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16b265d4-b80c-4a97-fee7-08da6c6a790e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiToJ1zOhCTJMxCCEpyIerpRqiyRJAH1fOqpvx8js6B1CqTAt5tl4Yip+hpUzMVJtgQQNJy14nvkMukO6lylEFWKM8Rno/f2xUUSDTFX2UsstDrvaJ6sVmOnMeGfWbZ/aaTKou9hm2ozIM5VXZGa+YbZsTakEL9C9OmYBcO8m1hY68X4AU8jKetCTnovn+I3bf0QdjYO0M5zsSh/qib7mcKxleC8RXDQiceG1yASn7DBa1d9ja3Rw8HMf+YnGqQloCoH2gOowaFB95kfqSZLEJlZKRgZNQDjScr9OC/ReIs9x1fJx7qKSahMtjfPt+m27qoBuAFkQphqAy4ZvF6dt/9kMsLLmuOd7LnVkeQSdL+gIloKi27m8iMX6PIZLtbiigXCg+6JE9+4cPs1diegSLLWF5VjkOm2ON/NG8CsWp3TAZs/fTypIj1cde1lITvlMiSKgd/4Km/ufif1q1/Ycfs2bXtJL21T9lqPobLMiJpXf1XveXt+uN+vgFLxu0dx4p2YGkTni96jHKn5K3JlcZ63vlpopiAiqUpHkG4wAcI4KMIzU24MLu/b6Qi8FxsSnBP5ZRQrSTLMNfnBiQN0SB2rcqOav8ydLFu4gMV5Lhx9Cljo+9+Qf/6Xmsi4zjOUm6R0CHqeRZ+k+gtWWeQUt9Qer4qpUi2TM7BFN/i/gJqI02WlNeE3KcOyDjFTY+mGW/OHwityBoiFd2GDjtMYkxrzWmfHlI/gX5rsv+nS6+CLjLQEszHnBHWjQgyUnt2matk= X-MS-TrafficTypeDiagnostic: DU0PR01MB10211:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2mnbFie7sMiXIBjChaHzrBEgRb2S2Da+ktuTatELsrSMfoss2n+UsrzVObb/X88kXctaBgD/CaEx0mK8lBqwwd269owcpoMsF6mq2Xer5hxnUy0TNdX66yyxmHx9cWpgI6PTbtyA1OgdLccp5md/CQjpKOfk3E1dSx54jyS+aBDbPhITSimnmCaNp3gqBU9lsjfmhxTSxL66WMxFKEXQWL5Ix+M/B6CX94SxwV6qCoC3HBM1Mzq1/7GuMhX4ksb/WU1+KY9FBrlkBZSY+v2zbDtcGl3IHcmDQIVE/HWYaQtYO2sMMtETyoTby1SC+Wi9rP4ZrP/k5d98kIFeKgExX65JFqjc3UMZOVUFAeCrTFm6fYZW5y4r9it8MqPJ+iiIb4kNWyVGlzonlxTP8bI2M1J2VraOWsPHiaCxW8s3zwv0PWU/XX08CUAHQ709ePzobVwOs5sFuUFLn7su4JJ3FLwLZ9P8SONGmaIYP3xErJ0jrtCmiRsoPUQQRL2l7kF4qLo41E+U9jCFFF3sYo6BXFr9okDARTIoOfXMytilXzwF5PyBCAc1pq/b2J6N1BMRZ6Hyf7Sp/Nek45x0CJP2J/4giyvn+PiO/Rou8gD4lpNVcp726dc8Hu3xz3MFQ7Wcfsx25KooJbZ/IPaluFfnKg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EY6H+m+9lWTXfQo4OnrwuvUpY+XyGMhRHGjh4rUqEUsX5VlfH7ARw0Cgcw4NrXzuWDV7LHn+PltAkGPBcrAXRFSS1S3Fj3dRMflZJdBRSQDrkgPQCrsECk9PmOOtzud6RKzoib9lfLkU7VOgKox9qhkzT719qrH4Ygz3u6m8VFR8PrnzjLWSpOZog2mx4rBa9OBMRTM2NeviorrS+dvoLeebknrqGPgc1hp7jfZh/FNXA9cCciGyjsqneJQF4qDzl1//A1Xx4MsgkmVc4v7AIAjC7Iw/tlf5NQhUpRBFC27Ez2+C9JPWk2bZ3qXghKyb/7X3hxQKZMcmOEhrjLQfrcdVU+oWd8mQIYDrNBrCa2ubawfMM34V8YVBONZbrahirnetsLqJ0wLcwc0Y7Xp5Ks4mrlbtQPyum9ImGr4ncTx+NimPoptciz/egQ9JFgPmgtZ1xW83iHsjH0kSmBKAcjSn+McBir83MrR/YEGCOUJWtElzNOqzzN2PlJ4SxMPwc0j0sxSYWGi69QK1CIHRZZG9vDoXxtDQ3ZPVFNxeIpIaOVOQlTyMxesHKs2qrOfRulaOKpNq+eSNY6mJl+138ecKTsaOzzcx7uvRHm8R8knYG8vGfv+cUIfobnyULmYwZ30LOkfg8Mj0UYCVa2X0q6Afw1Vx5o7TFTqDI3A4ERzYfuIgbVJ2hfgRJpVfcKqey081oxsRMO4jIeRBZYyVVOsR8H06+rh5cOM9l1TWsxrjZLqsiAfcizIGdQ+CpPy6rhKjG2OBByHxpegS/D0Cs2M9FLE44x5vcGJRQ9xwf4cBhBZRkteuvAiXumBg3AIUgtBkU3Gqoek+f1JHL5IxWYk7HspBOsHVeUgoerHh8lEKADlqgEIWKn5oRA5Jn9GtMcDtD8JvtRHRCY+J1+S1xVdGDZwkB8TN+0A2n+tKbd7XgViREMBPsiR3Byi37HAsANAQ//QGgZhFOGRfRHRh3M1sMEKsvocnsmgZx4v7vdYWP3+vtAiQstUxxgjlXXMckuZP1AJR9ShMxZqko5hyZposB5onFDllUTN7UemrtNDukk0WRJ34AbP2su8xM7/gLoS7XAqTfzYEaLrFHjWmi7YfudoSqRJSPZSJljghHAk2VrHNKs5iGPfVmq9Jzx60gTdet5dh6mLrIgRiomhHf3M4W5dtvEZxDZs1RWUeco14FRDxiYYOX34rc8uPPXZ/gB0PTvyN8C4k0+E6vTQDJyYKGmm/eZPy2CzrHQZSOo2rpe+i7UlIZOkD1Kf11q6PQZWkr+qXJUGa6PDts1fAbE8neIezO8kJyHwEUNk7HJ4= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16b265d4-b80c-4a97-fee7-08da6c6a790e X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2022 05:16:18.2049 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR01MB10211 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/vp56.h: Move VP8-only functions to vp8.c 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GFEtBCjKB02+ Signed-off-by: Andreas Rheinhardt --- libavcodec/vp56.h | 36 +----------------------------------- libavcodec/vp8.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index d2e6ad3ed0..08172e1987 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -339,7 +339,7 @@ static int vp56_rac_gets(VP56RangeCoder *c, int bits) return value; } -static int vp8_rac_get_uint(VP56RangeCoder *c, int bits) +static av_unused int vp8_rac_get_uint(VP56RangeCoder *c, int bits) { int value = 0; @@ -350,22 +350,6 @@ static int vp8_rac_get_uint(VP56RangeCoder *c, int bits) return value; } -// fixme: add 1 bit to all the calls to this? -static av_unused int vp8_rac_get_sint(VP56RangeCoder *c, int bits) -{ - int v; - - if (!vp8_rac_get(c)) - return 0; - - v = vp8_rac_get_uint(c, bits); - - if (vp8_rac_get(c)) - v = -v; - - return v; -} - // P(7) static av_unused int vp56_rac_gets_nn(VP56RangeCoder *c, int bits) { @@ -373,12 +357,6 @@ static av_unused int vp56_rac_gets_nn(VP56RangeCoder *c, int bits) return v + !v; } -static av_unused int vp8_rac_get_nn(VP56RangeCoder *c) -{ - int v = vp8_rac_get_uint(c, 7) << 1; - return v + !v; -} - static av_always_inline int vp56_rac_get_tree(VP56RangeCoder *c, const VP56Tree *tree, @@ -407,16 +385,4 @@ static av_always_inline int vp8_rac_get_tree(VP56RangeCoder *c, const int8_t (*t return -i; } -// DCTextra -static av_always_inline int vp8_rac_get_coeff(VP56RangeCoder *c, const uint8_t *prob) -{ - int v = 0; - - do { - v = (v<<1) + vp56_rac_get_prob(c, *prob++); - } while (*prob); - - return v; -} - #endif /* AVCODEC_VP56_H */ diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 10de962118..9e7616990f 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -52,6 +52,40 @@ #define VPX(vp7, f) vp8_ ## f #endif +// fixme: add 1 bit to all the calls to this? +static int vp8_rac_get_sint(VP56RangeCoder *c, int bits) +{ + int v; + + if (!vp8_rac_get(c)) + return 0; + + v = vp8_rac_get_uint(c, bits); + + if (vp8_rac_get(c)) + v = -v; + + return v; +} + +static int vp8_rac_get_nn(VP56RangeCoder *c) +{ + int v = vp8_rac_get_uint(c, 7) << 1; + return v + !v; +} + +// DCTextra +static int vp8_rac_get_coeff(VP56RangeCoder *c, const uint8_t *prob) +{ + int v = 0; + + do { + v = (v<<1) + vp56_rac_get_prob(c, *prob++); + } while (*prob); + + return v; +} + static void free_buffers(VP8Context *s) { int i;