瀏覽代碼

obs-ffmpeg: NVENC "(new)" begone

It's about time to get rid of this being labeled as "(new)".

Also rename the FFmpeg variant. And make it more explicit when the
FFmpeg encoder is being used in the log file.
jp9000 3 年之前
父節點
當前提交
21da0b0462
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 2 2
      plugins/obs-ffmpeg/jim-nvenc.c
  2. 4 4
      plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c

+ 2 - 2
plugins/obs-ffmpeg/jim-nvenc.c

@@ -183,14 +183,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 (new)";
+	return "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 (new)";
+	return "NVIDIA NVENC HEVC";
 }
 #endif
 

+ 4 - 4
plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c

@@ -22,8 +22,8 @@
 
 #include "obs-ffmpeg-video-encoders.h"
 
-#define do_log(level, format, ...)                   \
-	blog(level, "[NVENC encoder: '%s'] " format, \
+#define do_log(level, format, ...)                          \
+	blog(level, "[FFmpeg NVENC encoder: '%s'] " format, \
 	     obs_encoder_get_name(enc->ffve.encoder), ##__VA_ARGS__)
 
 #define warn(format, ...) do_log(LOG_WARNING, format, ##__VA_ARGS__)
@@ -39,7 +39,7 @@ struct nvenc_encoder {
 	DARRAY(uint8_t) sei;
 };
 
-#define ENCODER_NAME_H264 "NVIDIA NVENC H.264"
+#define ENCODER_NAME_H264 "NVIDIA NVENC H.264 (FFmpeg)"
 static const char *h264_nvenc_getname(void *unused)
 {
 	UNUSED_PARAMETER(unused);
@@ -47,7 +47,7 @@ static const char *h264_nvenc_getname(void *unused)
 }
 
 #ifdef ENABLE_HEVC
-#define ENCODER_NAME_HEVC "NVIDIA NVENC HEVC"
+#define ENCODER_NAME_HEVC "NVIDIA NVENC HEVC (FFmpeg)"
 static const char *hevc_nvenc_getname(void *unused)
 {
 	UNUSED_PARAMETER(unused);