From patchwork Thu Jan 27 16:40:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33886 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2602720iov; Thu, 27 Jan 2022 08:46:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbCS6YpwFU0Kdrq5J9gQZb+cnINi//qBb6IUAh3GdQdT6aklNEvrUNqkw9WQd5uN1e+n16 X-Received: by 2002:a05:6402:27d1:: with SMTP id c17mr4330888ede.367.1643301991261; Thu, 27 Jan 2022 08:46:31 -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 p17si1624485edr.362.2022.01.27.08.46.30; Thu, 27 Jan 2022 08:46:31 -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=tAD78IWQ; 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 BED8F68B1CC; Thu, 27 Jan 2022 18:46:26 +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-oln040092075046.outbound.protection.outlook.com [40.92.75.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8253568AF5B for ; Thu, 27 Jan 2022 18:46:19 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T5el6W5tWrR+ksRD+R6pkHwcGmvgqxypOw8eN2kH7/lpenWDHz9zk6WhN5kecaF2g5lh8Lfhsr7WzUCfa/L+o1iMkKitxnrKu+gOAxGYla32ES0CSJAsO5BvkDKzkFJJLL72SVh/Jb4SujmWTkEq8rccbFD2ioKHeD+RGuREUyntXPz/I276XmVHGo4tTz8hJdXeNkxyWxq96FQv66kz/hmnxwT2K3gcPXslVWGLLnadoU1mxr30JecT8W3S5+jOq4abL38Yt2Fwtfpro1taWME8oJV1GN1V3Q9q2bwXavtKcvgMA/52RJqWeDMb0GS9po+m4uJ9Yt5OaGt00b+Gfg== 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=3BxVmC0Gav4eMa1QphRvWk9COrmy3OBcJUZ69fo72Wc=; b=ecJB2g0Zi9vCVqsJ5tqfWLHTYntuA8+GuWRL0IgC2gSR5yYGp1Ud2TuHVorr1HbqyDEeYuBaZUNamjJxoZmiXLoGWrEfZCdFNT0qeFMC5PqSBWDdrRd/qsU3BgVEApL80khnzKNmIo9sMVk3zrEgGLvdb2ZfIEL2okUwvwNixebWg7OU1lBNKQTIBgLxr/x66XBbuzfVahebUIRVd3W7tbqmEJyTxl+4IJ47GEcCvutetJ/YT0MRX/3TX8MmsUpgAIyPIQRVJukI8lpRG5qxHvDLG9OowwYsGG40Upph6MIsBcj6OsEkCzjbAREC+iOIios91qT07lCo20o3IgfEug== 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=3BxVmC0Gav4eMa1QphRvWk9COrmy3OBcJUZ69fo72Wc=; b=tAD78IWQ4QbFPOPFBAFKSb9Srw6BGE1CAD29hSq/ubm39QbKPZWovM3mOgR+Oqi7w3mPrsTOuoyXPYFs7nGL5tRl9LJz6u7enaRenMAAksO8o6rU/3P6vXET6ndhlm6OkQ07QIX2RxefrHfemSKB4ZL2zsO7yFaTQLsAgpxlBcYhsgsrZlDqDkuEzf7ZPrMvXHTcixq0PONqdi3D/r3dzp7y8t5lTB/JZDy0skdIVfXiHtRMUsFyfAdM5qejA6ziQk+CAJEvyFN3d6oU+H7vNZYzE8zEq9mQwkeYWBJUEGjlu9U+sWQ0LHAiKxE3zqD7KnN9Qq+K/yyF84CnciGbUA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB6098.eurprd03.prod.outlook.com (2603:10a6:208:15a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Thu, 27 Jan 2022 16:46:17 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4930.017; Thu, 27 Jan 2022 16:46:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jan 2022 17:40:05 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [v/r3z4fmyK/kdmVCE2dqQHCKYSCKpMhK] X-ClientProxiedBy: AS8PR07CA0043.eurprd07.prod.outlook.com (2603:10a6:20b:459::12) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220127164005.2057304-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc2f3137-483c-4b31-ba2a-08d9e1b4899b X-MS-TrafficTypeDiagnostic: AM0PR03MB6098:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 23doJPyvPj8Cfvl1vC/SHoGpAfAk0JzUVaBJKjLYzWyqJifJBejt2vZizz216SQbF8lTzdtxX0nM5qKmJqki8EvcOQ/qIrBjpfQuT0i76Io7ZMCOJmC1tB5XZSWFsVaAmDY8naHneh5oVvwFeqaNXxT8iTCS8xWWpzPtOZSJokY5cMEKrNUxRwKTo3CYGVd7/y9ME0Varetq3U1wNCyTCtZGJUy9kQO0Z42YV851nti8WGoHZmAJFR73YT9Nyhj0/9HPhimb6ikjsDe1TQgS6OsgPM+oH2e+UGYnY8ijJb8Mx+nLnG9AR9S9GrR2LF60UPiDJhgekZkZFO5QRC5D4brH5ta+0sN9k4Hz3qZSbArOU0qK/AuzO14PoMNrSGoAHC+tqBjmX027YxWmZWx61rlSgCJ+D1oiAjyIHKzyqDHsx6GXBvW+MoPV4xMguM82F61OAGFIFqF5M6Fucx8Fv769XEh/d8J+gOY1dxi4aEVPw8EWMAN3IjyRf5AgkI61cpOHxObsaV9PZWPs4vc5eDvA25Apu4nnoayPsK1lM2UHTAtU6PcXa+cNrepyDK6z X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GQnoLQRS+u95T13sM2r+5r91Huba+mhmb1BrQl/7kcvdfQQr41MnHnswgXd0CIId6Y2sYkfs6nspX9BS/Q92mA9z5Mk83L2sw19iwNWdpAJ7LO4QRHpr7EkK1egaGyHOUAtGtYrtnuRwUcG8Zrb05A7EbNJnLolYtgvpq8u3wkmk4uXDCFx9vVFCnKEzEz0XQzxmbRb/lQQZ1AYtiB+j9tcMCTd3sDaDlSOAcKg92mBa/Yaq0+OKnuoMfcbpqDU4fWRlZQnPZzAcC7pCo4iEdLf1fTKHqb/qgGvg5VEVIhGomtyYwDmoOxep2yqxU76UOzkREZiFUIxtm84Ceu4paKgF6cQ2qMZAFDladf4HX9o2Z5wFVk82XjPbqIrtoieoxiAbF8PfTKAccITSRe42dhtc5oxw1Y24uk42BKdQvncgw3cUuI+MZiRwA5P8y/CWsB8OMUWI0sLGsKfU8wlnjW+uNm0Tq96FfRBXOBsghKBwLuJNhhyBMb+Y3vJaoyBT/SuJL1z/OvGL3DDtrMzPwudJxRb4yC7uxefavDQZPGwIR5/olyecdfWTYWePbs7k21eN4llLs0HV+SWS414DGDrmmev4PEViKDtCBAsuth8+H5AvsZWVvRzZvWU2LEkEmMwbQaqcbME/DqV3xps50E1t1UnxO1rOy2HPTxgKzNhlm+qj7LXGEI/VP+duL0fwO2+vntGCiBEtno/XVIgy8hxM7BsgwV66mv0S3rBJa/qKa2OEzr1erUdG/zw5VC3Lhw5EJp4T5GSi1XN/FbqlTKJCcfNFIi9ogrFMRQJTqsN6Gbe2QqjHy0cgCY3fn9oR1PLqszahSWPP9umiyAa5av5nzF/jEdzB1gBqDxdCHWM9jdk7onmBcf2fuPhiKUkCRlppuvu3NBqNrFMIZYgWzJNCLGUxT0DG5Rj0QIC6CO5EwoStiFLk/uQCre3w35JA/PaFbqthUPbmX33t3K4c3g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc2f3137-483c-4b31-ba2a-08d9e1b4899b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 16:46:17.1350 (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: AM0PR03MB6098 Subject: [FFmpeg-devel] [PATCH] avcodec/h264_ps, h264dec: Remove ALLOW_INTERLACED cruft 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: wMDdayzvyhD8 Since e1027aba680c4382c103fd1100cc5567a1530abc, ALLOW_INTERLACED is no longer defined in h264_ps.c, leading to a warning when encountering an SPS compatible with MBAFF. This warning was always nonsense, because ff_h264_decode_seq_parameter_set() is also used by the parser and it makes no sense for the parser to warn about missing decoder features; after all, it is not a parser's job to warn when a feature is unsupported by a decoder (and in this case it is even weirder, because even if the H.264 decoder is disabled, the warning will only be shown for MBAFF sequence parameter sets). So remove the warning in h264_ps.c. Given that there is no proper configure option to disable interlaced H.264 decoding, all of the ALLOW_INTERLACED macros are removed in h264dec.h, too. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_ps.c | 5 ----- libavcodec/h264dec.h | 17 ----------------- 2 files changed, 22 deletions(-) diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index f68d5bf81c..6927fa7198 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -517,11 +517,6 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, sps->direct_8x8_inference_flag = get_bits1(gb); -#ifndef ALLOW_INTERLACE - if (sps->mb_aff) - av_log(avctx, AV_LOG_ERROR, - "MBAFF support not included; enable it at compile-time.\n"); -#endif sps->crop = get_bits1(gb); if (sps->crop) { unsigned int crop_left = get_ue_golomb(gb); diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 8168c8e97b..accb0de3b1 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -49,10 +49,6 @@ #define H264_MAX_PICTURE_COUNT 36 -/* Compiling in interlaced support reduces the speed - * of progressive decoding by about 2%. */ -#define ALLOW_INTERLACE - #define FMO 0 /** @@ -61,7 +57,6 @@ */ #define MAX_SLICES 32 -#ifdef ALLOW_INTERLACE #define MB_MBAFF(h) (h)->mb_mbaff #define MB_FIELD(sl) (sl)->mb_field_decoding_flag #define FRAME_MBAFF(h) (h)->mb_aff_frame @@ -70,18 +65,6 @@ #define LTOP 0 #define LBOT 1 #define LEFT(i) (i) -#else -#define MB_MBAFF(h) 0 -#define MB_FIELD(sl) 0 -#define FRAME_MBAFF(h) 0 -#define FIELD_PICTURE(h) 0 -#undef IS_INTERLACED -#define IS_INTERLACED(mb_type) 0 -#define LEFT_MBS 1 -#define LTOP 0 -#define LBOT 0 -#define LEFT(i) 0 -#endif #define FIELD_OR_MBAFF_PICTURE(h) (FRAME_MBAFF(h) || FIELD_PICTURE(h)) #ifndef CABAC