noobs 0.0.65 → 0.0.84

package/index.d.ts

@@ -189,6 +189,7 @@ interface Noobs {
   InitPreview(hwnd: Buffer): void;
   ShowPreview(x: number, y: number, width: number, height: number): void;
   HidePreview(): void;
+  GetPreviewScaleFactor(): number;
 }
 
 declare const noobs: Noobs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "noobs",
-  "version": "0.0.65",
+  "version": "0.0.84",
   "description": "A native Node.js addon with libobs bindings for Warcraft Recorder.",
   "main": "index.js",
   "types": "index.d.ts",

package/src/main.cpp

@@ -195,6 +195,16 @@ Napi::Value ObsHidePreview(const Napi::CallbackInfo& info) {
   return info.Env().Undefined();
 }
 
+Napi::Value ObsGetPreviewScaleFactor(const Napi::CallbackInfo& info) {
+  if (!obs) {
+    blog(LOG_ERROR, "ObsGetPreviewScaleFactor called but obs is not initialized");
+    throw std::runtime_error("Obs not initialized");
+  }
+
+  float scaleFactor = obs->getPreviewScaleFactor();
+  return Napi::Number::New(info.Env(), scaleFactor);
+}
+
 Napi::Value ObsCreateSource(const Napi::CallbackInfo& info) {
   if (!obs) {
     blog(LOG_ERROR, "ObsCreateSource called but obs is not initialized");
@@ -443,6 +453,7 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) {
   exports.Set("InitPreview", Napi::Function::New(env, ObsInitPreview));
   exports.Set("ShowPreview", Napi::Function::New(env, ObsShowPreview));
   exports.Set("HidePreview", Napi::Function::New(env, ObsHidePreview));
+  exports.Set("GetPreviewScaleFactor", Napi::Function::New(env, ObsGetPreviewScaleFactor));
 
   return exports;
 }

package/src/obs_interface.cpp

@@ -124,6 +124,11 @@ void ObsInterface::reset_video() {
 
   int success = obs_reset_video(&ovi);
 
+  obs_enter_graphics();
+  int  dt = gs_get_device_type();
+  blog(LOG_INFO, "Device type = %d", dt);  // should be 1 for D3D11
+  obs_leave_graphics();
+
   if (success != OBS_VIDEO_SUCCESS) {
     blog(LOG_ERROR, "Failed to reset video!");
     throw std::runtime_error("Failed to reset video!");
@@ -163,7 +168,14 @@ void ObsInterface::init_obs(const std::string& pluginPath, const std::string& da
     dp += '/';
   }
 
-  obs_add_data_path(dp.c_str());  // This is deprecated in libobs but it works for now.
+  // We need this before resetting video and audio to ensure the effects
+  // are available. The function is deprecated in libobs but it works for
+  // now.
+  obs_add_data_path(dp.c_str());
+
+  // This must come before loading modules to initialize D3D11.
+  reset_video();
+  reset_audio();
 
   std::vector<std::string> modules = { 
     "obs-x264.dll", 
@@ -185,9 +197,6 @@ void ObsInterface::init_obs(const std::string& pluginPath, const std::string& da
   list_input_types();
   list_output_types();
 
-  reset_video();
-  reset_audio();
-
   blog(LOG_INFO, "Exit init_obs");
 }
 
@@ -285,9 +294,9 @@ void ObsInterface::create_video_encoders() {
 
   blog(LOG_INFO, "Set file video encoder settings");
   obs_data_t* venc_settings = obs_data_create();
-  obs_data_set_string(venc_settings, "preset", "speed");  // Faster preset
+  // obs_data_set_string(venc_settings, "preset", "speed");  // Faster preset
   obs_data_set_string(venc_settings, "rate_control", "CRF");
-  obs_data_set_int(venc_settings, "crf", 30);
+  obs_data_set_int(venc_settings, "crf", 22);
   obs_data_set_string(venc_settings, "profile", "main");
   obs_data_set_int(venc_settings, "keyint_sec", 1); // Set keyframe interval to 1 second
 
@@ -513,6 +522,12 @@ bool draw_box(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
   float width =  obs_source_get_width(src) * scale.x;
   float height = obs_source_get_height(src) * scale.y;
 
+  if (width <= 0 || height <= 0) {
+    // Don't want to call gs_draw_sprite with zero width or height.
+    // It is obviously nonsense and leads to log spam. Just return early.
+    return true;
+  }
+
   // Draw rectangle around the source using the position and size
   gs_effect_t *solid = obs_get_base_effect(OBS_EFFECT_SOLID);
   gs_eparam_t *color = gs_effect_get_param_by_name(solid, "color");
@@ -530,25 +545,25 @@ bool draw_box(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
   // Top border
   gs_matrix_push();
   gs_matrix_translate3f(pos.x, pos.y, 0.0f);
-  gs_draw_sprite(nullptr, 0, width, 2.0f);
+  gs_draw_sprite(nullptr, 0, width, 4.0f);
   gs_matrix_pop();
 
   // Bottom border
   gs_matrix_push();
-  gs_matrix_translate3f(pos.x, pos.y + height - 2.0f, 0.0f);
-  gs_draw_sprite(nullptr, 0, width, 2.0f);
+  gs_matrix_translate3f(pos.x, pos.y + height - 4.0f, 0.0f);
+  gs_draw_sprite(nullptr, 0, width, 4.0f);
   gs_matrix_pop();
 
   // Left border
   gs_matrix_push();
   gs_matrix_translate3f(pos.x, pos.y, 0.0f);
-  gs_draw_sprite(nullptr, 0, 2.0f, height);
+  gs_draw_sprite(nullptr, 0, 4.0f, height);
   gs_matrix_pop();
 
   // Right border
   gs_matrix_push();
-  gs_matrix_translate3f(pos.x + width - 2.0f, pos.y, 0.0f);
-  gs_draw_sprite(nullptr, 0, 2.0f, height);
+  gs_matrix_translate3f(pos.x + width - 4.0f, pos.y, 0.0f);
+  gs_draw_sprite(nullptr, 0, 4.0f, height);
   gs_matrix_pop();
 
   gs_matrix_pop();
@@ -560,22 +575,46 @@ bool draw_box(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
 }
 
 void draw_callback(void* data, uint32_t cx, uint32_t cy) {
-  // Initially, draw the OBS scene texture
-  obs_render_main_texture();
+  obs_video_info ovi;
+  obs_get_video_info(&ovi);
 
-  // This is some AI code that would draw a rectangle (and works).
-  // Set projection and viewport
-  gs_ortho(0.0f, float(cx), 0.0f, float(cy), -100.0f, 100.0f);
-  gs_set_viewport(0, 0, cx, cy);
+  float scaleX = float(cx) / float(ovi.base_width);
+  float scaleY = float(cy) / float(ovi.base_height);
+
+  float previewScale;
+
+  // Pick the limiting scale factor.
+  if (scaleX < scaleY) {
+    previewScale = scaleX;
+  } else {
+    previewScale = scaleY;
+  }
+
+  int previewCX = int(previewScale * ovi.base_width);
+  int previewCY = int(previewScale * ovi.base_height);
+  int previewX = (cx - previewCX) / 2;
+  int previewY = (cy - previewCY) / 2;
+
+  gs_viewport_push();
+	gs_projection_push();
+
+  gs_ortho(0.0f, float(ovi.base_width), 0.0f, float(ovi.base_height), -100.0f, 100.0f);
+  gs_set_viewport(previewX, previewY, previewCX, previewCY);
+
+  // Renders the scene now the graphics context is setup.
+  obs_render_main_texture();
 
-  // This was me trying to understand what OSN does.
+  // Draw boxes around sources.
   obs_scene_t* scene = obs_get_scene_by_name("WCR Scene");
   obs_scene_enum_items(scene, draw_box, NULL);
   obs_scene_release(scene);
+
+	gs_projection_pop();
+	gs_viewport_pop();
 }
 
 void ObsInterface::initPreview(HWND parent) {
-  blog(LOG_INFO, "ObsInterface::showPreview");
+  blog(LOG_INFO, "ObsInterface::initPreview");
 
   if (!preview_hwnd) {
     blog(LOG_INFO, "Creating preview child window");
@@ -632,13 +671,15 @@ void ObsInterface::showPreview(int x, int y, int width, int height) {
     return;
   }
 
+  blog(LOG_INFO, "Showing preview child window at (%d, %d) with size (%d x %d)", x, y, width, height);
+
   // Resize and move the existing child window.
   bool success = SetWindowPos(
     preview_hwnd,                  // Handle to the child window
     NULL,                          // No Z-order change
     x, y,                          // New position (x, y)
     width, height,                 // New size (width, height)
-    SWP_NOZORDER | SWP_NOACTIVATE  // Don't change position, Z-order, or activation
+    SWP_NOACTIVATE                 // Flags
   );
 
   if (!success) {
@@ -646,6 +687,11 @@ void ObsInterface::showPreview(int x, int y, int width, int height) {
     return;
   }
 
+  uint32_t w, h;
+  obs_display_size(display, &w, &h); // Get the display size to match the video context.
+  blog(LOG_INFO, "Current Display size set to (%d x %d)", w, h);
+
+  obs_display_resize(display, width, height);
   ShowWindow(preview_hwnd, SW_SHOW);
   obs_display_set_enabled(display, true);
 }
@@ -661,6 +707,33 @@ void ObsInterface::hidePreview() {
   obs_display_set_enabled(display, false);
 }
 
+float ObsInterface::getPreviewScaleFactor() {
+  if (!display) {
+    blog(LOG_WARNING, "Display not initialized");
+    return 1.0f; // Default scale
+  }
+
+  obs_video_info ovi;
+  obs_get_video_info(&ovi);
+
+  uint32_t width, height;
+	obs_display_size(display, &width, &height);
+
+  float scaleX = float(width) / float(ovi.base_width);
+  float scaleY = float(height) / float(ovi.base_height);
+
+  float previewScale;
+
+  // Pick the limiting scale factor.
+  if (scaleX < scaleY) {
+    previewScale = scaleX;
+  } else {
+    previewScale = scaleY;
+  }
+
+  return previewScale;
+}
+
 ObsInterface::ObsInterface(
   const std::string& pluginPath, 
   const std::string& logPath, 
@@ -915,8 +988,6 @@ void ObsInterface::removeSourceFromScene(std::string name) {
 
 void ObsInterface::getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale) 
 {
-  blog(LOG_INFO, "ObsInterface::getSourcePos called");
-
   obs_source_t *src = obs_get_source_by_name(name.c_str());
   obs_sceneitem_t *item = obs_scene_find_source(scene, name.c_str());
 
@@ -936,12 +1007,9 @@ void ObsInterface::getSourcePos(std::string name, vec2* pos, vec2* size, vec2* s
   // Pre-scaled sizes.
   size->x = obs_source_get_width(src);
   size->y = obs_source_get_height(src);
-
-  blog(LOG_INFO, "ObsInterface::getSourcePos exited");
 }
 
 void ObsInterface::setSourcePos(std::string name, vec2* pos, vec2* scale) {
-  blog(LOG_INFO, "ObsInterface::moveSource called");
   obs_sceneitem_t *item = obs_scene_find_source(scene, name.c_str());
 
   if (!item) {

package/src/obs_interface.h

@@ -40,6 +40,7 @@ class ObsInterface {
     void initPreview(HWND parent); // Must call this before showPreview to setup resources.
     void showPreview(int x, int y, int width, int height); // Also used for moving and resizing.
     void hidePreview(); // Hide the preview display.
+    float getPreviewScaleFactor(); // Get the current scale factor of the preview.
 
     std::vector<std::string> get_available_video_encoders();