Skip to content

feat: Add the logic for switching cameras by USB groups. #499

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

Closed
add-uos wants to merge 1 commit into from
Closed

feat: Add the logic for switching cameras by USB groups. #499

Show file tree
Hide file tree
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
10 changes: 10 additions & 0 deletions src/assets/org.deepin.camera.encode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,16 @@
"description": "is preview no delay or not",
"permissions": "readwrite",
"visibility": "private"
},
"enableUsbGroup": {
"value": false,
"serial": 0,
"flags": ["global"],
"name": "enable USB group",
"name[zh_CN]": "是否启用USB摄像头分组",
"description": "Enable USB group",
"permissions": "readwrite",
"visibility": "private"
}
}
}
6 changes: 6 additions & 0 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@ int main(int argc, char *argv[])
DataManager::instance()->setPreviewNoDelay(dconfig->value("previewNoDelay", false).toBool());
}

if (dconfig && dconfig->isValid() && dconfig->keyList().contains("enableUsbGroup")) {
bool enable = dconfig->value("enableUsbGroup").toBool();
qInfo() << "enable USB group:" << enable;
DataManager::instance()->setEnableUsbGroup(enable);
}

if (!libVaDriverName.isEmpty()) {
qputenv("LIBVA_DRIVER_NAME", libVaDriverName.toLocal8Bit());
}
Expand Down
11 changes: 11 additions & 0 deletions src/src/basepub/datamanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,16 @@ class DataManager: public QObject
*/
bool isPreviewNoDelay() const { return m_isPreviewNoDelay; };

/**
* @brief 设置是否启用USB摄像头分组
* @param enable
*/
void setEnableUsbGroup(bool enable) { m_enableUsbGroup = enable; };
/**
* @brief 获取是否启用USB摄像头分组
* @return
*/
bool isEnableUsbGroup() const { return m_enableUsbGroup; };
private:
DataManager();
static DataManager *m_dataManager;
Expand All @@ -176,5 +186,6 @@ class DataManager: public QObject
bool m_H264EncoderExists;
bool m_isSupportCameraSwitch = false; // 是否带有摄像头开关
bool m_isPreviewNoDelay = false; // 是否预览无延迟
bool m_enableUsbGroup = false; // 是否启用USB摄像头分组
};
#endif // DATAMANAGER_H
129 changes: 105 additions & 24 deletions src/src/videowidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,39 +1243,89 @@ void videowidget::onChangeDev()
}

