From 323db1c9072aa1338a00dc0ddd35c655bf1e4918 Mon Sep 17 00:00:00 2001
From: GloriousEggroll <gloriouseggroll@gmail.com>
Date: Mon, 16 Jan 2023 11:30:15 -0700
Subject: [PATCH] encoder rename

---
 plugins/obs-ffmpeg/jim-nvenc.c        | 4 ++--
 plugins/obs-ffmpeg/obs-ffmpeg-av1.c   | 4 ++--
 plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c | 4 ++--
 plugins/obs-ffmpeg/texture-amf.cpp    | 4 ++--
 plugins/obs-x264/obs-x264.c           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/obs-ffmpeg/jim-nvenc.c b/plugins/obs-ffmpeg/jim-nvenc.c
index 7b247c8..5c4be0f 100644
--- a/plugins/obs-ffmpeg/jim-nvenc.c
+++ b/plugins/obs-ffmpeg/jim-nvenc.c
@@ -227,14 +227,14 @@ static void nv_texture_free(struct nvenc_data *enc, struct nv_texture *nvtex)
 static const char *h264_nvenc_get_name(void *type_data)
 {
 	UNUSED_PARAMETER(type_data);
-	return "NVIDIA NVENC H.264";
+	return "GPU: Nvidia NVENC H.264";
 }
 
 #ifdef ENABLE_HEVC
 static const char *hevc_nvenc_get_name(void *type_data)
 {
 	UNUSED_PARAMETER(type_data);
-	return "NVIDIA NVENC HEVC";
+	return "GPU: Nvidia NVENC H.265/HEVC";
 }
 #endif
 
diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-av1.c b/plugins/obs-ffmpeg/obs-ffmpeg-av1.c
index de7e237..7ea3cf7 100644
--- a/plugins/obs-ffmpeg/obs-ffmpeg-av1.c
+++ b/plugins/obs-ffmpeg/obs-ffmpeg-av1.c
@@ -41,13 +41,13 @@ struct av1_encoder {
 static const char *aom_av1_getname(void *unused)
 {
 	UNUSED_PARAMETER(unused);
-	return "AOM AV1";
+	return "CPU: AOM AV1";
 }
 
 static const char *svt_av1_getname(void *unused)
 {
 	UNUSED_PARAMETER(unused);
-	return "SVT-AV1";
+	return "CPU: SVT-AV1";
 }
 
 static void av1_video_info(void *data, struct video_scale_info *info)
diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c b/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
index f0f7747..b5f5d0d 100644
--- a/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
+++ b/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
@@ -43,7 +43,7 @@ struct nvenc_encoder {
 extern bool ubuntu_20_04_nvenc_fallback;
 #endif
 
-#define ENCODER_NAME_H264 "NVIDIA NVENC H.264 (FFmpeg)"
+#define ENCODER_NAME_H264 "GPU: Nvidia NVENC H.264"
 static const char *h264_nvenc_getname(void *unused)
 {
 	UNUSED_PARAMETER(unused);
@@ -51,7 +51,7 @@ static const char *h264_nvenc_getname(void *unused)
 }
 
 #ifdef ENABLE_HEVC
-#define ENCODER_NAME_HEVC "NVIDIA NVENC HEVC (FFmpeg)"
+#define ENCODER_NAME_HEVC "GPU: Nvidia NVENC H.265/HEVC"
 static const char *hevc_nvenc_getname(void *unused)
 {
 	UNUSED_PARAMETER(unused);
diff --git a/plugins/obs-ffmpeg/texture-amf.cpp b/plugins/obs-ffmpeg/texture-amf.cpp
index 7916cf8..92e57e0 100644
--- a/plugins/obs-ffmpeg/texture-amf.cpp
+++ b/plugins/obs-ffmpeg/texture-amf.cpp
@@ -1173,7 +1173,7 @@ static obs_properties_t *amf_av1_properties(void *unused)
 
 static const char *amf_avc_get_name(void *)
 {
-	return "AMD HW H.264 (AVC)";
+	return "GPU: AMD AMF H.264";
 }
 
 static inline int get_avc_preset(amf_base *enc, const char *preset)
@@ -1508,7 +1508,7 @@ static void register_avc()
 
 static const char *amf_hevc_get_name(void *)
 {
-	return "AMD HW H.265 (HEVC)";
+	return "GPU: AMD AMF H.265/HEVC";
 }
 
 static inline int get_hevc_preset(amf_base *enc, const char *preset)
diff --git a/plugins/obs-x264/obs-x264.c b/plugins/obs-x264/obs-x264.c
index 3955dff..b60e990 100644
--- a/plugins/obs-x264/obs-x264.c
+++ b/plugins/obs-x264/obs-x264.c
@@ -68,7 +68,7 @@ struct obs_x264 {
 static const char *obs_x264_getname(void *unused)
 {
 	UNUSED_PARAMETER(unused);
-	return "x264";
+	return "CPU: x264";
 }
 
 static void obs_x264_stop(void *data);
-- 
2.39.0