From patchwork Thu Mar 7 15:04:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46869 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp344240pzb; Thu, 7 Mar 2024 07:19:56 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXbI+Kmd0oCHxU4RLzIu18jG3vO29HeGeuDzuzJyVFO3qpCt9mjii2iPGwXI468BgpJ0xahjM8jppjlkzNrFJyfQ/Aukz+l4+YQug== X-Google-Smtp-Source: AGHT+IGy1pHSPOTAzS7ZFo7LqemHs/9+YPP2XnZM5Dbga0F7puXprRiBgClrKYrZFcCwBljVgtgB X-Received: by 2002:a17:906:54c7:b0:a41:3e39:b918 with SMTP id c7-20020a17090654c700b00a413e39b918mr12559400ejp.24.1709824795898; Thu, 07 Mar 2024 07:19:55 -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 o14-20020a17090608ce00b00a45b7ec67fbsi1734024eje.648.2024.03.07.07.19.55; Thu, 07 Mar 2024 07:19:55 -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=YZp69U3s; 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 EF41C68CD00; Thu, 7 Mar 2024 17:19:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2022.outbound.protection.outlook.com [40.92.89.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64A4668CC60 for ; Thu, 7 Mar 2024 17:19:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m6GEPjiaAMVdo+4wuRYBxnneKm3eOr+sNcx3BfpHyPtEQni1zwAFUAQ7KmhUD6aLe5vozEsy7Uep1Q66ZLqh9uLe63aKOqigWLYIVEYuzLwip8t5YgzTKL0yulGKub6J7i41WiWvJ+MWS4ds21CfCGqGHk5DmYVY9uAeE1MtnL7Jmef9YfRnnHJaftdOFGjfhAHV4rCQNklIZc65CoXDAyssFuY39vmojR1AOe6OmUNFPDLi3tCx7Dh9++iqThfmLwUqg8tbqb2kIGLWgspl0IZhBhywuhHUNAiAmg0VAkW2c06o63VlyDqwwFLjJcetahiZjRh1BJfhuS4Oo8S0DQ== 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=p1AlTnFY2dX+xSvxd6y1nVCCydEuHNlnzBNuvMAlZm4=; b=U7d4wG+WleUqP7TdFDwcwjfHOf/m5fBxO8UkETh3b8CKX/ymgr19Wzh5buzlIxp0/e4uzqtgn58H2sdHHoo8QBoxGjiZ8FbSKvcmdr4oXIlp1Pac/OmaDQ/me8dEqiDCRcCFg2A7z4KNZ9uDVzX66iPRcvU35ecRlvIRLX8AqWci2x5SoZDbL5NBVCt7klqalsaOnw9av5aZ+jmX+QwQYLtgXe8N4rRHGqkAZLvhOBGXpRc8GzC5W97nHMidz3pDPUMxIxnI99E819me3f/kH5ICMyIjPtI9EizbatJ0BZN1TSdegUjrmLtArYOz4EnMh9eB5zeFTGj7AYg5QuNOoA== 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=p1AlTnFY2dX+xSvxd6y1nVCCydEuHNlnzBNuvMAlZm4=; b=YZp69U3s78DHRyS4Gjq01qCoc9YD/Rh9uHKw0dzJRTglHd7bZCBlAkTq88+3IxIzvaQBp13wScyakCTzOvIS22NrWXn/IYXzWQdVL7tmoqn5hEv/dY8WCa1WpVGW3cdw0X8RKsLA/5hm/fKKwnf0EcE/DwvLJXEHCIkC+6qdj3sExfX0P+eFoi3LsRrtmze4jz6LtDbXwrLGatQVyrsqlM3VlJviQdtOYF3xelTJZC2Qoomxt+NsBGUfdcfKCHu2W7EDLV2qObGKAqFEMqM8jTVBbfQh0E+T/KQDxvZ0sjhubrJ3rHsoCEbTkTja8bx0SW1OhuOmS6Zcf6J/wolgRg== Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) by AS4P250MB0585.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4bb::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24; Thu, 7 Mar 2024 15:04:43 +0000 Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b]) by GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b%5]) with mapi id 15.20.7339.035; Thu, 7 Mar 2024 15:04:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Mar 2024 16:04:35 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [jK+jxxjjgW3JqIu8ZyaC5uxCg/kAfMZswMJjxaNnzgM=] X-ClientProxiedBy: ZR0P278CA0151.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::12) To GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) X-Microsoft-Original-Message-ID: <20240307150435.3609664-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0052:EE_|AS4P250MB0585:EE_ X-MS-Office365-Filtering-Correlation-Id: 0425be94-4660-4d61-551e-08dc3eb7eb45 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sNkPpPl5X2GlS98c2btRgPeWTNgNDKf583zjx8zvIV/D8zQz5TYQ+9v1CFv7uVAcHp3upsICylP5mvI/CPrhuw2oYQMnBwdvvp4UFcUcJYKojB4NQsTPxOM5zctO9M7Trm1EwJk4mg+U8uT3WpmY5k2Ol/M7c6E6bVSyf6pYzxnN9xz37JkG6aHVJ4j0Woo1TAe1EaLEZ9LTRLsgNKAOXhWF/70spOU27Z76fLiwHEE/Wkm28chMnHbqUoo2Rh9jP2sH1+CS1FhyvqxDMgtYYyQuCkvyULWKEny9+6N7sbmt2cv/qG4X1IK2E/L7d4+3/sliBCtuxLs22EEnr+T4mezPc0nd+OKLAz7a+J3KzF0DhHbnELvVENFiEl/2dygDysfoukqsao/UQuGb7VpgdpJMn1mad2v/QJ0H+sp3GvjJU1IttYifrck4HKaGP9ve4iyBc/N1rB00JVPf6t3v6Hd8Qa+fq9dZ0Ahad6rasHwxAX0iqtVbhosgZPAjw277POpLYTkQnvMOQUHh18nA0zNtQmLbDzunooRyI66v00k13rG8ATsfC0+uZP+jmBMTkCEY3eeJ5pe+z1ffR/+sNN2Km3JOwsxULtukdaC5h6K4ZfPFarouKDPZiKOrOI9Z X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1fiZyTXeLSG09YC7ja1pgX/SQmgfEYZj82XLfIb4jMZFtEiuUvt4hz7/6V2HRcQAY0d5zRvenxClhQb62O6Njw5ZZWBkX6C4VbnQNFAXbGXV3/0cfPgajQM6Z6PMQNvC68it6kKxD1J2FKzuHKwuF4DTiK9WvE9D9DSc+QAPFbqTMtyMDZwaYh3QiZs31TlMtzASakN+1RaW58yjblJUTwfvCjS+Yn3uNE4d1KZRS1+5W9SCtyI/hE8ytJmyth2iuFd76kF+qVyov0r4zYOUBT8T1BGuLo5QXMknMFw7WcFYL3M5Yrqbb1T3+3j6sbjvz5S1K1VGJlrd9IvyDtyDD/O1Z1jUDCa8Z5aOgoPYMR/nltiSB4hATW+u2VPPrRNvhYZ3m36ApZCB406fqg6i7KuJFWotUgpXpWBkSjW2FodlTPlJ75XK8z3UO8L52lg7SKTBVy8j8ZAl5y0dv8RYg+/CgqpfSveCaFRJWx+ifNIkdEXuvJDKGt8GNC1RKHNvXDxHSt4kceO9wR/EuoGa2cwAHBIhCPAbkqC1M0Rrf3N3Tt9DhBYCyJHVPQWl/ATa9dU6dGhurb+N06YBH3bbfSRh3Mn8lT8N343m6hZ6/nowRPCMX2QDlxwVaS2IDYrS+F4/1TKRi3m86Y0KVHMyHsMxw1wki/oxaHY2OGnp8BgTdJPRAwepB4ei4dvwzhsbf3NeD4u/+OKRlvkGRmfN9rqzl70tYhg0Tt3a5GGMvDz7mIGf6BlAYXxueQRjMN/Ucr1C9r/Jl4SsxoSoANtbbidNjQfByKFfJf6VK7xONd02oXz7eDqcR+6+m9xvwwtdc/F8q865z45pLf4oFlxD2tfDuKCjg3wTcbiQ1LumQpi0qfdLNHFGMFYMfQ9z4fOnJBpQGNUAaUKs2Z9hQfyxARtde7HcFkDVR5osGFgMd/Tmbrz5f3DQvybG6Kxc4a7K8fZRVutZECdUwjaIBWrFl278VruMjVoIIwvVDN0sCR11B76W8gs59pmWXp06I1AoCu+HbK+3jhnq2T/kW8Oh00zxYx3ngcHH+/LRnU/Ac+Xp57J+dhf6GuZ5xVI28rC3n3YTEY3Hkocog5LSkgsEPnZN6jyQkD9aoEIrB1Y4yo5yqW63irY6jS9j3y5Nun84TjXG3EKonv1K1r8SgUnBYusla3fsgNGakC/+tmFxtb8FM3fjR1tute/GOdVlZWRk6LXqf1hLrxnMRpPO+ZKCo3vbCh0iO2/SRekT90LPsVJzBycpFanPKQpZZCprEVbpuRQ3aOw3ZONHp1P9Dvrp2w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0425be94-4660-4d61-551e-08dc3eb7eb45 X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2024 15:04:42.8405 (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: AS4P250MB0585 Subject: [FFmpeg-devel] [PATCH] avcodec/xvmc: Remove header 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: mojnhVK4SLrr Forgotten in a12cd3be98e8aba6e74274192ec6532988aa9444. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 2 - libavcodec/xvmc.h | 171 -------------------------------------------- 2 files changed, 173 deletions(-) delete mode 100644 libavcodec/xvmc.h diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 93f6cacf00..5d99120aa9 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -25,7 +25,6 @@ HEADERS = ac3_parser.h \ version_major.h \ videotoolbox.h \ vorbis_parser.h \ - xvmc.h \ OBJS = ac3_parser.o \ adts_parser.o \ @@ -1278,7 +1277,6 @@ SKIPHEADERS-$(CONFIG_NVDEC) += nvdec.h SKIPHEADERS-$(CONFIG_NVENC) += nvenc.h SKIPHEADERS-$(CONFIG_QSV) += qsv.h qsv_internal.h SKIPHEADERS-$(CONFIG_QSVENC) += qsvenc.h -SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_decode.h vaapi_hevc.h vaapi_encode.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h deleted file mode 100644 index 52e70c0d77..0000000000 --- a/libavcodec/xvmc.h +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Copyright (C) 2003 Ivan Kalvachev - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_XVMC_H -#define AVCODEC_XVMC_H - -/** - * @file - * @ingroup lavc_codec_hwaccel_xvmc - * Public libavcodec XvMC header. - */ - -#pragma message("XvMC is no longer supported; this header is deprecated and will be removed") - -#include - -#include "libavutil/attributes.h" -#include "avcodec.h" - -/** - * @defgroup lavc_codec_hwaccel_xvmc XvMC - * @ingroup lavc_codec_hwaccel - * - * @{ - */ - -#define AV_XVMC_ID 0x1DC711C0 /**< special value to ensure that regular pixel routines haven't corrupted the struct - the number is 1337 speak for the letters IDCT MCo (motion compensation) */ - -struct attribute_deprecated xvmc_pix_fmt { - /** The field contains the special constant value AV_XVMC_ID. - It is used as a test that the application correctly uses the API, - and that there is no corruption caused by pixel routines. - - application - set during initialization - - libavcodec - unchanged - */ - int xvmc_id; - - /** Pointer to the block array allocated by XvMCCreateBlocks(). - The array has to be freed by XvMCDestroyBlocks(). - Each group of 64 values represents one data block of differential - pixel information (in MoCo mode) or coefficients for IDCT. - - application - set the pointer during initialization - - libavcodec - fills coefficients/pixel data into the array - */ - short* data_blocks; - - /** Pointer to the macroblock description array allocated by - XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks(). - - application - set the pointer during initialization - - libavcodec - fills description data into the array - */ - XvMCMacroBlock* mv_blocks; - - /** Number of macroblock descriptions that can be stored in the mv_blocks - array. - - application - set during initialization - - libavcodec - unchanged - */ - int allocated_mv_blocks; - - /** Number of blocks that can be stored at once in the data_blocks array. - - application - set during initialization - - libavcodec - unchanged - */ - int allocated_data_blocks; - - /** Indicate that the hardware would interpret data_blocks as IDCT - coefficients and perform IDCT on them. - - application - set during initialization - - libavcodec - unchanged - */ - int idct; - - /** In MoCo mode it indicates that intra macroblocks are assumed to be in - unsigned format; same as the XVMC_INTRA_UNSIGNED flag. - - application - set during initialization - - libavcodec - unchanged - */ - int unsigned_intra; - - /** Pointer to the surface allocated by XvMCCreateSurface(). - It has to be freed by XvMCDestroySurface() on application exit. - It identifies the frame and its state on the video hardware. - - application - set during initialization - - libavcodec - unchanged - */ - XvMCSurface* p_surface; - -/** Set by the decoder before calling ff_draw_horiz_band(), - needed by the XvMCRenderSurface function. */ -//@{ - /** Pointer to the surface used as past reference - - application - unchanged - - libavcodec - set - */ - XvMCSurface* p_past_surface; - - /** Pointer to the surface used as future reference - - application - unchanged - - libavcodec - set - */ - XvMCSurface* p_future_surface; - - /** top/bottom field or frame - - application - unchanged - - libavcodec - set - */ - unsigned int picture_structure; - - /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence - - application - unchanged - - libavcodec - set - */ - unsigned int flags; -//}@ - - /** Number of macroblock descriptions in the mv_blocks array - that have already been passed to the hardware. - - application - zeroes it on get_buffer(). - A successful ff_draw_horiz_band() may increment it - with filled_mb_block_num or zero both. - - libavcodec - unchanged - */ - int start_mv_blocks_num; - - /** Number of new macroblock descriptions in the mv_blocks array (after - start_mv_blocks_num) that are filled by libavcodec and have to be - passed to the hardware. - - application - zeroes it on get_buffer() or after successful - ff_draw_horiz_band(). - - libavcodec - increment with one of each stored MB - */ - int filled_mv_blocks_num; - - /** Number of the next free data block; one data block consists of - 64 short values in the data_blocks array. - All blocks before this one have already been claimed by placing their - position into the corresponding block description structure field, - that are part of the mv_blocks array. - - application - zeroes it on get_buffer(). - A successful ff_draw_horiz_band() may zero it together - with start_mb_blocks_num. - - libavcodec - each decoded macroblock increases it by the number - of coded blocks it contains. - */ - int next_free_data_block_num; -}; - -/** - * @} - */ - -#endif /* AVCODEC_XVMC_H */