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 EB3014B740 for ; Wed, 12 Jun 2024 13:55:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 270B468DA35; Wed, 12 Jun 2024 16:54:51 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2088.outbound.protection.outlook.com [40.92.74.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 391A868DA09 for ; Wed, 12 Jun 2024 16:54:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PW5jKsOPdo5KIAXUuXaBs5h9uKnspYXvnntfm281+xw6c+To75R3B7fgynIpyRtcMbo1IjS5WZ48Z7wrMm/ACxWs0Mw+oEWaiJ0RGs/a0Vxj/EIBuA7utq4fVlP66dgUlhU0nC6I7FUbNpiErQJV5WlKokYq2uP5Q/ZuDdLzE7uPoxuOj4/iVFwKBUkf5vNBPhRaUbXabeVqyCYk5bvKedAxw9FlrXL/nTTqKWBJA2lM5BUMF/zOlFwHg4vpMVmJ9xjG9+un0obCgvPGQmfQT3fbc9dOjV5JRn+HEZK77oa60qo6nRYFEW+synZJlE3WABMX1d7fGNy3Pjn1f1O+iA== 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=xQR/cHxim8xw7/2XUeuaMwVC753wuOr/1d49QnAMp7c=; b=SgXLnHOfbna+y4Fk8u/J7fWV3Xs8cPeKAzOSY9mBLdKnWxbc7aAZpB5yOOyvs0axGnRtV0xKz6qRDhIcc4v8QSWMKxvYR6mEbstwWUo3GOSowIuiM6oCpW8FGNTcO57nxikjwOm6NNGGbn4zFQ7XnRyAPHpB1jufVsYck28QIlvJBeVh8nOqWtHON9nXMQtj9lEtAz9Q/k619mpK6zCPbT/mwjRsH+jeUHdbj/QUQS1jPf27dwh4iZwFPxZzXE1q8tjE3A8R6mbDRs+z0u9ASwZrzJDQgNQt4e3O5mktFoGYlh2HesAoft3BlNdLSC22Qk6QEE0AqQAnOI7JlsjE2Q== 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=xQR/cHxim8xw7/2XUeuaMwVC753wuOr/1d49QnAMp7c=; b=Svrx9LzjIvoqo9A8GTnngC5IT3vzdXMlj10G0ovuLJNEDVoGXTC/ajKXG6+goHY6BCoxqP/eoyLRs/xn2c6V6b4AN44npsi/Zy8qOCnrcgOczPFCcNyJWhmEafgD5JVzDeXh8IgwcBbIMkQmBJ9IVU2y4DD9B/EmY9QXKH7sRjQg+rlBU2cxa3itxknkIkkiaKF7GzIcqH95Im94/tv5Wm18SkmpkXnhA2ulMtxLlDfDsnOFTEyQJWlk4sQrTHjhvN/mZ8RSSZiiyEdCiXNLK54gmWjaekvzo/dpaBBj3Q8bwUmyqkF6r2mt0uJnih7ptNSc86GdtIswTdURKihKNQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0204.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Wed, 12 Jun 2024 13:54:42 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:54:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:33 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [AdrfrRu7DS8wAvkCuR7zo12C30DjoR16IL1r2mepE6s=] X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612134853.2102377-36-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0204:EE_ X-MS-Office365-Filtering-Correlation-Id: a8e348d3-d1f0-41fa-8567-08dc8ae735e3 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: 93FbmKgDrTTiLCtfQDm7/jxXDFK+9ZwTjyZNehD43kk12rClUQQvmzqYtVNcP9md/R9JkdNbqyzieSnUX6TFnRVCm3Ezvd88gW9clECd7rj6oEwOf98NLTT5aTKQqWye1EY9DC1ALhweLmvIpDZW2HJ5FA+nevdYYRF/qbxeKZX3jDe9SqK9wd4xlouTjBZq4BgPurX7eTQ7wwW3e8zKc0mbpSRC1BJUaxXntuwPzV7I1hf8h4BAP+0y2mLxnTg03cWitDuG6j5OC/lBPdiQv5BOwdd7HtQAGFLYr70KmTXCCyiKqIPK4216J6pUl3Nw5Ii3ppHn/cjjd+GUjQUW/3sxTNG1S0AhyADzZ9QmzakzpozYGinTKVBj0vJsVOsZAjzg0OGUu6VeKSfkFe3U94G4sSdP4iKIQZo+HyZerZed6sKCw9/c8H42SR1V/EvzafUquRKfTMRlp+AGI3yOCB+TW05Qqrmrjl5IjOzZY5X1l3ilfmf3uohAfHB6cCsqeIIoWQ1gJ4OzVA1NaYyMZxbS3BvxbmlR3Huqj4vaEcwzIq5Hic9FrMikX6LZ5f6OvQbRpFw6OioGw4M2RQqxt67EL1WQB+aBkJYSxg4p/lIEtlUBLzB7SggII1+DuTjR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ayc/YxjeIPlZ06zMYAL9NTdkHRx7FvNmRsFof/HGisQStSh/huDUdiD2MrqO?= =?us-ascii?Q?Pds3yL79j+U9MknIpjBcPzf422VtuQFQJX4FMw4VTcEn6JMqwNW9EUyX/Jav?= =?us-ascii?Q?YUO8o7rrYw/XY3gGPSIDFygRZUcMta1A9ZLufEktIlaSzBKdc/uB0YXb5xlt?= =?us-ascii?Q?MxxAJMhmAEKocTG1Y7sQEBQuLySRNY/64QNK/uUpo02VAinGLxpYXqsyaqT3?= =?us-ascii?Q?wCounCOXoGrcEodeHba8VZtcdifbA0lEteC2Gzfh+u0Gi7oRaeHAofUL5Uv3?= =?us-ascii?Q?sUGDJFopx2JcMnFgph+zSlpjjOy3vaK8zg9DdXHg09IIkBFg+gKUymnn/REQ?= =?us-ascii?Q?KWGOHBEkTu9WgTJNjCFCLFwR3mJpEPG4EzJJ/cRmX4UiZ1QhXEVkzdhIQSmu?= =?us-ascii?Q?CdBJNAlNb8urC00T2vCVpvuVxQYJ8mtnGHXSCuA9pFo60E0CfKP9qodCwfWV?= =?us-ascii?Q?P4W2mi+OB9D5OxAUXH3loyfUypI0g6Duv/FTPsqswWuNpbshYKZDgJi2srCt?= =?us-ascii?Q?IltwCrhklSnmNDqI8ZNMXWdROaYIH/Q4PoDhSuzhtpwi+YPtNc4uEIvrCVvU?= =?us-ascii?Q?v9GH2f6QGV066HhuA70FHeJ2Y31hh/IHRm7AGbKJfNPJ14k3vEHt0fy/024X?= =?us-ascii?Q?tmuxsBfqYQ3nANQFwLdLNc2V2LhKb4IOs8mUcfbJ3KeKS77NB4Ya8a82RAgs?= =?us-ascii?Q?P/dcbgTROH2hUjIbICQXgbqxibys2/50FGUu/wdCbLV9vU0dZ+iyUqBoCwzy?= =?us-ascii?Q?41tU9MqljBsGleOfUmL0tle46OiOG1fUAVuI16wKABkPlZPK68fGQY30rioe?= =?us-ascii?Q?Dd8Luu/oXbJNriLXDMnWqp1mfMKrQ9yvGkd0NFefdrWjDzp8o/IvY/x7aJBc?= =?us-ascii?Q?8Br5JXE3L4pQr1PnNdSAQ7rDHDUfzI0MXV3ixbocalbRX9eIipw/uoH0CCIl?= =?us-ascii?Q?s8RSInEqCT5h0Siu/BLktl77Wc0E94FcMCypiDGtxXspFssiKQj8/WFQh7IZ?= =?us-ascii?Q?jM6iPFuGmazM4zsdNkcFj5PdUmdP6vIKBttL+pYP9NV9Snp/7rgb7zS5u+58?= =?us-ascii?Q?veg46/Xfm0vskR7b85Qs4c/HnJ4qaUtY9yxLgjLgPVAoWqESGbeVcmdNRR7D?= =?us-ascii?Q?OtQFnKQFXd4rmA4Pull2DZiokGLIAeNFG2Jbu2byCUuvirPuCD+Pqz25wsV3?= =?us-ascii?Q?x/KDw6PmX9vyXWeXxr9Yrq2TQTLA1seyytnSC0EtmCWKygetonbBJxySxRsH?= =?us-ascii?Q?Cl2sJQ/KSFFXBIfk2NawGbkr4oXo43Z6Kn5px3AUtQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8e348d3-d1f0-41fa-8567-08dc8ae735e3 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:54:42.7973 (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: AS8P250MB0204 Subject: [FFmpeg-devel] [PATCH 37/57] avcodec/mpegutils: Don't output wrong mb skip values 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: The earlier code had two problems: 1. For reference frames that are not directly output (happens unless low_delay is set), the mb skip values referred to the next reference frame to be decoded. 2. For non-reference frames, every macroblock was always considered skipped. This makes the output (worse than) useless; that no one ever complained about this shows that this feature is not really used. It is therefore removed. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264dec.c | 2 +- libavcodec/mpegutils.c | 12 ++---------- libavcodec/mpegutils.h | 2 +- libavcodec/mpegvideo_dec.c | 2 +- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index fd23e367b4..c77d8f42db 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -979,7 +979,7 @@ static int finalize_frame(H264Context *h, AVFrame *dst, H264Picture *out, int *g *got_frame = 1; if (CONFIG_MPEGVIDEODEC) { - ff_print_debug_info2(h->avctx, dst, NULL, + ff_print_debug_info2(h->avctx, dst, out->mb_type, out->qscale_table, out->motion_val, diff --git a/libavcodec/mpegutils.c b/libavcodec/mpegutils.c index a53996852f..73b6650b70 100644 --- a/libavcodec/mpegutils.c +++ b/libavcodec/mpegutils.c @@ -153,7 +153,7 @@ static char get_interlacement_char(int mb_type) } void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, - const uint8_t *mbskip_table, const uint32_t *mbtype_table, + const uint32_t *mbtype_table, const int8_t *qscale_table, int16_t (*const motion_val[2])[2], int mb_width, int mb_height, int mb_stride, int quarter_sample) { @@ -248,7 +248,7 @@ void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, return; - if (avctx->debug & (FF_DEBUG_SKIP | FF_DEBUG_QP | FF_DEBUG_MB_TYPE)) { + if (avctx->debug & (FF_DEBUG_QP | FF_DEBUG_MB_TYPE)) { int x,y; AVBPrint buf; int n; @@ -267,8 +267,6 @@ void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, av_bprint_chars(&buf, ' ', margin_left); n = 0; - if (avctx->debug & FF_DEBUG_SKIP) - n++; if (avctx->debug & FF_DEBUG_QP) n += 2; if (avctx->debug & FF_DEBUG_MB_TYPE) @@ -284,12 +282,6 @@ void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, for (x = 0; x < mb_width; x++) { if (x == 0) av_bprintf(&buf, "%*d ", margin_left - 1, y << 4); - if (avctx->debug & FF_DEBUG_SKIP) { - int count = mbskip_table ? mbskip_table[x + y * mb_stride] : 0; - if (count > 9) - count = 9; - av_bprintf(&buf, "%1d", count); - } if (avctx->debug & FF_DEBUG_QP) { av_bprintf(&buf, "%2d", qscale_table[x + y * mb_stride]); } diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index 43075191c6..64e69c7746 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -106,7 +106,7 @@ void ff_draw_horiz_band(AVCodecContext *avctx, const AVFrame *cur, const AVFrame * Print debugging info for the given picture. */ void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, - const uint8_t *mbskip_table, const uint32_t *mbtype_table, + const uint32_t *mbtype_table, const int8_t *qscale_table, int16_t (*const motion_val[2])[2], int mb_width, int mb_height, int mb_stride, int quarter_sample); diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index e95b5a0940..4e279d9fa8 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -408,7 +408,7 @@ void ff_mpv_frame_end(MpegEncContext *s) void ff_print_debug_info(const MpegEncContext *s, const MPVPicture *p, AVFrame *pict) { - ff_print_debug_info2(s->avctx, pict, s->mbskip_table, p->mb_type, + ff_print_debug_info2(s->avctx, pict, p->mb_type, p->qscale_table, p->motion_val, s->mb_width, s->mb_height, s->mb_stride, s->quarter_sample); } -- 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".