From patchwork Mon Apr 13 15:33:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 18918 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 49000449F3D for ; Mon, 13 Apr 2020 18:33:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D47468B815; Mon, 13 Apr 2020 18:33:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73DCB68AE53 for ; Mon, 13 Apr 2020 18:33:28 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id s8so10563525wrt.7 for ; Mon, 13 Apr 2020 08:33:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=7czFKf9ll1NRPmwkSeXnKB7Utp0wQt+eZ/KKomAwFtg=; b=jYU9PzCPQAH3sEkZKpT2qbAfxYRUqnvxm/2r9Ny/difQTn0nynu0QNwZuIXB1XPNJw lhylsevGFGt76mSPEvvIo1j6YjFk+n+QM27LHIz5Yo9IuG9I/O4+98u/Q3qJd9AUP+wk 1PadrZCj7HI0NhWkSua7VCfcp0zxLWT/EfYBrFRarG7y3oTX/XBIqyHqndVYi8Qoc5Wg aOs/B+AVUTgz0AC0Sk+J6olYG4KZW7y9PLiX0OQdP0D1QcD+7UI5tyPMN797yO5sIeE+ qbHTpyQ6W/rCGAf10MgT2kTyXDuRmx5cSKn//khZsd1R3CBMJg/yfBbfuyLwIaCCSNkE UbfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=7czFKf9ll1NRPmwkSeXnKB7Utp0wQt+eZ/KKomAwFtg=; b=dZrfKV1b0B/ZJfGwfdQ+/0v6HVuS42GF8e8ZePbJqQaqn0AuUcsYPtw+V+6r2EH57c w/nWk6j4swq1+gw7YDloZmwLjeRgGXfmhY9XXKkx/xaJBqQ+kDAryrVTRW9TxxDoMYr7 V71y10jeR+SXgcir/kBHI6Ns3Bd0xSspJsQdbNpqZtbiH53OYf/WzwLmw5Q95D8p5yEu zsNudbacgCr7YX16VkNRm6Z8yFM98TElTPB6ns/PZVQihP2FNT0BouvvkwO3JriAYPlF XnkH2fNeGEphhkWL9a/F2rnO/KFQ3NF0E0KpF9kQvin1WQGq1i+lwq41ySf7VBO8wZ9r v5qA== X-Gm-Message-State: AGi0PuZ6A3vhny/bQKbBiWUsJDmHzKKww7VOK/WCnMqX5VsrdwYzkQgO OPgvhky6aB0GbjmZetjI7ZRh2y5caIQ= X-Google-Smtp-Source: APiQypL4CMjZDBIUBgJNWnhtWYmvOqnKw0eENeRCw2LsDCHzwBwx5xWCeizzrzhSVeX42Kz+URzuCQ== X-Received: by 2002:a5d:6751:: with SMTP id l17mr18743380wrw.162.1586792007408; Mon, 13 Apr 2020 08:33:27 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id t8sm15157557wrq.88.2020.04.13.08.33.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 08:33:26 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Apr 2020 16:33:14 +0100 Message-Id: <20200413153321.5956-1-sw@jkqxz.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/8] lavc: Rename hwaccel.h to hwconfig.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This already applied to decoders as well as hwaccels, and adding encoder support was going to make the name even more inaccurate. --- libavcodec/cuviddec.c | 2 +- libavcodec/decode.c | 2 +- libavcodec/h263dec.c | 2 +- libavcodec/h264dec.c | 2 +- libavcodec/hevcdec.c | 2 +- libavcodec/{hwaccel.h => hwconfig.h} | 6 +++--- libavcodec/mediacodecdec.c | 2 +- libavcodec/mjpegdec.c | 2 +- libavcodec/mmaldec.c | 2 +- libavcodec/mpeg12dec.c | 2 +- libavcodec/mpeg4videodec.c | 2 +- libavcodec/pthread_frame.c | 2 +- libavcodec/qsvdec.h | 2 +- libavcodec/rkmppdec.c | 2 +- libavcodec/utils.c | 2 +- libavcodec/vaapi_h264.c | 2 +- libavcodec/vaapi_hevc.c | 2 +- libavcodec/vaapi_mjpeg.c | 2 +- libavcodec/vaapi_mpeg2.c | 2 +- libavcodec/vaapi_mpeg4.c | 2 +- libavcodec/vaapi_vc1.c | 2 +- libavcodec/vaapi_vp8.c | 2 +- libavcodec/vaapi_vp9.c | 2 +- libavcodec/vc1dec.c | 2 +- libavcodec/vdpau_h264.c | 2 +- libavcodec/vdpau_hevc.c | 2 +- libavcodec/vdpau_mpeg12.c | 2 +- libavcodec/vdpau_mpeg4.c | 2 +- libavcodec/vdpau_vc1.c | 2 +- libavcodec/vdpau_vp9.c | 2 +- libavcodec/vp8.c | 2 +- libavcodec/vp9.c | 2 +- 32 files changed, 34 insertions(+), 34 deletions(-) rename libavcodec/{hwaccel.h => hwconfig.h} (97%) diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index 50dc8956c3..9477b8fd3a 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -33,7 +33,7 @@ #include "avcodec.h" #include "decode.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "nvdec.h" #include "internal.h" diff --git a/libavcodec/decode.c b/libavcodec/decode.c index b7ae1fbb84..2625790b57 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -41,7 +41,7 @@ #include "avcodec.h" #include "bytestream.h" #include "decode.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "thread.h" diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 8ee844e298..31ac563f43 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -33,7 +33,7 @@ #include "flv.h" #include "h263.h" #include "h263_parser.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "mpeg_er.h" #include "mpeg4video.h" diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index e374f32e91..4c355feb18 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -46,7 +46,7 @@ #include "h264_mvpred.h" #include "h264_ps.h" #include "golomb.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "mathops.h" #include "me_cmp.h" #include "mpegutils.h" diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 36be83948e..78299f4b32 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -41,7 +41,7 @@ #include "hevc_data.h" #include "hevc_parse.h" #include "hevcdec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "profiles.h" const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; diff --git a/libavcodec/hwaccel.h b/libavcodec/hwconfig.h similarity index 97% rename from libavcodec/hwaccel.h rename to libavcodec/hwconfig.h index 3aaa92571c..4199ffdd50 100644 --- a/libavcodec/hwaccel.h +++ b/libavcodec/hwconfig.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_HWACCEL_H -#define AVCODEC_HWACCEL_H +#ifndef AVCODEC_HWCONFIG_H +#define AVCODEC_HWCONFIG_H #include "avcodec.h" #include "hwaccels.h" @@ -81,4 +81,4 @@ typedef struct AVCodecHWConfigInternal { #define HWACCEL_XVMC(codec) \ HW_CONFIG_HWACCEL(0, 0, 1, XVMC, NONE, ff_ ## codec ## _xvmc_hwaccel) -#endif /* AVCODEC_HWACCEL_H */ +#endif /* AVCODEC_HWCONFIG_H */ diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index f5771bffb1..25410021e8 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -34,7 +34,7 @@ #include "decode.h" #include "h264_parse.h" #include "hevc_parse.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "mediacodec_wrapper.h" #include "mediacodecdec_common.h" diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index d5e7c21610..cb5e2a9b9b 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -36,7 +36,7 @@ #include "avcodec.h" #include "blockdsp.h" #include "copy_block.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "idctdsp.h" #include "internal.h" #include "jpegtables.h" diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 647a22ef7c..547bece576 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -34,7 +34,7 @@ #include #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "libavutil/avassert.h" #include "libavutil/buffer.h" diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 67ce59d451..40d054def5 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -36,7 +36,7 @@ #include "avcodec.h" #include "bytestream.h" #include "error_resilience.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "idctdsp.h" #include "internal.h" #include "mpeg_er.h" diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index bfb1f92b33..7e52bbef1b 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -26,7 +26,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "error_resilience.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "idctdsp.h" #include "internal.h" #include "mpegutils.h" diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 4cd890b295..64121f5a9a 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -28,7 +28,7 @@ #include #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "pthread_internal.h" #include "thread.h" diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h index dec1f61ceb..cb948f516d 100644 --- a/libavcodec/qsvdec.h +++ b/libavcodec/qsvdec.h @@ -33,7 +33,7 @@ #include "libavutil/pixfmt.h" #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "qsv_internal.h" typedef struct QSVContext { diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c index 143d05bd51..248020d5d6 100644 --- a/libavcodec/rkmppdec.c +++ b/libavcodec/rkmppdec.c @@ -28,7 +28,7 @@ #include "avcodec.h" #include "decode.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "libavutil/buffer.h" #include "libavutil/common.h" diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 26c038dfd9..e77090daef 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -44,7 +44,7 @@ #include "libavutil/thread.h" #include "avcodec.h" #include "decode.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "libavutil/opt.h" #include "mpegvideo.h" #include "thread.h" diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index dd2a657160..9332aa6f31 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -22,7 +22,7 @@ #include "h264dec.h" #include "h264_ps.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "vaapi_decode.h" /** diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c index d832b8cb0d..c83d481b90 100644 --- a/libavcodec/vaapi_hevc.c +++ b/libavcodec/vaapi_hevc.c @@ -25,7 +25,7 @@ #include "avcodec.h" #include "hevcdec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "vaapi_decode.h" #include "vaapi_hevc.h" #include "h265_profile_level.h" diff --git a/libavcodec/vaapi_mjpeg.c b/libavcodec/vaapi_mjpeg.c index 14e0206ae1..81582114b6 100644 --- a/libavcodec/vaapi_mjpeg.c +++ b/libavcodec/vaapi_mjpeg.c @@ -19,7 +19,7 @@ #include #include -#include "hwaccel.h" +#include "hwconfig.h" #include "vaapi_decode.h" #include "mjpegdec.h" diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index aaed434c88..26e0cd827c 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "hwaccel.h" +#include "hwconfig.h" #include "mpegutils.h" #include "mpegvideo.h" #include "internal.h" diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index 11860ff747..71e155154c 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -21,7 +21,7 @@ */ #include "h263.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "mpeg4video.h" #include "mpegvideo.h" diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index 921ca6391b..4e9607d9be 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "vaapi_decode.h" #include "vc1.h" diff --git a/libavcodec/vaapi_vp8.c b/libavcodec/vaapi_vp8.c index 2426b30f13..06c23e760b 100644 --- a/libavcodec/vaapi_vp8.c +++ b/libavcodec/vaapi_vp8.c @@ -19,7 +19,7 @@ #include #include -#include "hwaccel.h" +#include "hwconfig.h" #include "vaapi_decode.h" #include "vp8.h" diff --git a/libavcodec/vaapi_vp9.c b/libavcodec/vaapi_vp9.c index f384ba7873..776382f683 100644 --- a/libavcodec/vaapi_vp9.c +++ b/libavcodec/vaapi_vp9.c @@ -22,7 +22,7 @@ #include "libavutil/pixdesc.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "vaapi_decode.h" #include "vp9shared.h" diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 15783e3b8d..7809234ff7 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -29,7 +29,7 @@ #include "avcodec.h" #include "blockdsp.h" #include "get_bits.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "mpeg_er.h" #include "mpegvideo.h" diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index 2a260f76ab..5ba73dafd4 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -27,7 +27,7 @@ #include "internal.h" #include "h264dec.h" #include "h264_ps.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "mpegutils.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_hevc.c b/libavcodec/vdpau_hevc.c index 024ac6e2f2..29cb2da078 100644 --- a/libavcodec/vdpau_hevc.c +++ b/libavcodec/vdpau_hevc.c @@ -26,7 +26,7 @@ #include "internal.h" #include "hevc_data.h" #include "hevcdec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_mpeg12.c b/libavcodec/vdpau_mpeg12.c index d286e7e57d..72220ffb4e 100644 --- a/libavcodec/vdpau_mpeg12.c +++ b/libavcodec/vdpau_mpeg12.c @@ -24,7 +24,7 @@ #include #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "mpegvideo.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c index 96f83026a8..93b25beb1f 100644 --- a/libavcodec/vdpau_mpeg4.c +++ b/libavcodec/vdpau_mpeg4.c @@ -24,7 +24,7 @@ #include #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "mpeg4video.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_vc1.c b/libavcodec/vdpau_vc1.c index 671baf96b4..96c91b58be 100644 --- a/libavcodec/vdpau_vc1.c +++ b/libavcodec/vdpau_vc1.c @@ -24,7 +24,7 @@ #include #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "vc1.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_vp9.c b/libavcodec/vdpau_vp9.c index 54e060fad5..a8609d647e 100644 --- a/libavcodec/vdpau_vp9.c +++ b/libavcodec/vdpau_vp9.c @@ -26,7 +26,7 @@ #include "internal.h" #include "vp9data.h" #include "vp9dec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 1794d6d031..bab4223aca 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -27,7 +27,7 @@ #include "libavutil/imgutils.h" #include "avcodec.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "mathops.h" #include "rectangle.h" diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 2a3a4555b9..bf6cc3aea5 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -23,7 +23,7 @@ #include "avcodec.h" #include "get_bits.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "internal.h" #include "profiles.h" #include "thread.h"