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 36A514073C for ; Sun, 30 Jan 2022 06:33:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15E1968B2D3; Sun, 30 Jan 2022 08:29:10 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2056.outbound.protection.outlook.com [40.92.91.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A184768B2D0 for ; Sun, 30 Jan 2022 08:29:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oAvPLjwNPSJxp+xZlBUyRBt9uSWwOImdeEpLkY7FzWplGZsYtTs4oGCu4Frpc/vjIPAEeVVmRk3H3csJh3Uv7/GDk8AYfl5D/BwhsisuWSursYGGiyzCN5YWkEhr09e4fdWuwrV8S+aaVs18LusaCepwhl+BOytBDgpUpNxABljEQBj5PleYRexjghVAkzs5aHwMoCz9h4j3HCeyCYbRmP+aiWAaAeqxVk28AK1kHMpDmVVhTpjV1HlqaDqDOVZULPCUAt1DqSmw8ymjJUZNr1wk5ZHjglz1BACL//YVeIJ1oy0bvaCQQeGSlzzxvZE6EAJ7GUCIv+vnwZF7N479gg== 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=sRbT514/alNI/Ix2LDcr0FvrHvazobSIsnizkBPrU/c=; b=PHAFPKyh79kYUd59VbsxdODv1cSfmmHJxP2+nJDkevQv//p5Tlnfev8LTjfzzkC6DudZH4X6u1RWB82lHmNjz0Er47m0l+eRCaVSEfv5DL7wynj+m5JCiAMbN7QeG/75jvI6ISg1t0kA87X81V2zXgwNc9/D4re9kJLy4OdSurkgPpmaKpdZwTk6Vf1Q6xBIeCYuX9e9hVVdbzCSJ4cEoJsQbTKFD3QCSc3yz4xTlhgh0LrUgOCIJuDIpOYo12gIigj4casfGqA1+v3AwMIA+pNc7Nc5LI6I3KuS1UFGXrbJlffZqwgtcyTvJq1Lt23JD3YZWar+VZy0r5End2JnZA== 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=sRbT514/alNI/Ix2LDcr0FvrHvazobSIsnizkBPrU/c=; b=rcZu+pi1qbslSEZ5XiSkS7E1CCGvqVbWmJ83CZ7y6Nn/v+HVpq1xVL99S5TUQ7Mj9nao4HCd8FTlcyem+FZjU1fCWCgx0PkLbtw+YgQ7fgpc95IxFCD4O2fln4KU/XPgLysHyB74WltikhK+nA/YXBqy/GCoE+ETcT48vdTS5xPMtB1V3O7Rlh6ODVNZpzFewNsf0alXU4pVJaRp+cK27Hkv8s5flA8+AxgDFvBBNpWnG8mfdvIjXBxlPVRElOFv+n7oNz2iUxY1+Ix0cev5PNwlSHekVH1c3MpUfsl4hea26SoDkgxhzG/6UgUF9bnqE6VFlihkyJ35OYMmIpKYLQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB6239.eurprd03.prod.outlook.com (2603:10a6:800:140::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20; Sun, 30 Jan 2022 06:29:07 +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.4930.021; Sun, 30 Jan 2022 06:29:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:39 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [H4VcxxBxEwpIzwdaaYhS8GJy7ws+/CI4] X-ClientProxiedBy: AM6PR10CA0044.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220130062749.936489-30-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e9be91f-f13c-47d0-7d89-08d9e3b9d16b X-MS-TrafficTypeDiagnostic: VI1PR03MB6239:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v3QEoVJIHUidihaujInY++TtJp5HG00zyRduJeaPJyU97uXI2F5oUrDVJDN+9+wwNwp3PBEUJW0a7gkTSLllOxo4ms7Fq41NU269g6AGSj/u4ZeHHFjiv5P/Kjr6GmLzcZ4kGDkEDNIxc2mGRmEKXgpWs+hXWzMFwv6MltmxPYB/MWGgYfwkpnZg2tPMMR+3/H9y4WEl3X65IBJVTKmEKr76U6QwUKqNeUge+WyAXpgJCFXF+NhI8wz+GY4t7EVfnUTfG6PoTSVe4PbyIn5wV3sKwli7rxJVbdDNSgEhyavAgDtU94a4xp6M/nyQKUm/HV/0OGs7G3bVyjiuddrkDtRdrT9gGmwBeBSfhsVerg3Et6RfRqzqryXpL+3qhWyRaLFdIKPP1d2nU9iRR1FO718cDhf9e5sOks5JaI0g13NNkwVMMjiZFpZEWXDfBRW24lPzywt6AJfFj9y50X+e5OjOHCe1TI2wTL00lNJqrsssN+M1R6dRr2NYMep+gngUlFqfKKoUnlguZpAoOtQefYAtVU0WTfYdo2mSPUD75/lEsljTa3H+XgMRLwrv0nTU X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+ZsYVFRgIGqDyZTNTzISQBt6OPl6h0N3FMG84EHyj0UK323JUTRGehQ+f4bb?= =?us-ascii?Q?jDHqLnnmaPYxWSsFTKPndawU7Z/IN2CroiBC0WP6+I/SGqd4oWug3Uqe+dxJ?= =?us-ascii?Q?DxwbvDLQDEYIQyTuTpnK6LOGisFkckZW8M0z4U12Fa7hFHmYuL5182xf6+UN?= =?us-ascii?Q?NVtXeoOMrmJFqFsTn89gK9JUp8R91jSXiUXjyCdRjoUW01QjdMUyDxl6Uww0?= =?us-ascii?Q?WJw725tpD1GXAlUMOxo1BektexbuLXQcwLY6qm2V02CLOAcvjXEx2dMoajOO?= =?us-ascii?Q?fUYIco8LYiGqZWGkD2UGRYwK8ih5i9A7PbbQ/AB7VMGLoxujc0HP6dut8gKC?= =?us-ascii?Q?yijOt95Vue6vRNTq6pl75K8F7cXEDHafYy6XnD9FTZOc0+aT2JQZMR2n0XoV?= =?us-ascii?Q?2AHyFrKtNruw1SXTBtIuRCIbLLiukcMBm7NpHM3z891o+ZQXKQ1vfgg6D5mc?= =?us-ascii?Q?6mUAm1rFawLtnP998iOCXvBNCiymUhIi5B32EGmg5/o8++QhRH6FcoyVqlhS?= =?us-ascii?Q?NNFXrW3cGHk9InLkWSZoSfx9Zht4QWcajtGafNqKdEhthtG5sa/dEBD2SZYj?= =?us-ascii?Q?WLJ4W+YZY1Z2YChPrTgJsvivucKUbKCs0oq0QTjyLihdioo0hmM6osw23SZ9?= =?us-ascii?Q?5a+FsxswQpvsKONFFUd65YhGr+1g6kgLXiMQ6+Zl8Nyc3OVjQIF+0dDwt8y4?= =?us-ascii?Q?ljtFUsbNujOomhi+ebibpMlAJvSV6xc5PqV0gbzn17ACcnm8lzaOVMbe+UbW?= =?us-ascii?Q?Xx8qFzaNV2+6Jay6P9dUtnqC/HEfxCNgE2OoaaXM5ldcaU9CdxK76odsDcUd?= =?us-ascii?Q?dIk96BBLGWMqm/RcZuAtihExKkl/zIjE5OJZZBD9G/W44RykTf+EoDPFwop/?= =?us-ascii?Q?iq66MMpX5gNveX1q5cyex+6BZbCT/n+0WrPCWT/6sjqR9nMyTbxO1gDwnplP?= =?us-ascii?Q?ACkalBDhpbxKHyCt+DR7Kg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e9be91f-f13c-47d0-7d89-08d9e3b9d16b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2022 06:29:07.2523 (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: VI1PR03MB6239 Subject: [FFmpeg-devel] [PATCH 31/41] 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 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: 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 61f8e20006..b90eb43399 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2495,7 +2495,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) { @@ -2981,7 +2981,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){ @@ -2993,7 +2993,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){ @@ -3002,7 +3002,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){ @@ -3013,7 +3013,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){ @@ -3022,7 +3022,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){ @@ -3031,7 +3031,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){ @@ -3042,7 +3042,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){ @@ -3054,7 +3054,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){ @@ -3066,7 +3066,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){ @@ -3080,7 +3080,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){ @@ -3089,7 +3089,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) @@ -3133,7 +3133,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){ @@ -3154,7 +3154,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){ @@ -3162,7 +3162,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) { @@ -3192,7 +3192,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; } -- 2.32.0 _______________________________________________ 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".