From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6D0344439A for ; Wed, 9 Nov 2022 14:41:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BA68568B940; Wed, 9 Nov 2022 16:41:19 +0200 (EET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2012.outbound.protection.outlook.com [40.92.89.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B68668B7D2 for ; Wed, 9 Nov 2022 16:41:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aTLXa75uC4f2KnsvHv7k37CK5qNY2LI+ogCB2V06s1qU9sucP0aSHdJoUY8MrzTVdlwYSgfK46qNvJlNrWcNRXj/OjHsQYg3z0tyvxlZJA0vLprgCBEuwdrmU278qXvtJu7itlqhALni7aGxeD+k1Xutule9sbTTQYPWStGJuxqDPPrJ4Hq8uD4pZhE18tstqBtjaQrEZ46Bi1YgcTeJ0hUFFmC+1qVgCP77sY812X6o5ubAwpJN98jVeaEq9O8nWlCpq64AuOOHxL4wcvrtfiMGK3TtYoNbiY4tQwfRJOrH3B8PT9fhAfuzzqfszew1HPQlwSB4BJ/rus1HJopZ5A== 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=3Jw/nvvQ38aIYbU7EiF15vlBHaS9G6nQmuGZQnmyvlU=; b=RfU35IdyzYwNSJg+9ofpsU4/5p3MIyOVWc/OfU6hZ+qOXyumlzk4c1xTr4Ihkf52UCrddmVXAcN2nspoG+afO6W6lkxLBzn7/PB2whBiS0DMPNbQp0cx3hdVwr3pynVRGdkHfsduvO1MQt8EuVMULyHbVxSg3IKF2Vnq0Phkhdan9LpYWkFlMu+FWvAQk+eCEk274RB7U5kcgQerrsKGEdy5Pf5yxevwfqGmuOVRG4bjJ5wIitO1WIJ9SnlVni2H+TR8avpn57bpLAd5g53ss2YJqoZOVJmn92i+97qdkC5XZ12NoSGqVEGmTei1SRhSmyGh7sa5c1VV/RZzzPdlyA== 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=3Jw/nvvQ38aIYbU7EiF15vlBHaS9G6nQmuGZQnmyvlU=; b=mAw0XZX61isLImlOxhZ+OJSGWnu0gRpyyZXhH8izOOd7vi3n/9MlEO9URloEBGmeSByuXWSXCNJW5Sjiu9VlipCgW1OrgRQ0DEPAuZCE5tOYVlGot0HZpTIWPaLp8kLwbjaU4dtPrz2GYpnlJc3VruYzCarpKEieT/jaWGo5rt46oPbevQqwJSWHffp3RHMPoYyRbsYtSNgfhxGj4DALxisqykFNrmmgWtmAIulkXCuOGx9CFhCb1KxjAYlX2rNE+cwYdzmLiCWSBfsMbcFoxsISKuVRBPj3T36RsI0EC01dAeu0BaGkWVv8MYVSZgcYjsx333NPULm3+YNMJ+AtuA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GV2P250MB0825.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:aa::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Wed, 9 Nov 2022 14:41:09 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::9587:72b8:e3ec:c4fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::9587:72b8:e3ec:c4fe%6]) with mapi id 15.20.5791.027; Wed, 9 Nov 2022 14:41:09 +0000 Message-ID: Date: Wed, 9 Nov 2022 15:41:24 +0100 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [6YWNL1Db+Pk05HQg0IcX1UdRO6NoTHZne3MeHpJUxu8=] X-ClientProxiedBy: AS8PR07CA0034.eurprd07.prod.outlook.com (2603:10a6:20b:459::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GV2P250MB0825:EE_ X-MS-Office365-Filtering-Correlation-Id: 676e9e76-ded4-4347-f4db-08dac2607109 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Cun4uA/sQVS0qjWjyaFbSxArawpDgYP7v05wu1V1Y1VupgcMipOOkenMem9Nkp8rF5StG62AECFjTARebixoudppfNRKa/S5yr4a1EMRIDsA0ALgyBJIW4IXBRsRyPhJ0Lfn8PjoftQ1H3YM5wODqZEntliDUOg+gVs3rsGL/X/smnWpX2kFFiwaq5ehpZGBzE3qwPjdhY7vF+vzRLqRc/kKf4Jg++F0OFTiTpwE7XSdsXPwXUnNeRXL6knlJdIKPXCVIkR1lA9r5j3AiWvuKvUsufw9znDLoCqcJZHvv5g1aicWPCm4eiCMyjt1wMiIDHSz107S0QSvmX19GVsyTWPF6QPnvR2E5Z0v8+UXN/NpxGVLbZyWZ+pXu0vPid/Y2LidK9Nna/qWqoBCsILle2re+UqsMAuZAlcHYOi5Dr23ovSe+g6PtFk1sCKJHHpe2xJBaehAcNSpD2WB+PIWRSiU0Sa8B0NMuA9Qgvbr8hPzaKxgTNbuhIt2NSpTgLpFDSJUtP8WV0yijHyQ8EljU95zcBcYHTbOHC8WPKUcR8NKOKkGeLFy/2LcAi/OqlgM6U1qmaltf//4fbcJ5jLREuNNTwPVpK5LFpF9lrksnAqvH/wDqqt+I/ltrVANpS4sq+U/jJehfQa78y/RXwUCms+Ixdh8L/ZeJWIU75racGqpMQsDOVH9aYkccj8YHxPv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZTZkN29vNHJ6cjRNSWhtK281RHA0MCtyMUV2MU53d09QVXJybzB2bDJCZ042?= =?utf-8?B?bUxTbjA1K3RNMlNkb2tJWUsrakNiR3EyOGJUcmxmckVEQXR5bmh3eld3UXl5?= =?utf-8?B?SHdCUG9XZmZrNmwzcTVlOGo2dXNsSzk2T0g3R1ZrMEk2ZzFkQU1uUVNyYjRC?= =?utf-8?B?MzM3SGVMK2lpY0dPK0tqN3UwK3drNzRYYytTMmdGdS8yVmFhOW83QkhXdnRn?= =?utf-8?B?TGlablc5bDdUUXVNT0Jmcm44bHByNkpKNEhWRGRUdkl6OElLVml4V1lCdUg5?= =?utf-8?B?aStoMTFONTJLR3R6RDBTa1hhYUtORDhQVS9nYkp5OWpPRCtoMFZCaTlmT1ha?= =?utf-8?B?a0hLV05XbzdFb1RkNmtld21QcTEzKzB6T0lHRDArQnZwUVB1a0REMFllejN5?= =?utf-8?B?eEh0aWVVYlVCWm8zdmxMdGZBUmVYZHB5cFhEREIxQStieW96ZmNNNU9TbUo0?= =?utf-8?B?R0h4NjJ1WEU2OXhnK3hMalNrU01Wb3Iwcjd4R2RyQmZRaHhHaFpUaWdTUm9L?= =?utf-8?B?Z2szdXJWZE5ZeThxNVBJUDZESXdtSnpyNDcyZnFvdHAxYUhqV1FaRHFOWUJs?= =?utf-8?B?cEQ4NXJXUHN6OFQ5SHdwTlNqVUs2RXJVZGFlQ0tGa09QeUlZaGZpZ1h0NzlT?= =?utf-8?B?Q1ZWSG10SFRjRzhSTEs1YTJ2Nk5PeExibWJ0Nkw1OUdrWTRDc0hENDRWbC9I?= =?utf-8?B?ODlINnZESEtLNkZlUytFUW9HVVJGWTFZWjk5NTJmdHg4RXoxdHNxUHlkTWhy?= =?utf-8?B?SzN6T0ZsOTU1RWhBWHdkcHJCTzJVbXNRNUE3eGVNMXZDekUzUEJxSERYZFQw?= =?utf-8?B?OGMranBkWExNUVd6eS9UbzFmOWJtdjlUaG5sVUc3VVRhaThlVk5wKys4NmVz?= =?utf-8?B?d0lpRnF2L2JSSGRQTFpSMGxoT0VIZlgza25MbWtvQUNLWlJCblo3OThSSy8x?= =?utf-8?B?Q29XUGhBUVo3QUorR2lZNEdUSnUxOVhBNzRWYVhJOU10aVJvUE9lL0NRN2M0?= =?utf-8?B?WjlXdFcvSnhZSzZoS1NGd1BBS2NyZEgvbmNWN21kdjV1Q3o3UDJIMW10ZzZW?= =?utf-8?B?R2R2SVNZaHBrcVVDL0FXL1lrNm5rdHlWdnlmbEtGOFFkUnZDMnd6Y1F2UkZP?= =?utf-8?B?ZXM2Zkw1aE9xZjl6VzlSMUI1ZlBOY0lHR2I5aXNFbHh4d1pyZXZQZ3dPaW1J?= =?utf-8?B?aSs4dXpJTjBhbXRqa3dlUGw3V0VzbDcxaXdHVUg3c1JYaXd6bWQ4SnVYTmVp?= =?utf-8?B?eDNHdGkwUEdISUkvdk1sbTNQNVpmbTRDK2F6S0llaXFCbitEaTBBYWlaRk0w?= =?utf-8?B?NFo2YnZLVWR3WEtkL2hlRkFyOGpVakxRNm1TczgxWGNWOXZTMTM3Y1djY1Jm?= =?utf-8?B?Qi96bFc2eEJOZENzcE92eTg5dWM1MHhyK3F5clhDL2dhbTc4dHZnVk1ybFVF?= =?utf-8?B?Y1Y2anFwb0FzVnFxRzJyMWxhRGRXVERwemR4aWZCcUdHMDQ2VWlXOE1aUlVk?= =?utf-8?B?eEhWbTRaUHhPN0hsWE5VSWdqTVVYZ3VKZllUVU42NjRWaVRaRGNWakJncHdF?= =?utf-8?B?a3lBa0VwM1RyNUQvNHZ1UEJXT1c3Qit6L1hra21YYlZLdjBPWkJldUduWGtG?= =?utf-8?B?cHFGMnJuejJmaXA0d28zUUtSSUhEUE9QeDRNQVUvNkFJMnUwZFAwc0hGREND?= =?utf-8?B?aXBEanFuU0xQck5vZTJSNk9lNjVmcTcwM0dIQjBCdE16WkNGKzdtRTlpbmJs?= =?utf-8?Q?p0IuWl8lsVdk3Smi4Xc18w63Asb8c9UamFIz/1T?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 676e9e76-ded4-4347-f4db-08dac2607109 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2022 14:41:09.8753 (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: GV2P250MB0825 Subject: Re: [FFmpeg-devel] [PATCH 1/5] avcodec/clearvideo: Remove unnecessary level parameter 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/clearvideo.c | 23 +++++++++++------------ > 1 file changed, 11 insertions(+), 12 deletions(-) > > diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c > index 4d6549560b..82311bc645 100644 > --- a/libavcodec/clearvideo.c > +++ b/libavcodec/clearvideo.c > @@ -362,19 +362,18 @@ static void mvi_update_row(MVInfo *mvi) > } > } > > -static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc, int level) > +static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc) > { > TileInfo *ti; > int i, flags = 0; > int16_t bias = 0; > MV mv = { 0 }; > > - if (lc[level].flags_cb.table) { > - flags = get_vlc2(gb, lc[level].flags_cb.table, CLV_VLC_BITS, 2); > - } > + if (lc->flags_cb.table) > + flags = get_vlc2(gb, lc->flags_cb.table, CLV_VLC_BITS, 2); > > - if (lc[level].mv_cb.table) { > - uint16_t mv_code = get_vlc2(gb, lc[level].mv_cb.table, CLV_VLC_BITS, 2); > + if (lc->mv_cb.table) { > + uint16_t mv_code = get_vlc2(gb, lc->mv_cb.table, CLV_VLC_BITS, 2); > > if (mv_code != MV_ESC) { > mv.x = (int8_t)(mv_code & 0xff); > @@ -385,8 +384,8 @@ static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc, int l > } > } > > - if (lc[level].bias_cb.table) { > - uint16_t bias_val = get_vlc2(gb, lc[level].bias_cb.table, CLV_VLC_BITS, 2); > + if (lc->bias_cb.table) { > + uint16_t bias_val = get_vlc2(gb, lc->bias_cb.table, CLV_VLC_BITS, 2); > > if (bias_val != BIAS_ESC) { > bias = (int16_t)(bias_val); > @@ -406,7 +405,7 @@ static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc, int l > if (ti->flags) { > for (i = 0; i < 4; i++) { > if (ti->flags & (1 << i)) { > - TileInfo *subti = decode_tile_info(gb, lc, level + 1); > + TileInfo *subti = decode_tile_info(gb, lc + 1); > ti->child[i] = subti; > } > } > @@ -599,7 +598,7 @@ static int clv_decode_frame(AVCodecContext *avctx, AVFrame *rframe, > TileInfo *tile; > MV mv, cmv; > > - tile = decode_tile_info(&c->gb, &lev[0], 0); // Y > + tile = decode_tile_info(&c->gb, &lev[0]); // Y > if (!tile) > return AVERROR(ENOMEM); > mv = mvi_predict(&c->mvi, i, j, tile->mv); > @@ -614,14 +613,14 @@ static int clv_decode_frame(AVCodecContext *avctx, AVFrame *rframe, > cmv.x /= 2; > cmv.y /= 2; > av_freep(&tile); > - tile = decode_tile_info(&c->gb, &lev[4], 0); // U > + tile = decode_tile_info(&c->gb, &lev[4]); // U > if (!tile) > return AVERROR(ENOMEM); > ret = restore_tree(avctx, c->pic, c->prev, 1, x, y, size, tile, cmv); > if (ret < 0) > mb_ret = ret; > av_freep(&tile); > - tile = decode_tile_info(&c->gb, &lev[7], 0); // V > + tile = decode_tile_info(&c->gb, &lev[7]); // V > if (!tile) > return AVERROR(ENOMEM); > ret = restore_tree(avctx, c->pic, c->prev, 2, x, y, size, tile, cmv); Will apply this patchset tomorrow unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".