Skip to content

Remove 'orUrl' from 'modelNameOrUrl' in objectDetector #1470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove 'orUrl' from 'modelNameOrUrl' in objectDetector #1470

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/ObjectDetector/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ class ObjectDetector {
*/
/**
* Create ObjectDetector model. Works on video and images.
* @param {string} modelNameOrUrl - The name or the URL of the model to use. Current model name options
* @param {string} modelName - The name of the model to use. Current model name options
* are: 'YOLO' and 'CocoSsd'.
* @param {Object} options - Optional. A set of options.
* @param {function} callback - Optional. A callback function that is called once the model has loaded.
*/
constructor(modelNameOrUrl, video, options, callback) {
constructor(modelName, video, options, callback) {
this.video = video;
this.modelNameOrUrl = modelNameOrUrl;
this.modelNameOrUrl = modelName;
this.options = options || {};
this.callback = callback;

switch (modelNameOrUrl) {
switch (modelName) {
case "yolo":
this.model = new YOLO(
this.video,
Expand All @@ -58,9 +58,7 @@ const objectDetector = (...inputs) => {
.require('string', 'Please specify a model to use. E.g: "YOLO"');

let model = string;
// TODO: I think we should delete this.
if (model.indexOf("http") === -1) {
model = model.toLowerCase();
model = model.toLowerCase();
}

const instance = new ObjectDetector(model, video, options, callback);
Expand Down