v4l2_device_list_t *devlist = get_device_list();
if (devlist->num_devices == 2) {
qDebug() << "device list has 2 devices";
for (int i = 0 ; i < devlist->num_devices; i++) {
QString str1 = QString(devlist->list_devices[i].device);
if (str != str1) {
if (E_OK == switchCamera(devlist->list_devices[i].device, devlist->list_devices[i].name)) {
break;
if (devlist == nullptr) {
qWarning() << "get device list FAILED";
return;
}

// USB摄像头分组相关逻辑来自xiwo分支，是否开启由DConfig控制
int groupNum = 1;
QVector<QPair<QString, QVector<v4l2_dev_sys_data_t *>>> vGroupData;
// 如果未启用USB摄像头分组，则分组数默认为1，保持原有逻辑；
// 如果启用USB摄像头分组，则实际获取USB分组情况，根据分组结果进行处理；
if (DataManager::instance()->isEnableUsbGroup()) {
// 必须确保 devlist 的生命周期长于 vGroupData 的使用周期。
// 如果 devlist 在 vGroupData 使用完毕前被释放，将导致悬空指针，引发崩溃。
// 好在 vGroupData 只在本函数中使用，不会在其他地方被引用，所以不会导致悬空指针问题。
groupNum = getUSBCameraGroup(devlist, vGroupData);
qInfo() << __func__ << "groupNum:" << groupNum;
}
if (groupNum == 1) {
if (devlist->num_devices == 2) {
for (int i = 0 ; i < devlist->num_devices; i++) {
const char *curDev = devlist->list_devices[i].device;
if (str != curDev) {
if (E_OK == switchCamera(curDev, devlist->list_devices[i].name)) {
break;
}
}
}
}
} else {
qDebug() << "device list has not 2 devices";
if (devlist->num_devices == 0) {
DataManager::instance()->setdevStatus(NOCAM);
showNocam();
}
} else {
if (devlist->num_devices == 0) {
DataManager::instance()->setdevStatus(NOCAM);
showNocam();
}

for (int i = 0 ; i < devlist->num_devices; i++) {
QString str1 = QString(devlist->list_devices[i].device);
for (int i = 0 ; i < devlist->num_devices; i++) {
const char *curDev = devlist->list_devices[i].device;
if (str == curDev) {
if (i == devlist->num_devices - 1) {
switchCamera(devlist->list_devices[0].device, devlist->list_devices[0].name);
break;
} else {
switchCamera(devlist->list_devices[i + 1].device, devlist->list_devices[i + 1].name);
break;
}
}

if (str == str1) {
if (i == devlist->num_devices - 1) {
if (str.isEmpty()) {
switchCamera(devlist->list_devices[0].device, devlist->list_devices[0].name);
break;
} else {
switchCamera(devlist->list_devices[i + 1].device, devlist->list_devices[i + 1].name);
break;
}
}
}
} else {
if (groupNum == 2) {
for (int i = 0 ; i < vGroupData.count(); i++) {
const char *curDev = vGroupData[i].second[0]->device;
if (str != curDev) {
if (E_OK == switchCamera(curDev, vGroupData[i].second[0]->name)) {
break;
}
}
}
} else {
if (devlist->num_devices == 0) {
DataManager::instance()->setdevStatus(NOCAM);
showNocam();
}

if (str.isEmpty()) {
switchCamera(devlist->list_devices[0].device, devlist->list_devices[0].name);
break;
for (int i = 0 ; i < vGroupData.count(); i++) {
const char *curDev = vGroupData[i].second[0]->device;
if (str == curDev) {
if (i == vGroupData.count() - 1) {
switchCamera(vGroupData[0].second[0]->device, vGroupData[0].second[0]->name);
break;
} else {
switchCamera(vGroupData[i + 1].second[0]->device, vGroupData[i + 1].second[0]->name);
break;
}
}

if (str.isEmpty()) {
switchCamera(vGroupData[0].second[0]->device, vGroupData[0].second[0]->name);
break;
}
}
}
}
Expand Down Expand Up @@ -1337,6 +1387,37 @@ int videowidget::switchCamera(const char *device, const char *devName)
return ret;
}

int videowidget::getUSBCameraGroup(v4l2_device_list_t *devlist, QVector<QPair<QString, QVector<v4l2_dev_sys_data_t *>>> &vGroupData)
{
// 来自xiwo分支，根据location进行分组
// 收到建议使用 QMap<QString, QVector<v4l2_dev_sys_data_t *>> 来存储分组数据，但我们担心影响现有代码逻辑，
// 所以暂时保留 QVector<QPair<QString, QVector<v4l2_dev_sys_data_t *>>> 来存储分组数据。
if (devlist == nullptr) {
qWarning() << __func__ << "devlist is NULL!";
return 0;
}

Comment on lines +1390 to +1399

@sourcery-ai sourcery-ai Bot Jul 21, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion (bug_risk): getUSBCameraGroup assumes vGroupData is empty and will append to existing content if reused.

Currently vGroupData is always appended to and never cleared. With the existing usage (onChangeDev) this works because a new empty vector is passed each time. But the signature allows for reuse with a non-empty vGroupData, which would cause repeated calls to accumulate stale groups and double-count entries. To avoid that, either clear vGroupData at the start of the function or explicitly enforce/document that it must be empty on entry (e.g., via an assertion).

for (int i = 0 ; i < devlist->num_devices; i++) {
QString location = QString(devlist->list_devices[i].location);

int j = 0;
for (; j < vGroupData.count(); j++) {
if (location == vGroupData.at(j).first) {
break;
}
}
if (j == vGroupData.count()) {
QVector<v4l2_dev_sys_data_t *> vList;
vList.append(&devlist->list_devices[i]);
vGroupData.append(qMakePair(location, vList));
} else {
QVector<v4l2_dev_sys_data_t *> &vlist = vGroupData[j].second;
vlist.append(&devlist->list_devices[i]);
}
}
return vGroupData.count();
}

QString videowidget::getSaveFilePrefix()
{
qDebug() << "Entering getSaveFilePrefix";
Expand Down
8 changes: 8 additions & 0 deletions src/src/videowidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,14 @@ private slots:
*/
int switchCamera(const char *device, const char *devName);

/**
* @brief 获取USB摄像头分组
* @param devlist 设备列表
* @param vGroupData 分组
* @return 分组个数
*/
int getUSBCameraGroup(v4l2_device_list_t *devlist, QVector<QPair<QString, QVector<v4l2_dev_sys_data_t *>>> &vGroupData);

/**
* @brief getSaveFilePrefix
* @return UOS_ 专业版 DEEPIN_ 社区版 CAMERA_ 其他
Expand Down
Loading