Procházet zdrojové kódy

Make x264 internal logging use the log macros

jp9000 před 11 roky
rodič
revize
2956386109
1 změnil soubory, kde provedl 6 přidání a 2 odebrání
  1. 6 2
      plugins/obs-x264/obs-x264.c

+ 6 - 2
plugins/obs-x264/obs-x264.c

@@ -217,9 +217,12 @@ static bool reset_x264_params(struct obs_x264 *obsx264,
 
 
 static void log_x264(void *param, int level, const char *format, va_list args)
 static void log_x264(void *param, int level, const char *format, va_list args)
 {
 {
-	blogva(LOG_INFO, format, args);
+	struct obs_x264 *obsx264 = param;
+	char str[1024];
+
+	vsnprintf(str, 1024, format, args);
+	info("%s", str);
 
 
-	UNUSED_PARAMETER(param);
 	UNUSED_PARAMETER(level);
 	UNUSED_PARAMETER(level);
 }
 }
 
 
@@ -248,6 +251,7 @@ static void update_params(struct obs_x264 *obsx264, obs_data_t settings,
 	obsx264->params.i_fps_num            = voi->fps_num;
 	obsx264->params.i_fps_num            = voi->fps_num;
 	obsx264->params.i_fps_den            = voi->fps_den;
 	obsx264->params.i_fps_den            = voi->fps_den;
 	obsx264->params.pf_log               = log_x264;
 	obsx264->params.pf_log               = log_x264;
+	obsx264->params.p_log_private        = obsx264;
 	obsx264->params.i_log_level          = X264_LOG_WARNING;
 	obsx264->params.i_log_level          = X264_LOG_WARNING;
 
 
 	/* use the new filler method for CBR to allow real-time adjusting of
 	/* use the new filler method for CBR to allow real-time adjusting of