From patchwork Tue Feb 1 13:06:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34014 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp608277iov; Tue, 1 Feb 2022 05:17:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJzwt7eg6kXT3lYMTF37Qb/iz9gC7o1yc/EEuovZ6y1zb5+f1VgRnm43tkTN/EoGIqbVuTD9 X-Received: by 2002:a17:907:72c6:: with SMTP id du6mr21119452ejc.220.1643721420506; Tue, 01 Feb 2022 05:17:00 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hb16si9566469ejc.475.2022.02.01.05.16.56; Tue, 01 Feb 2022 05:17:00 -0800 (PST) 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=bJ3ZtZv4; 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 5C3EE68B3AB; Tue, 1 Feb 2022 15:08:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075035.outbound.protection.outlook.com [40.92.75.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47A2568B388 for ; Tue, 1 Feb 2022 15:08:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J1qttCI+MXRAARvlk4j5i1/OS+IFwg6Q2HmbtNw3blb+HEOgfpyJJpEoud6y99ZJvUAIvq1XRUy5gmX34PQXLTS4d5JE9B85wd2ujqH7kRtTVLUArxHue4HlDazEaaTbol2hgYV6hWtREmPWBtP7FfVFM1Qz12rUWi6ZgirTkyAHFVFrIfaZsdkoBzcjVs/39LHaDd+z4SXp/IoqGGBUCzbG7qQs7f1THdLEyKIKZVSPAoapACynsePZV0ckJqANv/75M2M21JepMCTP+IQzMDhoUdRUt85EJMDB7FcyGcw/wSHCvXqCDEUOfcAZXPHR97TA6RCD96o3o0CLi5rLhg== 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=ZEP255T1CHixR5R4aW2jb7Xrz6eoC13fvPp21eI5zVI=; b=KUBwGA3k9zR3pwx1bl7WtOpBbpOMCEoCfHBQLr8q+ERcz7i2yDL+g9LP5/xsEGCC+ShWktWPpXscARNMJB4DxLwvxs1N3PczGl1OG342vBJgYSqAsft9ul+SeCR9TqOrwad+lZ26KueB6EZZZHYvCrOzO8N6qOCIYIrhFpthlt1B83+IHyMaTbbAA7j/Kangkk41eDYTRvr7md3ZWDDm2yol+zJVdyKCXXowsIxKMw+Zrz8JPnPaAy2P1euKTfdKIuk9jm04c3Gs35W3XDlKbvT/rs07f6UJG5zT75dYEUTulJbwkhz9p501lHqD6KTZNJBXTsep5yop5CJmeeZjzg== 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=ZEP255T1CHixR5R4aW2jb7Xrz6eoC13fvPp21eI5zVI=; b=bJ3ZtZv4e52DwfLlzCES5I8q2X0SoqwR8l6iZFndfZ1e6ErYl7RMoJzmy4flA92Xk5jMjiGoBmxYsF9obX//QBAbgd5b6A9erCUVoxE3yLFBZhOX1u+Ztlu6ISnDnmZ5ZCge1iNbwf1+wJRL013tHucB7wf7I5/s2D/nXJBhXQR0x19ksRkrrG+y6ClxMagbuhGdG24IYQer71RdMN184LjHUS3v+fq2bS7spx/1KtaOqNgT8SERUXSeGQ+dcsLXPCYmNxj2HUf0lcfG7qkzMJbIXtNvkJ9xh42iRt8ELaGwAM9B4rjAwEFIBjC8T+O/+fq8/q9K2XrXNfAFvRX28A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by HE1PR0301MB2330.eurprd03.prod.outlook.com (2603:10a6:3:73::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Tue, 1 Feb 2022 13:08:36 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.011; Tue, 1 Feb 2022 13:08:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:38 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [gcytkyEJ0XpqncPeJtB19fiI5VZaurTH] X-ClientProxiedBy: AM6P195CA0092.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220201130706.1420875-40-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4f87cdba-502d-4570-a945-08d9e583e5f3 X-MS-TrafficTypeDiagnostic: HE1PR0301MB2330:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z4Kg0DmQdxLfW7VjIJT2igdPSd5MRveg89kAeRRoPB8oo0DU1RifJ9mnJtHQ6PnKqJfHOLSnGwfasifR6haGqv0AaFyGSvCPMmUfTQU4aUI44mcnjQObJ5SAEihrNrtKasICuaFcQSH+h74Mh8Yqo4MdLer90EvY5Jazi70lYrJoH43aDMrt87yAadtdKylhbQ5kNSBM8VdbXyNkyXPk++EEiUDXPbhUOKfNDufTDx9TcH7We0r11OMg/tH8VvFpHBr2Ugo1aXuoPBI4zQRD+TY83p1BTdds6VqZRmbpe2ZTSw5rKSqENnxDUPWuneQTHiOT5AmYkIjt/MWrYK8GPAb9wkDV540Z3YTr1uXz2aGq4ywVGVPPPMpoVGhluUKps9Q/xQKYBwiSj7kbwsA0ReNMOtxBffykv4otETZW6fS9kMyjQEmdHrFtdrq7DS3TPMPVmlUYQ7Qy3uqUXTrOQ891H8qRAYda9uoLdQEYunp7vEw9FFIADj19XINKTF/57hNFf1MKyQohn89Ecn8GTlrdvZNMjUm6qJszbxKqA4lzugyzpNhh2CKWB9zk8X9M X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wpLY5qlUGxBXJ0vJwTmqgXopf3E2kTczejTrgSl4VPFD7xALX7/rfKx8vCwSFhaXGSLsyvAbznP2xSvPkUkLOf6Gk7C0AwmzJM9HEjtdf6snBIgoImj32Wy5ZsgbKM14qseTgzuMwfBaJIk0E9Oy48cO97h5Gj8pSOtdnsZwa/rNiCmeO9Kxpdc+sDozew8SiXWglIOY3K8kIM4XSlg9o5lBAg7tG9Nub+1uGsED1S0rkrlCaBrw4BVfWr/A4qDXQgr0zySFW6KjoghPl+2Os6I7U+rKi+WLthRkMt1RmCsqcO6lN92NQA+gPIZ15X0BVxSEsZPNiNIdNBq4mHVPjW0d3mfOpJOsxj5Qc6y+KBrbkZeGoYEsFFdwYM/wQ6k5imqyympHQQAAeVZTVuiKfRaYiqTC4cr+4I6a6KXX283mijDHuqHGdnDnfTlpgJUZkVlvL0z1Tz84D4FtWuz4N/Znn9B0mhVF4OP6XpQwe4AldqF2ktXwaQpvoZh6WCNhvQpbDhgHeJ8cjI2xH8DbmtBQPNN/DizQql7OOebPMB/UucQ+bq5HVmBnH72DF8cverCxCsprwj9lD7Ee8IlicjwXMTMMKTTgMoGVUL5fTtGRYotRq7xOggM24X9WAZ1DlIcqvQmLpg09WnaGno16MBzOXrLpSUUd9EsotTLc8xgf6WAMvwTLDCjPHTthxWxiRIWytE/AHkhLEjE8QzOpgeLMndf3s6QcEhzQiFeNnovuM7Rg2wUITFFagt+9jq4IEojzZcb6eU+N1z8ItH+WSQ23JmUCIJqKeo8N9G6uDwY0hZxdiDcf7P+TmIeRLPnNFZj4LsKRzNE3GW53Uo87nQkV9YiLzkkD1nwWCa+O+r9G9Yp0scwxc6vE04V8qmhUZI1yTjHvhT3HewGi2O3qt+zPxjNgw2ETqmAQ4GOpvZqclnKSNcaeoqinx8BonGAXcLngTeac4Co6p8qKInMACA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f87cdba-502d-4570-a945-08d9e583e5f3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 13:08:11.2156 (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: HE1PR0301MB2330 Subject: [FFmpeg-devel] [PATCH v2 41/69] avcodec/mpegvideo_enc: Remove unused parameter from encode_mb_hq() 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: 50zUXxYQjpEW Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 5b6f5211cc..ab49705823 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2497,7 +2497,7 @@ static inline void copy_context_after_encode(MPVEncContext *d, d->esc3_level_length= s->esc3_level_length; } -static inline void encode_mb_hq(MPVEncContext *s, MPVEncContext *backup, MPVEncContext *best, int type, +static inline void encode_mb_hq(MPVEncContext *s, MPVEncContext *backup, MPVEncContext *best, PutBitContext pb[2], PutBitContext pb2[2], PutBitContext tex_pb[2], int *dmin, int *next_block, int motion_x, int motion_y) { @@ -2983,7 +2983,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mb_intra= 0; s->mv[0][0][0] = s->p_mv_table[xy][0]; s->mv[0][0][1] = s->p_mv_table[xy][1]; - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); } if(mb_type&CANDIDATE_MB_TYPE_INTER_I){ @@ -2995,7 +2995,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0]; s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1]; } - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER_I, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, 0, 0); } if(mb_type&CANDIDATE_MB_TYPE_SKIPPED){ @@ -3004,7 +3004,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mb_intra= 0; s->mv[0][0][0] = 0; s->mv[0][0][1] = 0; - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_SKIPPED, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); } if(mb_type&CANDIDATE_MB_TYPE_INTER4V){ @@ -3015,7 +3015,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mv[0][i][0] = s->current_picture.motion_val[0][s->block_index[i]][0]; s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1]; } - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER4V, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, 0, 0); } if(mb_type&CANDIDATE_MB_TYPE_FORWARD){ @@ -3024,7 +3024,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mb_intra= 0; s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); } if(mb_type&CANDIDATE_MB_TYPE_BACKWARD){ @@ -3033,7 +3033,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mb_intra= 0; s->mv[1][0][0] = s->b_back_mv_table[xy][0]; s->mv[1][0][1] = s->b_back_mv_table[xy][1]; - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, s->mv[1][0][0], s->mv[1][0][1]); } if(mb_type&CANDIDATE_MB_TYPE_BIDIR){ @@ -3044,7 +3044,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, 0, 0); } if(mb_type&CANDIDATE_MB_TYPE_FORWARD_I){ @@ -3056,7 +3056,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0]; s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1]; } - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD_I, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, 0, 0); } if(mb_type&CANDIDATE_MB_TYPE_BACKWARD_I){ @@ -3068,7 +3068,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0]; s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1]; } - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD_I, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, 0, 0); } if(mb_type&CANDIDATE_MB_TYPE_BIDIR_I){ @@ -3082,7 +3082,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1]; } } - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR_I, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, 0, 0); } if(mb_type&CANDIDATE_MB_TYPE_INTRA){ @@ -3091,7 +3091,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mb_intra= 1; s->mv[0][0][0] = 0; s->mv[0][0][1] = 0; - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTRA, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, 0, 0); if(s->h263_pred || s->h263_aic){ if(best_s.mb_intra) @@ -3135,7 +3135,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ } } - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER /* wrong but unused */, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, s->mv[mvdir][0][0], s->mv[mvdir][0][1]); if(best_s.qscale != qp){ if(storecoefs){ @@ -3156,7 +3156,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; s->mb_intra= 0; ff_mpeg4_set_direct_mv(s, mx, my); - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_DIRECT, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, mx, my); } if(CONFIG_MPEG4_ENCODER && mb_type&CANDIDATE_MB_TYPE_DIRECT0){ @@ -3164,7 +3164,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; s->mb_intra= 0; ff_mpeg4_set_direct_mv(s, 0, 0); - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_DIRECT, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, 0, 0); } if (!best_s.mb_intra && s->mpv_flags & FF_MPV_FLAG_SKIP_RD) { @@ -3194,7 +3194,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->mv[1][0][1] = best_s.mv[1][0][1];*/ backup_s.dquant= 0; s->skipdct=1; - encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER /* wrong but unused */, pb, pb2, tex_pb, + encode_mb_hq(s, &backup_s, &best_s, pb, pb2, tex_pb, &dmin, &next_block, mx, my); s->skipdct=0; }