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 87B3E444E1 for ; Thu, 13 Oct 2022 17:26:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B50D668BC2F; Thu, 13 Oct 2022 20:25:57 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2044.outbound.protection.outlook.com [40.92.91.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 431E268BD38 for ; Thu, 13 Oct 2022 20:25:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hXLDjXIuOSl0ZQErhDIHsOdRoFn5lAKCaIValerMccUbMSHT3BZIKdrT+rps3nmr8J1wcdSTCtSMtN9DtssdZ2weuDsCvk/Oqww7Kxru9exzx8u9EBpuemnyfk2GdED76iP1uK+2O9c+bIPMa+iepvmI1XjbzRj/Z5q6y2SPHO9kCZnmMGnGxOHFgfT833f3Mhf/jLDVlE+dowkmthgttWN0pBIhZSYdOWKMxWWCpmWqiq/tBF/L9iDSP2CUhZ0BsHO+j45/qp395tfZVO0OyYYO0sTp7M0Hp5tvu+rb3yRxPm9lTHZeyRIgbIk8dTBxCm40U+6/dYE4Hvhuf7Jvwg== 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=Fs6irGTk4OglKEL/G8v0USzwifSZ9EFnM2UbwHzacwU=; b=Zf7xwjcs6rYoxYWNOwVhn6pc53C9sQ3Q/lxCroJV7jMystkRaFGf69ze4A81TpAPqtvJLnUJH9aiGwN62NwQVqiftlbOrLF2CJ6HGXR0+uO9PH/8d2agnMCOiavDGkPFcEheGbjVP5+pb9whdTUDpl6Pam17S2CJgCFNop1e0QFyHgdSuxWZm3NUYHiwmzVFPInfCG5X950djpHn66Gof1lou3L/1ybFpkL4ueC5d0+vvr4Jao+Vioaj2vG6xS4LkOxv9pUVIdOU0mG7Fbhn4k4eOiMa9mhTn86W0kXg97m2jh7nKn2Y0zaGUZ6gt8SdhZaI3p0h4Av+xav5OmiCqw== 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=Fs6irGTk4OglKEL/G8v0USzwifSZ9EFnM2UbwHzacwU=; b=GEGDlbwCwizK8ArzmSUycuB7cyHveurl6HBU7S11xela7wMc64/yyeS/MhlqTSryOMJijBbwhxCAfbbAOAz3kw2kTfYMQvAokFRC+yBPAmUanZAr8K71luLckrMN9rejGUciGIkU/FxAOR83OGMlPVSpgjubYlLJkIGfJyHPEBFK4nqI/Oiz972Qe246JjSZ3B1yChQnAFoGiXe5HtBhBYxqFR87GSBjmmRywLV5ml7ynHN6otD8jVWdIsq5tJgOCDG22PIL0/63HJ+42duPgARphz6iAbj5wdzds2HiW3uPhFFoFapzjTaZ+LAoX/kiMVeJ+o9ZffqGlvDlR3szww== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GV2P250MB0756.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:a9::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Thu, 13 Oct 2022 17:25:49 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Thu, 13 Oct 2022 17:25:49 +0000 Message-ID: Date: Thu, 13 Oct 2022 19:25:58 +0200 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [5qyBe0J4rRvvRDlhDoSEyR27tETreGmX] X-ClientProxiedBy: AM6P194CA0075.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::16) 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_|GV2P250MB0756:EE_ X-MS-Office365-Filtering-Correlation-Id: 89a9d548-5aed-4a72-15c8-08daad3ff885 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6Dz3mP7Em+ghlNKthDqIa8xDqqxVByZxzkFc4yJ8NVbB1GterO7qSDO500SOT9vBKEDBO6wxafAcxM0cKl0Ce4I+IuWRlisJOWRz3k8E8yMVfzMRIMKg1QLBs1zDQ/ojdckYRo0wZyQghikhGDRmAZOhmchuyGqfRJPIkDaQ8uGlkXbypPCpKI30ZKRIFqPrzldkp+5nVe++356d0qA12KlRhAvoY6U40esxlmGypAmWI7r0oY0S6aiGG5fTJ1lpCMZO0a6j0bFp2cBdvjRRa4dH40huUkyGYtz4HD/geAzGL0ZJCN3WI5XhuZMzsMtM1YzNliRZRq4lwghEBWb5PMVGV2sxXO1tTWZ5FW4Ezr10ZB9fbASEGrZqnEUAr77rsNcgZZtvPqwh6OLVFsGVpZWV7HmmPv/tsiQQZdbpAd6m7W/3rZVYbND40DmtTELjIXebYu5pNbv5XqMzU2kjlRDhQCzEJLuJbIQ9YSPYWqn3DZLx7/qcWv0dBzwGUoMSzm8ngimVT9AJNnhvHRut6cN7QnkOpoVD+ZpzC9O6nBlFmaYCJzTKbs2iPYXZmxStC63AgOp56wrU0qY0PD6xZdiUOn2wM6zFt7HT1Vuq7Vop8sSzwiE8IpV3AgdfX9EqELx+2gs06rB6He63vHVRNThpMLEGi1bYUup3nlF7yuqkXK4fU/JlsrIhV9gk8Zj2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bVEyWlRaakdOcWYwbktCWWRwK2pqR2pwVVoyRnJYZ1BOOS9tUVNTQkhPNFZC?= =?utf-8?B?RURNdGdDNWFpN2ZHZWE4ODhwWDQ3bzhNcWRFSmNLT3hKY3BNWFg5TE9icmpO?= =?utf-8?B?WEJpWnh0Smg5cERFbDRTQytOamN1ZVVTcVFtVkJQdVlFYkQ0M2xiVWNKV3lS?= =?utf-8?B?RE4zZFJLYnJNaXE0aGFFN1lvSTJxN1RlQS9RN0lhMFVOZlFCYUFNanpDczB6?= =?utf-8?B?SmRIRUg2VjRXZnlOUXdnTVZ1TlZzNGdTZTZrM3VzazZ3aGRjRTdiY1RBbXdw?= =?utf-8?B?aTkveXNibHd6Tk5pODNwcCtnbmtlNGhCTHU1SEh5eFE4VVA0eU5HYXZEYWJi?= =?utf-8?B?YmpsMmVVN3R5K0xOZkp4eE1VVm5lejNYcmV5SDl1VGN3a0s0WG1UbU8yeGtK?= =?utf-8?B?eDFsdmh0UGt4bHVhWVZzMjk3QzFmcldZSlUrOFMvOUFDa2REV3N5ZzNBeC82?= =?utf-8?B?MWVCQzBLK083em9yMTAzd2RKTTE5Mmh0dllRdDlMVXFLVEtsbXhQSldUVWdQ?= =?utf-8?B?TXdUMElMdDQ4LytKZnBQZ1dlSWxyL05tMVh1UVErS3pTRStqOEdlL0VuQUxy?= =?utf-8?B?TjN3emtOMExIVmNpQmUwc0Y3bGJlSGVqQkpuTVdTaS8xWmw5UFRXNlVDY3RG?= =?utf-8?B?amxxWllaT3l5QUU3bWt5ck1pUFZvTGlkK0Z1ZU1uZ1YxR2M4MnRyd1JBOXFu?= =?utf-8?B?VlJoYUZ3TVVmTlBzU1BET0JaSXhzVE4vYlpEM2FuekVOdTlpRFBDMEYrckY1?= =?utf-8?B?TVdIMXI4cmRGT3FPVytZMUJNZmUvcFVneUpuejdpRmJiRzVPOXEzYmlsbEhT?= =?utf-8?B?ZThkQS9xbDEyaVpaRThYSjNHb2JIaXdxS0p2WXFMc2xpeVp1MjRaaWdqUWpZ?= =?utf-8?B?Ty9BTGV4V0xkZG5weGMzTTJySXNCaVFSRjlkZURjN052ZWVNalgzVm94bTM5?= =?utf-8?B?R2Y4dFRNOE1ZNVNQSmdoeVd1T0JEeWh2SFB4KzJLYnJzZ3o5bENxSmlQOC8z?= =?utf-8?B?YitNOUxmRnZ3YTJSRHV2ekFCeVdFcWxXYTk3QmhjZ3F3SkkxYzkva3VlK3dm?= =?utf-8?B?MWRrWklEYkRJbHZtMVRNQUZCMG5IM2lxTFlLWmdQTW5JTzlYU3NlQ1huOUts?= =?utf-8?B?V0J6WnhXTEl2dXhrcTVlQ2lqQmJ3UjU1dDkrQzlhckZMVjd3VzBJdTVDeTVB?= =?utf-8?B?ekVDNlZTV1lweWtLS21UZEV5b1UxUml4aHV5Q21jY25QYUxPK1ZQeThwejMr?= =?utf-8?B?RWhJSE82VUxOdHF5dktxK1JobDNrbWl6aUQyNlNaay85dFUySVVteFdSNy8x?= =?utf-8?B?ZkZTUjFBOHNZQW9xbEM5WWs1V2lnZFRIZWVNQnZBNmE2R1ZOWHpJV0VvS1Vo?= =?utf-8?B?QWx3ck42V1BYWDA0OUdRQVRRTEJPNHdza3VJNEFNbUwwWDhENGNBdFNEZjZl?= =?utf-8?B?WTgrV0pkNkFSbGw4aFozVGsrK21VQ3hNc2dONnBOQUE3NnVxSVBSdm5pYnov?= =?utf-8?B?NmwwSElTdHlIR3VyNXB0eXRkNUp4d2M2ZVMvSjY5bGZNUnRFUDd4aWRvT3h1?= =?utf-8?B?QkNJdWNRTzI2WTNBZUpicDBKL2hmM1RUQlArTmtpSXRLdnkzcUFaZ3BvV2la?= =?utf-8?B?cm5ETFlSTW96WWhkK3YrVm5MWmJicEE4WTVOdHE5WTRLVHBVWlBqVjM1V0Vy?= =?utf-8?B?aDNNNkhJdDc0bnBncS8vRmdoUGp2T3FKUXJrK1VyY0d4ei94bDZyVWNZR1Jr?= =?utf-8?Q?H45L6CIB5tNR3XmND2Q4NAxWd9Ps4lnbQ5KofXU?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89a9d548-5aed-4a72-15c8-08daad3ff885 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2022 17:25:49.3487 (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: GV2P250MB0756 Subject: Re: [FFmpeg-devel] [PATCH 1/4] avcodec/svq1enc: Inline constants 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/svq1.h | 7 +++++++ > libavcodec/svq1enc.c | 13 +++++-------- > 2 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/libavcodec/svq1.h b/libavcodec/svq1.h > index 0ebc73a933..af8a7dfa04 100644 > --- a/libavcodec/svq1.h > +++ b/libavcodec/svq1.h > @@ -42,6 +42,13 @@ > #define SVQ1_BLOCK_INTER_4V 2 > #define SVQ1_BLOCK_INTRA 3 > > +#define SVQ1_BLOCK_SKIP_CODE 1 > +#define SVQ1_BLOCK_SKIP_LEN 1 > +#define SVQ1_BLOCK_INTER_CODE 1 > +#define SVQ1_BLOCK_INTER_LEN 2 > +#define SVQ1_BLOCK_INTRA_CODE 0 > +#define SVQ1_BLOCK_INTRA_LEN 3 > + > extern const int8_t *const ff_svq1_inter_codebooks[6]; > extern const int8_t *const ff_svq1_intra_codebooks[6]; > > diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c > index ef6655c2f7..79e9e578ac 100644 > --- a/libavcodec/svq1enc.c > +++ b/libavcodec/svq1enc.c > @@ -390,9 +390,8 @@ static int svq1_encode_plane(SVQ1EncContext *s, int plane, > init_put_bits(&s->reorder_pb[i], reorder_buffer[0][i], > 7 * 32); > if (s->pict_type == AV_PICTURE_TYPE_P) { > - const uint8_t *vlc = ff_svq1_block_type_vlc[SVQ1_BLOCK_INTRA]; > - put_bits(&s->reorder_pb[5], vlc[1], vlc[0]); > - score[0] = vlc[1] * lambda; > + put_bits(&s->reorder_pb[5], SVQ1_BLOCK_INTRA_LEN, SVQ1_BLOCK_INTRA_CODE); > + score[0] = SVQ1_BLOCK_INTRA_LEN * lambda; > } > score[0] += encode_block(s, src + 16 * x, NULL, temp, stride, > 5, 64, lambda, 1); > @@ -406,7 +405,6 @@ static int svq1_encode_plane(SVQ1EncContext *s, int plane, > best = 0; > > if (s->pict_type == AV_PICTURE_TYPE_P) { > - const uint8_t *vlc = ff_svq1_block_type_vlc[SVQ1_BLOCK_INTER]; > int mx, my, pred_x, pred_y, dxy; > int16_t *motion_ptr; > > @@ -417,7 +415,7 @@ static int svq1_encode_plane(SVQ1EncContext *s, int plane, > init_put_bits(&s->reorder_pb[i], reorder_buffer[1][i], > 7 * 32); > > - put_bits(&s->reorder_pb[5], vlc[1], vlc[0]); > + put_bits(&s->reorder_pb[5], SVQ1_BLOCK_INTER_LEN, SVQ1_BLOCK_INTER_CODE); > > s->m.pb = s->reorder_pb[5]; > mx = motion_ptr[0]; > @@ -442,14 +440,13 @@ static int svq1_encode_plane(SVQ1EncContext *s, int plane, > decoded, stride, 5, 64, lambda, 0); > best = score[1] <= score[0]; > > - vlc = ff_svq1_block_type_vlc[SVQ1_BLOCK_SKIP]; > score[2] = s->mecc.sse[0](NULL, src + 16 * x, ref, > stride, 16); > - score[2] += vlc[1] * lambda; > + score[2] += SVQ1_BLOCK_SKIP_LEN * lambda; > if (score[2] < score[best] && mx == 0 && my == 0) { > best = 2; > s->hdsp.put_pixels_tab[0][0](decoded, ref, stride, 16); > - put_bits(&s->pb, vlc[1], vlc[0]); > + put_bits(&s->pb, SVQ1_BLOCK_SKIP_LEN, SVQ1_BLOCK_SKIP_CODE); > } > } > 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".