From patchwork Sun Jan 30 06:27:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33927 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1771512iov; Sat, 29 Jan 2022 22:32:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJzdEg4sKDq7GEtkZNbq4PL1gAVDUF3r+yl0TYPeCuHiogkrZZjguHDfV9hSNIpmXQaxUJPi X-Received: by 2002:a17:906:3f8e:: with SMTP id b14mr13596441ejj.463.1643524350814; Sat, 29 Jan 2022 22:32:30 -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 qf25si6289333ejc.550.2022.01.29.22.32.30; Sat, 29 Jan 2022 22:32:30 -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=QBaUgDOq; 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 638DB68B0CD; Sun, 30 Jan 2022 08:29:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2011.outbound.protection.outlook.com [40.92.90.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76F7D68B24A for ; Sun, 30 Jan 2022 08:28:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A+3fgra4Xh89M5IQVyHqfUMf2IlsO//1/ya8GyUnRvgav6l16Z6h1FcHVq1CbRPQiZBTbe5atXPOYDleiYwgCzMAVPcUvC5IFF0cHwi9PvkDm+yD0k7R6meL4Nckmwrbdv2nTLtLdWnVq6hRAx5bb9LvTsVrz8EDLzHanC8Q61YtdbUZUc2W58vYLBbVL4s7/1+Tj5ygbyzkBV4+kfRJkhlE74QcrUVxOAyZ7Nkjbc49rCS5Yh7hszTZopJpcPiB1nRzwcciOTOGZs9YixycrQRk9I1ub5Z+wF3SYcpkJ76FacOzpCXf1k4nbiPnEDdwk0o2NE9OmPayIf4t/F95Bg== 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=0gtrWgq7unoMs3zVqvI7myYjzVTlT6hAPsmRR/nbwnM=; b=RKwSZXLPF+Vd6DCBIIcGaNsRmRX075sSZDKyFBhLIRatO136R0f3R54whiKJjb7L0W2NuIGIl6Udu6gwgizjwSRqEcYJY1QLL9bS0CojujrzxInyiPVJFCpEcNBQIMJX6t3AIMuQMLEL7RWAF1w3RRhEthEai/gBaEE1cQvyHIlVQx9MkCjmbQRzAEiFQXLc45ZaMdp7iSu7LrsMTTd6FcxnjrBfmD1nM9vtkweq5r4kEcCNo9HJQG9CrF8BXj0abgWp4AwwWNRHwQum/VOw8dVjif5zLtgbrVwETYcbT+865tNMtx7yPSD0BaBj0icVEp4pKAyI4IYPJ2qqThY8CQ== 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=0gtrWgq7unoMs3zVqvI7myYjzVTlT6hAPsmRR/nbwnM=; b=QBaUgDOqPFAp/08WpGmaQEli4Olb0G1cSlh8a4aYw0Fzn6Sewfz73xIYhPTE0bIJwXRvhfoKsbu3EwtmoU5WCw/R6MZ1a3H4P/1OmM4b1QrLnKT0HNU53NJaYydh7dvSz4kTtt1dYntCnn/R2EjHxtT3NJpO1Fvd0FqXjAQDdD1uqhoEo+LNrwHqUFvG5KxlqZ8dMNBezyAkGQ5v2YkS8Wa93Awlwo9fEH1b1fbsIJ0u+nbnxx5VZ87QMT3nBPMq+kfH2ZcVpDuMBOTUO0uE5MZsRLCbh/I+HkAg7OuXU8v5bVO0oupPBF8Gc6y8q6jjhfiF7rMGji9SvJPfJhbGVg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by PAXPR03MB7666.eurprd03.prod.outlook.com (2603:10a6:102:202::14) 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:28:56 +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:28:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:35 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [VCbN1ibe2oj4Ksi14kIUZcPop0yujITQ] 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-26-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2bfc2a28-df24-4bee-c3f1-08d9e3b9cab1 X-MS-TrafficTypeDiagnostic: PAXPR03MB7666:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 72mHboDaGuTa50Zv0K246DmDHkhq4PuP9qCZPqH6YKliA6Kyaw9FhW2jANDzl0bxSpfkoALN5xc+XkhyoNure5x7nrnxiGCIf3SlUpkbFUys6otl0EoKnDEkQpA4nLNdk7GFrMRdPhpTMbx4MhXTiOKC4l9kaQ1q0stwRoDz/cbOlejFPfzOlN+trv0higiR84sF1VckATN05oheioczcSrOaUBSLUVI7z4XAciqDp6w32jFIu4uiFJpBj1sEZwrVm8lYV8jPKYicxBeonlwOOC00oQyg2JgNp42AFnJ30pbLaQW4lwWA/ysRVZFj6Zgkqx0crPiMfePkwZbkZTJLtY9n0WkxFtMIzAi23eGDmobobWOZ5ounnWsiJAVaeycyvq6siTF/du/uUHIVFKJ32balsqEa7UrnfSc3Jcv9kYIftcuBzQtUxKT0NXjMnoxTDsS21mo7kZlmLsDehZ3XLoDDP2RivxvzVmFSFqUwQU4r/nuoOxgwUmFQF3fkRLy9EeLMmZFPtlKTBB7O9fepF9mrnM8xGjji0ITmwFKFYKK/Us71aiWjejmBOKgnZdY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BBDWOtqScr0m7YbZLs9GMOO6wJbT6puhuCFKFyzwTTBPCHq6sRo3/3ZXw+FmYRMJq8cWbPRst3un7QntsdzU8ejnhGE8TfNQfGgwrkTzGBBlTRpgSg89yVTJ5b/S+4n7cVMRNiwRZHsH1GQWB8v+wJV81sbMxx7q+VN/sY2CzeNYde/iRYovHTEXhQhfG7T05exeBWNuSaKBB3oL2iF3wIWdqeinOLOrGFhDuCIZlfU0EcYjXzgvgnn7E3/NP9TkkkdVS+BzBEV2M9ynpCcxQaK2IkiUoA3GFkl9jUV0lQwOOeb7OzGPJX5NhjbxOQqk6GwoiIaneTRz2xnUIeMjbq7dOJoSUEHz8Sp+Li5zeMKz8ce/DJn2FjOzhfR9AJ+R+4dwzOxsrIBbMoBVNVe4+UMMjyBLjJul5XQko4K/MO5hR5miWiH0sIQMJCMSE4+fmZetWRbnxtKk7yQN+D/47GVtT3S3OLGZN0DmGTl/jEfjfQ5y0eNQ8iu/XutZP5dujGMZqjVRbTsdJChyNi9EcKTf1Meu5e/RAU4pJDGBQPMx8ogQRDXlZlvLkib/NNZ6fo4PeILQnywCjIF9ineiY0JisJTNh8t0RaTqyL2Qm1AnvG/cUZfx59CFNfcvUXhq77U+W9r5ib+wi9TRseSXSCAqSr31tPINErUbgiNkcGDsduRCRT62UDkKE2axlzCwTP9uSqwwEvoM8fOgoIR08M8T1JUfb2NORwRurm2FYRMbUtxdAmMFlS6e32Hxgity4JoWtH0K7Vy5d8Wm0juWfWGcUVotnwsmm9X2OkHEU5pK6soT+qYrgFwdAIRla3rVOlCsYd9exrSAdQgypKDOa9Wi9YAAoKYP//r97dLH//OoOEKamt26BjYi9eG/A4ojUs+v5Xxb8m0z2SBVmp6vJIHlvguH0XuSdnq7DSbRv42Ecdt4V/GfDcbAwIshx7TS2ucuytgNELr05p0ldz+gag== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bfc2a28-df24-4bee-c3f1-08d9e3b9cab1 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:28:55.9519 (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: PAXPR03MB7666 Subject: [FFmpeg-devel] [PATCH 27/41] avcodec/mpegvideo: Remove write-only [fb]_code 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: 8vucy/Poth6P Signed-off-by: Andreas Rheinhardt --- libavcodec/ituh263enc.c | 1 - libavcodec/mpeg12enc.c | 5 ----- libavcodec/mpeg4videoenc.c | 8 -------- libavcodec/mpegvideo.h | 2 -- libavcodec/mpegvideo_enc.c | 8 -------- 5 files changed, 24 deletions(-) diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 4af7ccb527..571abdffd7 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -682,7 +682,6 @@ void ff_h263_encode_mb(MPVEncContext *s, if(interleaved_stats){ if (!s->mb_intra) { s->p_tex_bits+= get_bits_diff(s); - s->f_count++; }else{ s->i_tex_bits+= get_bits_diff(s); s->i_count++; diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 78c802d897..2c937ecf61 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -942,7 +942,6 @@ static av_always_inline void mpeg1_encode_mb_internal(MPVEncContext *s, put_sbits(&s->pb, 2, cbp); } } - s->f_count++; } else { if (s->mv_type == MV_TYPE_16X16) { if (cbp) { // With coded bloc pattern @@ -973,7 +972,6 @@ static av_always_inline void mpeg1_encode_mb_internal(MPVEncContext *s, s->last_mv[0][1][0] = s->mv[0][0][0]; s->last_mv[0][0][1] = s->last_mv[0][1][1] = s->mv[0][0][1]; - s->f_count++; } if (s->mv_dir & MV_DIR_BACKWARD) { mpeg1_encode_motion(s, @@ -986,7 +984,6 @@ static av_always_inline void mpeg1_encode_mb_internal(MPVEncContext *s, s->last_mv[1][1][0] = s->mv[1][0][0]; s->last_mv[1][0][1] = s->last_mv[1][1][1] = s->mv[1][0][1]; - s->b_count++; } } else { av_assert2(s->mv_type == MV_TYPE_FIELD); @@ -1019,7 +1016,6 @@ static av_always_inline void mpeg1_encode_mb_internal(MPVEncContext *s, s->last_mv[0][i][0] = s->mv[0][i][0]; s->last_mv[0][i][1] = s->mv[0][i][1] * 2; } - s->f_count++; } if (s->mv_dir & MV_DIR_BACKWARD) { for (i = 0; i < 2; i++) { @@ -1033,7 +1029,6 @@ static av_always_inline void mpeg1_encode_mb_internal(MPVEncContext *s, s->last_mv[1][i][0] = s->mv[1][i][0]; s->last_mv[1][i][1] = s->mv[1][i][1] * 2; } - s->b_count++; } } s->mv_bits += get_bits_diff(s); diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index fcd436082f..4304562669 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -564,8 +564,6 @@ void ff_mpeg4_encode_mb(MPVEncContext *s, int16_t block[6][64], if (!mb_type) { av_assert2(s->mv_dir & MV_DIRECT); ff_h263_encode_motion_vector(s, motion_x, motion_y, 1); - s->b_count++; - s->f_count++; } else { av_assert2(mb_type > 0 && mb_type < 4); if (s->mv_type != MV_TYPE_FIELD) { @@ -578,7 +576,6 @@ void ff_mpeg4_encode_mb(MPVEncContext *s, int16_t block[6][64], s->last_mv[0][1][0] = s->mv[0][0][0]; s->last_mv[0][0][1] = s->last_mv[0][1][1] = s->mv[0][0][1]; - s->f_count++; } if (s->mv_dir & MV_DIR_BACKWARD) { ff_h263_encode_motion_vector(s, @@ -589,7 +586,6 @@ void ff_mpeg4_encode_mb(MPVEncContext *s, int16_t block[6][64], s->last_mv[1][1][0] = s->mv[1][0][0]; s->last_mv[1][0][1] = s->last_mv[1][1][1] = s->mv[1][0][1]; - s->b_count++; } } else { if (s->mv_dir & MV_DIR_FORWARD) { @@ -609,7 +605,6 @@ void ff_mpeg4_encode_mb(MPVEncContext *s, int16_t block[6][64], s->last_mv[0][i][0] = s->mv[0][i][0]; s->last_mv[0][i][1] = s->mv[0][i][1] * 2; } - s->f_count++; } if (s->mv_dir & MV_DIR_BACKWARD) { for (i = 0; i < 2; i++) { @@ -620,7 +615,6 @@ void ff_mpeg4_encode_mb(MPVEncContext *s, int16_t block[6][64], s->last_mv[1][i][0] = s->mv[1][i][0]; s->last_mv[1][i][1] = s->mv[1][i][1] * 2; } - s->b_count++; } } } @@ -796,8 +790,6 @@ void ff_mpeg4_encode_mb(MPVEncContext *s, int16_t block[6][64], if (interleaved_stats) s->p_tex_bits += get_bits_diff(s); - - s->f_count++; } } else { int cbp; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 98810ea231..bb14304495 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -306,8 +306,6 @@ typedef struct MPVContext { int i_tex_bits; int p_tex_bits; int i_count; - int f_count; - int b_count; int skip_count; int misc_bits; ///< cbp, mb_type int last_bits; ///< temp var used for calculating the above vars diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 1cf194dcaf..71e751d88b 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2445,8 +2445,6 @@ static inline void copy_context_before_encode(MPVEncContext *d, d->i_tex_bits= s->i_tex_bits; d->p_tex_bits= s->p_tex_bits; d->i_count= s->i_count; - d->f_count= s->f_count; - d->b_count= s->b_count; d->skip_count= s->skip_count; d->misc_bits= s->misc_bits; d->last_bits= 0; @@ -2476,8 +2474,6 @@ static inline void copy_context_after_encode(MPVEncContext *d, d->i_tex_bits= s->i_tex_bits; d->p_tex_bits= s->p_tex_bits; d->i_count= s->i_count; - d->f_count= s->f_count; - d->b_count= s->b_count; d->skip_count= s->skip_count; d->misc_bits= s->misc_bits; @@ -2785,8 +2781,6 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->i_tex_bits=0; s->p_tex_bits=0; s->i_count=0; - s->f_count=0; - s->b_count=0; s->skip_count=0; for(i=0; i<3; i++){ @@ -3418,8 +3412,6 @@ static void merge_context_after_encode(MPVEncContext *dst, MPVEncContext *src) MERGE(i_tex_bits); MERGE(p_tex_bits); MERGE(i_count); - MERGE(f_count); - MERGE(b_count); MERGE(skip_count); MERGE(misc_bits); MERGE(current_picture.encoding_error[0]);