noobs 0.0.130 → 0.0.141

package/index.d.ts

@@ -147,6 +147,10 @@ export type SceneItemPosition = {
   y: number; // Y position in pixels
   scaleX: number; // X scaling factor
   scaleY: number; // Y scaling factor
+  cropLeft: number; // Pixels to crop from the left
+  cropRight: number; // Pixels to crop from the right
+  cropTop: number; // Pixels to crop from the top
+  cropBottom: number; // Pixels to crop from the bottom
 };
 
 export type SourceDimensions = {

package/package.json

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

package/src/main.cpp

@@ -554,16 +554,24 @@ Napi::Value ObsGetSourcePos(const Napi::CallbackInfo& info) {
 
   std::string name = info[0].As<Napi::String>().Utf8Value();
 
-  vec2 pos; vec2 size; vec2 scale;
-  obs->getSourcePos(name, &pos, &size, &scale);
+  vec2 pos; vec2 size; vec2 scale; obs_sceneitem_crop crop;
+  obs->getSourcePos(name, &pos, &size, &scale, &crop);
 
   Napi::Object result = Napi::Object::New(info.Env());
+
   result.Set("x", Napi::Number::New(info.Env(), pos.x));
   result.Set("y", Napi::Number::New(info.Env(), pos.y));
+
   result.Set("width", Napi::Number::New(info.Env(), size.x));
   result.Set("height", Napi::Number::New(info.Env(), size.y));
   result.Set("scaleX", Napi::Number::New(info.Env(), scale.x));
   result.Set("scaleY", Napi::Number::New(info.Env(), scale.y));
+
+  result.Set("cropLeft", Napi::Number::New(info.Env(), crop.left));
+  result.Set("cropRight", Napi::Number::New(info.Env(), crop.right));
+  result.Set("cropTop", Napi::Number::New(info.Env(), crop.top));
+  result.Set("cropBottom", Napi::Number::New(info.Env(), crop.bottom));
+
   return result;
 }
 
@@ -593,7 +601,13 @@ Napi::Value ObsSetSourcePos(const Napi::CallbackInfo& info) {
   float scaleY = position.Get("scaleY").As<Napi::Number>().FloatValue();
   vec2 scale = { scaleX, scaleY };
 
-  obs->setSourcePos(name, &pos, &scale);
+  int cropLeft = position.Get("cropLeft").As<Napi::Number>().Int32Value();
+  int cropRight = position.Get("cropRight").As<Napi::Number>().Int32Value();
+  int cropTop = position.Get("cropTop").As<Napi::Number>().Int32Value();
+  int cropBottom = position.Get("cropBottom").As<Napi::Number>().Int32Value();
+  obs_sceneitem_crop crop = { cropLeft, cropTop, cropRight, cropBottom }; // Careful with ordering.
+
+  obs->setSourcePos(name, &pos, &scale, &crop);
   return info.Env().Undefined();
 }
 

package/src/obs_interface.cpp

@@ -401,11 +401,12 @@ std::string ObsInterface::createSource(std::string name, std::string type) {
     obs_volmeter_t *volmeter = obs_volmeter_create(OBS_FADER_CUBIC);
     obs_volmeter_attach_source(volmeter, source);
 
-    SignalContext* ctx = new SignalContext{ this, real_name }; // TODO don't leak this.
+    SignalContext* ctx = new SignalContext{ this, real_name };
     obs_volmeter_add_callback(volmeter, volmeter_callback, ctx);
 
     // Store the volmeter in the volmeters map.
     volmeters[real_name] = volmeter;
+    volmeter_cb_ctx[real_name] = ctx; // Track this so we can free it later.
   }
 
   if (type == AUDIO_INPUT && force_mono) {
@@ -462,6 +463,15 @@ void ObsInterface::deleteSource(std::string name) {
     volmeters.erase(name);
   }
 
+  // Now deal with the callback context.
+  auto ctx_it = volmeter_cb_ctx.find(name);
+
+  if (ctx_it != volmeter_cb_ctx.end()) {
+    SignalContext* ctx = ctx_it->second;
+    delete ctx;
+    volmeter_cb_ctx.erase(ctx_it);
+  }
+
   // Now deal with the source itself.
   auto it = sources.find(name);
 
@@ -508,7 +518,6 @@ obs_data_t* ObsInterface::getSourceSettings(std::string name) {
     throw std::runtime_error("Failed to get source settings!");
   }
 
-  // obs_data_release(settings); TODO release after returning to client.
   return settings;
 }
 
@@ -588,14 +597,15 @@ void ObsInterface::disconnect_signal_handlers(obs_output_t *output) {
 
 bool draw_source_outline(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
   // Get the item position and size
-  vec2 pos; vec2 scale;
+  vec2 pos; vec2 scale; obs_sceneitem_crop crop;
   obs_sceneitem_get_pos(item, &pos);
   obs_sceneitem_get_scale(item, &scale);
+  obs_sceneitem_get_crop(item, &crop);
 
   // Calculate actual size with scaling
   obs_source_t *src = obs_sceneitem_get_source(item);
-  float width =  obs_source_get_width(src) * scale.x;
-  float height = obs_source_get_height(src) * scale.y;
+  float width =  (obs_source_get_width(src) - crop.left - crop.right) * scale.x;
+  float height = (obs_source_get_height(src) - crop.top - crop.bottom) * scale.y;
 
   if (width <= 0 || height <= 0) {
     // Don't want to call gs_draw_sprite with zero width or height.
@@ -625,7 +635,7 @@ bool draw_source_outline(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
 
   // Bottom border
   gs_matrix_push();
-  gs_matrix_translate3f(pos.x, pos.y + height - 4.0f, 0.0f);
+  gs_matrix_translate3f(pos.x, pos.y  + height - 4.0f, 0.0f);
   gs_draw_sprite(nullptr, 0, width, 4.0f);
   gs_matrix_pop();
 
@@ -643,7 +653,7 @@ bool draw_source_outline(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
 
   // Dragging point box (25x25 pixels in bottom-right corner)
   gs_matrix_push();
-  gs_matrix_translate3f(pos.x + width - 25.0f, pos.y + height - 25.0f, 0.0f);
+  gs_matrix_translate3f(pos.x + width - 25.0f, pos.y  + height - 25.0f, 0.0f);
   gs_draw_sprite(nullptr, 0, 25.0f, 25.0f);
   gs_matrix_pop();
 
@@ -743,8 +753,8 @@ void ObsInterface::initPreview(HWND parent) {
 
     gs_init_data gs_data = {};
     gs_data.adapter = 0;
-    gs_data.cx = 1920; // TODO get from video context?
-    gs_data.cy = 1080; // TODO get from video context?
+    gs_data.cx = 1920; // Gets overwritten when we call configurePreview().
+    gs_data.cy = 1080; // Gets overwritten when we call configurePreview().
     gs_data.format = GS_BGRA;
     gs_data.zsformat = GS_ZS_NONE;
     gs_data.num_backbuffers = 1;
@@ -787,9 +797,6 @@ void ObsInterface::configurePreview(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);
   obs_display_set_enabled(display, true);
 }
@@ -897,6 +904,12 @@ ObsInterface::~ObsInterface() {
     volmeters.erase(kv.first);
   }
 
+  for (auto& kv : volmeter_cb_ctx) {
+    SignalContext* ctx = kv.second;
+    delete ctx;
+    volmeter_cb_ctx.erase(kv.first);
+  }
+
   delete starting_ctx;
   delete start_ctx;
   delete stopping_ctx;
@@ -1114,22 +1127,25 @@ std::string ObsInterface::getLastRecording() {
 void ObsInterface::addSourceToScene(std::string name) {
   blog(LOG_INFO, "ObsInterface::addSourceToScene called for source: %s", name.c_str());
 
+  obs_sceneitem_t *item = obs_scene_find_source(scene, name.c_str());
+
+  if (item) {
+    blog(LOG_WARNING, "Source %s already in scene", name.c_str());
+    return;
+  }
+
   auto it = sources.find(name);
 
   if (it == sources.end()) {
     blog(LOG_WARNING, "Source %s not found when adding to scene", name.c_str());
-    throw std::runtime_error("Source not found!");
+    return;
   }
 
   obs_source_t* source = it->second;
-
-  // TODO refuse to add twice?
-  obs_sceneitem_t *item = obs_scene_add(scene, source);
+  item = obs_scene_add(scene, source);
 
   if (!item) {
     blog(LOG_ERROR, "Failed to add source to scene: %s", name.c_str());
-    obs_source_release(source);
-    throw std::runtime_error("Failed to add source to scene");
   }
   
   blog(LOG_INFO, "ObsInterface::addSourceToScene exited");
@@ -1149,7 +1165,7 @@ void ObsInterface::removeSourceFromScene(std::string name) {
   blog(LOG_INFO, "ObsInterface::removeSourceFromScene exited");
 }
 
-void ObsInterface::getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale) 
+void ObsInterface::getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale, obs_sceneitem_crop* crop) 
 {
   auto it = sources.find(name);
 
@@ -1174,13 +1190,14 @@ void ObsInterface::getSourcePos(std::string name, vec2* pos, vec2* size, vec2* s
 
   obs_sceneitem_get_pos(item, pos);
   obs_sceneitem_get_scale(item, scale);
+  obs_sceneitem_get_crop(item, crop);
 
   // Pre-scaled sizes.
   size->x = obs_source_get_width(source);
   size->y = obs_source_get_height(source);
 }
 
-void ObsInterface::setSourcePos(std::string name, vec2* pos, vec2* scale) {
+void ObsInterface::setSourcePos(std::string name, vec2* pos, vec2* scale, obs_sceneitem_crop* crop) {
   obs_sceneitem_t *item = obs_scene_find_source(scene, name.c_str());
 
   if (!item) {
@@ -1190,6 +1207,7 @@ void ObsInterface::setSourcePos(std::string name, vec2* pos, vec2* scale) {
 
   obs_sceneitem_set_pos(item, pos);
   obs_sceneitem_set_scale(item, scale);
+  obs_sceneitem_set_crop(item, crop);
 }
 
 std::vector<std::string> ObsInterface::listAvailableVideoEncoders()

package/src/obs_interface.h

@@ -67,8 +67,8 @@ class ObsInterface {
 
     void addSourceToScene(std::string name); // Add source to scene.
     void removeSourceFromScene(std::string name); // Remove source from scene.
-    void getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale); // Size is returned to allow clients to calculate scale.
-    void setSourcePos(std::string name, vec2* pos, vec2* scale); // Size does not get set here because it's set by the source itself.
+    void getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale, obs_sceneitem_crop* crop); // Size is returned to allow clients to calculate scale.
+    void setSourcePos(std::string name, vec2* pos, vec2* scale, obs_sceneitem_crop* crop); // Size does not get set here because it's set by the source itself.
 
     void initPreview(HWND parent); // Must call this before showPreview to setup resources.
     void configurePreview(int x, int y, int width, int height); // Move and resize the preview display.
@@ -85,6 +85,7 @@ class ObsInterface {
     std::map<std::string, obs_source_t*> sources; // Map of source names to obs_source_t pointers. 
     std::map<std::string, SourceSize> sizes; // Map of source names to their last known size, used for firing callbacks on size changes. 
     std::map<std::string, obs_volmeter_t*> volmeters; // Map of source names to obs_volmeter_t pointers.
+    std::map<std::string, SignalContext*> volmeter_cb_ctx; // Map of volmeter callback contexts.
     std::map<std::string, obs_source_t*> filters; // Map of source names to obs_source_t filter pointers.
 
     void sourceCallback(std::string name); // Send callback for source change.