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 4CE8C4A82C for ; Sat, 11 May 2024 21:09:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C7D3468D868; Sun, 12 May 2024 00:09:16 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2058.outbound.protection.outlook.com [40.92.74.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE86C68D6D6 for ; Sun, 12 May 2024 00:09:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n2P6NkVFG2s8u+Y7srcdAexKyDb+cJq9h4bQ/Y3h6NKOB8SmyybhWaO4r6Va2B5/ZZibCw3edF3i4/mg3W1SzQuCcg9UUCS5bDVDpHFi92joq4VrVyh+xWnwPUDRX1r/xaJ2OM7jk/n/cZVwL/UWYyRbV/kQBY2jA0I5euCLO/k00vzWEUr6pYDoEeSly43ZtpAGbyxHbbZY2qHiK+7KuBxs3hD8xkl4rh+mmj10ZQjhGtPODs7Co0UQGyBJ34+kAea4ulRhmwcARZmyYDGxtOPbL/7OkCPB8WtYSIbuWRxoNVFDxC4UQx8Izyo88JAY+GAy3Bs44GtchzT0N/3qfA== 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=pNR83he5xtKsRXhNS2X6ynLb+b8W7Bm6k/G55ngqnUk=; b=OO8gZdvNBti2Bo1dKomxxkBXlbjBJ0bpEmqTEUF2B8bRyFv5aBBcAIi+Ka7loJfLETbv2kWNj6cwmPb10W/hBDgmC76xAdR3l3PumGjWV6mIf4Rbw0W8PwPawERRYkuzZPkNCReCWaLX99yPoK1y/9Hats/P1ewhbl2BSdpIqBp1lPf8VGRGbeTSLMW5Li6KZyZUyOeQHpr6V++aQduzKcIsWUTLzavgfxwR4xigd8GCPdvjJQEurwKwG44bBDcxExSQSj9rMFJ7A/TC2ENRbWBhhRutM5KZkU7B+nhOZqaaBVxYGzSNrNXvGS6ffwtVV7nNCzy6WAB6Lbitf11QZQ== 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=pNR83he5xtKsRXhNS2X6ynLb+b8W7Bm6k/G55ngqnUk=; b=dcLr74x2mB8LgWhN2GAr0HBjCenpIUBQEW8IjXegsCfQt5SLQgDHVD3xFe2kA+21SOfOX5cCOeZ1RPVz25IQXj/35lIY6qXEqa5RgWhTk8WJ/1dLky8iJCB82wVU9+vS97U0ozNTUQEPZ312P4oTySh1TxWmX8ChmBaQic0y6qzGp3bhQu0VHNXp0fl5dyRtGHdsudP3/wk7x/6+Ul/5TqMaG6IPGigr5LhKD4Et0yJ0pnnAhHYORWEbYlWKls8uD85P/dkQiOMoPUmmdQHakg283uok0hAixp/vbMdnRYZ8PV7h1NlWwBgJZKSeq99tMHMWou6FZKPGddvMC7IumA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0370.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Sat, 11 May 2024 20:53:16 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:53:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:50:50 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [2XRlhQ/vds9JT71qgfinotu5m0wut8Txuu/ZZvRcdNw=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-25-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0370:EE_ X-MS-Office365-Filtering-Correlation-Id: 75269189-6050-4d27-cda5-08dc71fc61b6 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: mo3RbaRZkkCLSfj6iSmC8jdJkBhmrtynbb1wcKLEkntzv0Xr68+YcSfHr7SqtxvjPwVV11D7K0hNBuxXk7pn4/gHBnLS0MJJO6rHb9oEyZw+/V6VSPmgkOMPhWzs+EqashbJl0NLNPCkNjfk3nsKfTQ/ICVbXI3oxL4wL1MZxZMR4v7iiIgfHJVxuRwlQmi5XxU6LrJtC4eaLy0FBQIhSOpDfhnQwKnygjtGS/YXMmrggd7uhMGguXO/uHdMEHO2GHuuifacBVFfdaIJL2Djk+1aqT+1iLS6DsOJjillS9DKqQaTysV0YxFpU8HQwYCZn5SVdFJWfC5/VR4mbWUGa6ZOyT4FCrTPTQ7DtVvxvCNSLFyCJFZ8u6pQrcaQB95buZ80UhhgwU+8EZCo7yj38/4eneyHHt1/36TbCreNZaG3tlJAvEBZngH+OpfQQVdGpfY5lUl7L6xny/OTYSoBOcYQOLxBgWLJkqbFh4F/U9O1UYOO+YqEl9oGTHXvBVW8Xdz1y5zEyumapOqzblnHkN+t13ebrqgYGM3UsYY27ziOZY0nA4I0HyvHAG9P4ICILA8iUGuzIlJHzgDiUVeH7ZeFepIOrPqlxlsb53G8eb3yCOSdy03oFsh70jsdigDN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/nbAtFnBmFesFJ3fXNBbl5+ry02wZ89pu0dasWQJtO/ToCaT++RJqgLrWb7z?= =?us-ascii?Q?VCfFKSDVif/InUROdD+9D9I/HMbzHXjOMCSN8hde6r4yUlt3SDGlKD4l0kkt?= =?us-ascii?Q?maMgrjkaxyJwgVqD8Fc6aXfHCGEKHhNvxoGXnMtF29jDcZ9rPwUVEf6d60Mc?= =?us-ascii?Q?GZEGjvhOU5R7jSrs10oWCF/UfrH0Uml4BV5udDySiPM2s7K0U72UqH5W4zbf?= =?us-ascii?Q?q/yUuWN51At45EOYiVBGwMeRrvJlGf2lIppX+hJKu4wpRPbRmISlZn7H8r6o?= =?us-ascii?Q?Ceey2T+E+gv+clL4d+17FXR8zpvq6bcrNl/SiTaH2VmiecNxoks0yVlmY1M+?= =?us-ascii?Q?mD5pBvMkkGxoLNTCfXaJxgsCHwbe3vJdt2ihJ6PDurThqc8ctJuqPsdEI2uQ?= =?us-ascii?Q?dHCMRhG8lrZ5xfmTsn8Vg5QE+vXn/lxMOA1BZwGXNBl1VUMQhmEGvkJKhYds?= =?us-ascii?Q?8xTPiO2lCJs+8HX5TU+Q0pdRwTgZATa/AFWrT9gNyfowo+b0k8MAFzZTATfA?= =?us-ascii?Q?CIORL68ujVofqq0LNLEJ6rkkL88lwSEuFePUwaFowBQN4g8dMro0hWfKaP0r?= =?us-ascii?Q?9V+qjuvOyn6Pj2Lehp0KdG6t9Nju9SyqbU2MmwVoNB4OFZkzT+svh6etyK5g?= =?us-ascii?Q?uTF967N5m8PIzLxIYUxeanwu0gnGBVToxOFPJ9cVK0p1jqYxtwq9P8wtcGVd?= =?us-ascii?Q?K0qI4VyisskTw9aFqNwoEr6xXraq9HMjMyxZnLJzep6Kn46AgCyQ0qLWbvAs?= =?us-ascii?Q?onx4/qooDHNK2D3rfWC4uDttkj9HtNhAM0W0Kr3HAIs2bR7d6zQNOLR1PEfh?= =?us-ascii?Q?JyakivGgh2Q98ND2YLCYFo+uU88G3AgAS0eM+qQgI24Wx92O84ubbkQF/liC?= =?us-ascii?Q?vmuwdFNa+rQ6Ao7MaW8VMyE6tX0KBhO0jAvYpg9SpNixcoBUXVo0o2xYxtew?= =?us-ascii?Q?cwnFuxKAH/vaqz56NiM7xLiFVR8RBVvOLlkxPtSUmNhYtjNyqVtj6SpXosvR?= =?us-ascii?Q?+9QJyT9G0xZy6qFUMHX/ZJxTHLKBZ40vEg4o4nLXwzOUvfhgq6qz51X8r5EO?= =?us-ascii?Q?614ECt1xBZtmPkm+TnV7W7K47KEQnUvMoIny5zILT+s6AXGSfRObHI8aMn5Q?= =?us-ascii?Q?jMgxzyK4o01uatmkAh1UV4qxqzWuaepqqPgKA7GiplnErpYGddDgmAaduoC0?= =?us-ascii?Q?575CYIt6VjM12A9FV2hltU5NFqO3QvRh5KChokdPnccrcukcJXlgWZI3Yskl?= =?us-ascii?Q?9A5YJ1+uzm8BolxsDpCuPyeGWFeAHCxCYsQn/IQJYQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75269189-6050-4d27-cda5-08dc71fc61b6 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:53:16.6547 (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: PR3P250MB0370 Subject: [FFmpeg-devel] [PATCH v2 26/71] avcodec/h263: Move encoder-only part out of ff_h263_update_motion_val() 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/h263.c | 9 --------- libavcodec/h263enc.h | 2 +- libavcodec/ituh263enc.c | 14 ++++++++++++++ libavcodec/mpegvideo_enc.c | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/libavcodec/h263.c b/libavcodec/h263.c index b30ffaf878..3edf810bcc 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -91,15 +91,6 @@ void ff_h263_update_motion_val(MpegEncContext * s){ s->current_picture.motion_val[0][xy + 1 + wrap][0] = motion_x; s->current_picture.motion_val[0][xy + 1 + wrap][1] = motion_y; } - - if(s->encoding){ //FIXME encoding MUST be cleaned up - if (s->mv_type == MV_TYPE_8X8) - s->current_picture.mb_type[mb_xy] = MB_TYPE_L0 | MB_TYPE_8x8; - else if(s->mb_intra) - s->current_picture.mb_type[mb_xy] = MB_TYPE_INTRA; - else - s->current_picture.mb_type[mb_xy] = MB_TYPE_L0 | MB_TYPE_16x16; - } } void ff_h263_loop_filter(MpegEncContext * s){ diff --git a/libavcodec/h263enc.h b/libavcodec/h263enc.h index e45475686e..cd5ded1593 100644 --- a/libavcodec/h263enc.h +++ b/libavcodec/h263enc.h @@ -36,7 +36,7 @@ void ff_init_qscale_tab(MpegEncContext *s); void ff_clean_h263_qscales(MpegEncContext *s); void ff_h263_encode_motion(PutBitContext *pb, int val, int f_code); - +void ff_h263_update_mb(MpegEncContext *s); static inline int h263_get_motion_length(int val, int f_code) { diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 4741ada853..87689e5f5b 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -688,6 +688,20 @@ void ff_h263_encode_mb(MpegEncContext * s, } } +void ff_h263_update_mb(MpegEncContext *s) +{ + const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; + + if (s->mv_type == MV_TYPE_8X8) + s->current_picture.mb_type[mb_xy] = MB_TYPE_L0 | MB_TYPE_8x8; + else if(s->mb_intra) + s->current_picture.mb_type[mb_xy] = MB_TYPE_INTRA; + else + s->current_picture.mb_type[mb_xy] = MB_TYPE_L0 | MB_TYPE_16x16; + + ff_h263_update_motion_val(s); +} + void ff_h263_encode_motion(PutBitContext *pb, int val, int f_code) { int range, bit_size, sign, code, bits; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 4121cc034f..1798a25ed9 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3314,7 +3314,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ if (CONFIG_H263_ENCODER && s->out_format == FMT_H263 && s->pict_type!=AV_PICTURE_TYPE_B) - ff_h263_update_motion_val(s); + ff_h263_update_mb(s); if(next_block==0){ //FIXME 16 vs linesize16 s->hdsp.put_pixels_tab[0][0](s->dest[0], s->sc.rd_scratchpad , s->linesize ,16); @@ -3440,7 +3440,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ if (CONFIG_H263_ENCODER && s->out_format == FMT_H263 && s->pict_type!=AV_PICTURE_TYPE_B) - ff_h263_update_motion_val(s); + ff_h263_update_mb(s); mpv_reconstruct_mb(s, s->block); } -- 2.40.1 _______________________________________________ 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".