Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
3bf52b5
fix: 添加h264编码器检测,不存在时不支持mp4视频录制
feeengli Jan 10, 2023
04af465
fix: 判断库函数是否导出成功
feeengli Jan 11, 2023
48c906b
fix: 修复默认视频格式不为mp4问题
feeengli Jan 12, 2023
864a9f1
fix: 修复大窗口卡顿问题
pengfeixx Jan 31, 2023
55b88ba
fix: 更新changlog
pengfeixx Feb 7, 2023
7391919
fix: 添加翻译配置文件
pengfeixx Feb 8, 2023
a00df79
chore: new version 1.4.10
feeengli Feb 23, 2023
9f2b3c7
fix: 修复主题切换相关bug
feeengli Feb 27, 2023
5b22b83
fix: 修复焦点初始位置异常
pengfeixx Mar 6, 2023
0671cf5
chore: New tag 1.4.11
feeengli Mar 21, 2023
8a253a9
fix: wayland锁屏后拔插摄像头崩溃问题
feeengli May 4, 2023
6dd09fc
fix: 锁屏后快速解锁,相机崩溃
feeengli May 6, 2023
39bf027
chore: new version 1.4.12
feeengli May 8, 2023
ec5160b
chore: Sync by https://github.com/linuxdeepin/.github/commit/2e5e092b…
May 10, 2023
40e59c5
fix: 最小化后无法唤醒
feeengli May 17, 2023
af79293
fix: update changelog (#251)
pengfeixx May 30, 2023
4148862
fix: 修复wayland下录像未停止问题 (#253)
pengfeixx Jul 12, 2023
9c8f98f
fix: Update changelog (#254)
pengfeixx Jul 12, 2023
724b443
fix: 修复打包失败问题 (#255)
pengfeixx Jul 14, 2023
cf1e32e
fix: 去除多余依赖 (#257)
pengfeixx Jul 19, 2023
df9ab5d
fix: Update changelog (#258)
pengfeixx Jul 19, 2023
d6d561e
fix: 修复USB声卡端口状态正常,但无法获取音频数据时录像崩溃问题
feeengli Aug 1, 2023
970c8a4
fix: 修复wayland下接口未定义 (#260)
pengfeixx Aug 3, 2023
60958d9
fix: Update changelog (#261)
pengfeixx Aug 4, 2023
8563a25
fix: 修复安道大屏闪退问题 (#262)
pengfeixx Sep 6, 2023
22d4cc1
fix: Optimize preview efficiency
lzwind Jul 25, 2024
125bd0b
feat: base master into eagle
Aug 19, 2024
fb194dc
Merge pull request #303 from jeffshuai/release/eagle
max-lvs Aug 19, 2024
33b0f61
fix: the correct get the product machine name
Aug 30, 2024
2d9c20b
fix: hardware encoder stash in 7d55
Oct 21, 2024
78bede6
fix: 相机界面卡住
Nov 6, 2024
76ef7a1
fix: make screen flash stable during take photo
Nov 14, 2024
702a5c8
fix: optimize delay for show
Dec 10, 2024
49abf55
fix: remove invalid url (#345)
wyu71 Dec 20, 2024
7855880
fix: 优化相机显示与录制卡顿回跳问题
myk1343 Dec 20, 2024
9eff0fb
fix: 优化显示界面 (#346)
myk1343 Dec 30, 2024
6fb1958
fix: check vaapi encoder fail
lzwind Jan 3, 2025
d70d7c5
fix: 修复mips问题
myk1343 Jan 7, 2025
05ac5a5
fix: 相机还原后查看设备信息 (#349)
myk1343 Jan 9, 2025
ae6e325
fix: 修复录制视频时卡住闪退
myk1343 Mar 11, 2025
a2b7cdc
fix: 修复录制视频音视频不同步
add-uos Mar 24, 2025
00d8f16
fix: 修复相机上方边框显示一条白线
myk1343 May 7, 2025
331f6b2
fix: 修复4k显示卡顿
myk1343 May 20, 2025
f375e33
fix: 修复调整曝光度的显示问题
myk1343 Jun 16, 2025
8c5f0f0
fix: 修复长时间录制视频音视频不同步
add-uos Jun 18, 2025
1346c80
fix: 移除透明磨砂标题栏
add-uos Jul 27, 2025
68762fe
fix: Fix crash when enabling verbose logging
add-uos Aug 6, 2025
3a47426
fix: Improve close button visibility when USB camera is connected
add-uos Aug 12, 2025
4035523
fix: Improve audio-video sync compatibility in camera recording
add-uos Aug 15, 2025
8da2bc0
fix: Filter ISP pipeline devices to show only standard cameras
add-uos Aug 19, 2025
39d630b
fix: Add project-specific customization
add-uos Aug 21, 2025
24f08d1
fix: Optimize ISP device filtering for better camera compatibility
add-uos Aug 21, 2025
12019b2
feat: Add project-specific device filtering control
add-uos Aug 22, 2025
dcaa412
feat: Add hardware acceleration driver configuration options
add-uos Oct 11, 2025
973d0cc
feat: Implement hardware acceleration driver configuration support
add-uos Oct 11, 2025
69d8574
feat: Add VA-API hardware acceleration for MJPEG decoding
add-uos Oct 11, 2025
d2d696e
fix: Occasional abnormal color of title bar buttons.
lichaofan2008 Oct 21, 2025
7bf3f81
chore: Correction of some misspelled words.
lichaofan2008 Oct 24, 2025
1f11afa
fix: Address potential data truncation issue.
lichaofan2008 Oct 29, 2025
db157c5
fix: Temporarily block 8K resolution to avoid app crashes.
lichaofan2008 Oct 28, 2025
cc3a13b
fix: When the screen is locked while using the camera, face recogniti…
lichaofan2008 Nov 4, 2025
6ebb184
fix: [log] verbosity configuration initialization order
add-uos Oct 13, 2025
2547785
fix(udev): add subsystem and devtype function loading
add-uos Nov 17, 2025
eb8d03f
feat(perf): add periodic decode timing measurements and reduce verbos…
add-uos Nov 17, 2025
c546603
fix: m_isFlash is placed in the wrong place.
lichaofan2008 Nov 20, 2025
51b8076
feat: Listen for SIGTERM and exit the application gracefully.
lichaofan2008 Dec 17, 2025
eabd1bc
fix: Limit the available resolution to 3840x2160.
lichaofan2008 Dec 17, 2025
4c8d011
fix: audio_free_buffers() add a NULL check.
lichaofan2008 Dec 25, 2025
a8dd239
fix: Listen for SIGTERM and exit the application gracefully.
lichaofan2008 Dec 25, 2025
9bd8e96
feat: The prompt images for the FLM(support camera switch) have been …
lichaofan2008 Jan 31, 2026
0d20c75
fix: In the prompt interface, the grid is hidden to improve user expe…
lichaofan2008 Mar 3, 2026
452f400
fix: Add DConfig for preview with no delay.
lichaofan2008 Mar 4, 2026
7420a34
fix: a display logic error in the secondary prompt.
lichaofan2008 Mar 10, 2026
6934da1
feat: Add the logic for switching cameras by USB groups.
lichaofan2008 Mar 12, 2026
b5c2d8e
feat: enable the configuration for 8K preview.
lichaofan2008 Mar 13, 2026
183e017
feat: enable the configuration for device blacklist.
lichaofan2008 Mar 17, 2026
2cdcb53
feat: enable the configuration for the preferred resolution.
lichaofan2008 Mar 19, 2026
36e1019
refactor(video): change default video format to webm
Apr 27, 2026
f4dbb60
chore: bump version 6.0.13
Apr 30, 2026
f60594e
Adjust video format list order for performance
Resurgamz Apr 30, 2026
461e84c
Update Settings.cpp
Resurgamz Apr 30, 2026
8d965a3
Update Settings.cpp
Resurgamz Apr 30, 2026
3e05381
Update videowidget.cpp
Resurgamz Apr 30, 2026
def69ea
Update videowidget.cpp
Resurgamz Apr 30, 2026
5bcb220
Revert "Update videowidget.cpp"
Resurgamz Apr 30, 2026
e725b92
Revert "Update videowidget.cpp"
Resurgamz Apr 30, 2026
9441adc
Revert "Update Settings.cpp"
Resurgamz Apr 30, 2026
72aa9d3
Revert "Update Settings.cpp"
Resurgamz Apr 30, 2026
b4eed54
Revert "Adjust video format list order for performance"
Resurgamz Apr 30, 2026
96b8154
Revert "chore: bump version 6.0.13 bump version"
Resurgamz Apr 30, 2026
ddce7c1
Revert "refactor(video): change default video format to webm"
Resurgamz Apr 30, 2026
7d34be8
chore: bump version 6.0.13
Apr 30, 2026
dc12dc8
fix(ui): set icon opacity for photo mode buttons in takePhotoSettingA…
May 21, 2026
011f009
fix(ui): remove transparent separator lines between filter buttons in…
May 25, 2026
c985023
fix: 修复摄像头重连和重启后分辨率恢复默认值
May 28, 2026
8061c9d
fix: 修复 setNewResolutionList 排序不一致导致分辨率索引错位
May 28, 2026
4cb38b1
fix(encoder): 动态调整输出缓冲区大小,解决编码包超限时静默丢帧问题
May 29, 2026
b3e6a27
fix(config): support low performance device config
Jun 5, 2026
6bc3ae0
fix: 将摄像头卡片过滤关键字改为 DConfig 配置
Jun 5, 2026
12ff976
fix(a/v-sync): use monotonic clock for audio PTS to fix desync
LiHua000 May 12, 2026
5f5fff2
fix(camera): 修复摄像头被占用时仍显示倒计时的问题
Jun 15, 2026
ced1680
feat(config): add useRgbData config to control RGB preview mode
add-uos Jun 23, 2026
6cab0d4
fix(camera): prefer DConfig resolution over local config (BUG-366203)
add-uos Jun 29, 2026
dd54849
chore: add .gitignore for C++ and Qt artifacts
add-uos Jun 29, 2026
5a8a1a9
fix(camera): warm up shutter audio on demand
Jul 30, 2026
c9d987f
fix: sync resolution config after prepare_new_resolution (#372317)
add-uos Aug 18, 2026
9adf064
chore: Sync by https://github.com/linuxdeepin/.github/commit/a300f852…
Aug 19, 2026
e0bd925
fix: use real MJPG decoded size instead of negotiated resolution
add-uos Aug 17, 2026
7e02f7f
fix: prevent crash when QCamera initialization fails
Oct 29, 2026
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
53 changes: 53 additions & 0 deletions .github/workflows/call-update-changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Call update changelog

on:
workflow_dispatch:
inputs:
version:
description: "Target version; leave empty to auto bump"
required: false
type: string
name:
description: "Maintainer name used in debian/changelog"
required: true
type: string
email:
description: "Maintainer email used in debian/changelog"
required: true
type: string
base_branch:
description: "Base branch to read and target"
required: false
default: master
type: string
distribution:
description: "Changelog distribution"
required: false
default: unstable
type: string
create_pr:
description: "Create a pull request after generating changelog"
required: false
default: true
type: boolean

jobs:
update_changelog:
uses: linuxdeepin/.github/.github/workflows/update-changelog.yml@master
with:
version: ${{ inputs.version }}
name: ${{ inputs.name }}
email: ${{ inputs.email }}
base_branch: ${{ inputs.base_branch }}
distribution: ${{ inputs.distribution }}
create_pr: ${{ inputs.create_pr }}
secrets: inherit

show_result:
runs-on: ubuntu-latest
needs: update_changelog
steps:
- name: Show update changelog result
run: |
echo "Version: ${{ needs.update_changelog.outputs.version }}"
echo "Pull Request URL: ${{ needs.update_changelog.outputs.pr_url }}"
56 changes: 56 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# C++ objects and libs
*.slo
*.lo
*.o
*.a
*.la
*.lai
*.so
*.so.*
*.dll
*.dylib

# Qt-es
object_script.*.Release
object_script.*.Debug
*_plugin_import.cpp
/.qmake.cache
/.qmake.stash
*.pro.user
*.pro.user.*
*.qbs.user
*.qbs.user.*
*.moc
moc_*.cpp
moc_*.h
qrc_*.cpp
ui_*.h
*.qmlc
*.jsc
Makefile*
*build-*
build/
*.qm
*.prl
*.qmlls.ini

# Qt unit tests
target_wrapper.*

# QtCreator
*.autosave

# QtCreator Qml
*.qmlproject.user
*.qmlproject.user.*

# QtCreator CMake
CMakeLists.txt.user*

# QtCreator 4.8< compilation database
compile_commands.json

# QtCreator local machine specific files for imported projects
*creator.user*

*_qmlcache.qrc
12 changes: 12 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
deepin-camera (6.0.13) unstable; urgency=medium

* tag 6.0.13

-- zhangjiarui <zhangjiarui@uniontech.com> Thu, 30 Apr 2026 11:36:13 +0800

deepin-camera (6.0.12) unstable; urgency=medium

* tag 6.0.12

-- shuaijie <shuaijie@uniontech.com> Mon, 19 Aug 2024 15:32:02 +0800

deepin-camera (6.0.11) unstable; urgency=medium

* tag 6.0.11
Expand Down
48 changes: 28 additions & 20 deletions libcam/libcam/cameraconfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,28 @@ static config_t my_config =
.device_name = NULL,
.device_location = NULL,
.format = V4L2_PIX_FMT_MJPEG,
.render = "sdl",
.gui = "qt5",
.audio = "port",
.capture = "mmap",
.render = "sdl",
.gui = "qt5",
.audio = "port",
.capture = "mmap",
.video_codec = "mjpg",/*yuy2,mjpg,mpeg,flv1,wmv1,mpg2,mp43,dx50,h264,hevc,vp80,vp90,theo*/
.audio_codec = "aac",
.profile_name = NULL,
.profile_path = NULL,
.profile_name = NULL,
.profile_path = NULL,
.video_name = NULL,
.video_path = NULL,
.photo_name = NULL,
.photo_path = NULL,
.video_sufix = 1,
.photo_sufix = 1,
.fps_num = 1,
.video_path = NULL,
.photo_name = NULL,
.photo_path = NULL,
.video_sufix = 1,
.photo_sufix = 1,
.fps_num = 1,
.fps_denom = 30,
.audio_device = -1,/*will use API default in this case*/
.video_fx = 0, /*no video fx*/
.audio_fx = 0, /*no audio fx*/
.osd_mask = 0, /*REND_OSD_NONE*/
.crosshair_color=0x0000FF00, /*osd crosshair rgb color (0x00RRGGBB)*/
.video_fx = 0, /*no video fx*/
.audio_fx = 0, /*no audio fx*/
.osd_mask = 0, /*REND_OSD_NONE*/
.crosshair_color=0x0000FF00, /*osd crosshair rgb color (0x00RRGGBB)*/
.verbosity=0
};

/*
Expand Down Expand Up @@ -149,9 +150,10 @@ int config_save(const char *filename)
fprintf(fp, "#OSD mask \n");
fprintf(fp, "osd_mask=0x%x\n", my_config.osd_mask);
fprintf(fp, "crosshair_color=0x%x\n", my_config.crosshair_color);

fprintf(fp, "#verbosity \n");
fprintf(fp, "verbosity=%i\n", my_config.verbosity);
/* return to system locale */
setlocale(LC_NUMERIC, "");
setlocale(LC_NUMERIC, "");

/* flush stream buffers to filesystem */
fflush(fp);
Expand Down Expand Up @@ -231,7 +233,7 @@ int config_load(const char *filename)
/*skip invalid lines */
if(!token || !value || strlen(token) < 1 || strlen(value) < 1)
{
fprintf(stderr, "deepin-camera: (config) skiping invalid config entry at line %i\n", line);
fprintf(stderr, "deepin-camera: (config) skipping invalid config entry at line %i: %s\n", line, bufp);
if(token)
free(token);
if(value)
Expand Down Expand Up @@ -310,6 +312,10 @@ int config_load(const char *filename)
free(my_config.photo_path);
my_config.photo_path = strdup(value);
}
else if(strcmp(token, "verbosity") == 0)
{
my_config.verbosity = (int) strtoul(value, NULL, 10);
}
// else if(strcmp(token, "video_sufix") == 0)
// {
// my_config.video_sufix = (int) strtoul(value, NULL, 10);
Expand Down Expand Up @@ -454,7 +460,9 @@ void config_update(options_t *my_options)
free(my_config.photo_path);
my_config.photo_path = strdup(my_options->photo_path);
}

/*check for verbosity options*/
if(my_options->verbosity >= 0)
my_config.verbosity = my_options->verbosity;
}

/*
Expand Down
1 change: 1 addition & 0 deletions libcam/libcam/cameraconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ typedef struct _config_t {
uint32_t audio_fx;
uint32_t osd_mask; /*OSD bit mask*/
uint32_t crosshair_color; /*osd crosshair rgb color (0x00RRGGBB)*/
int verbosity;
} config_t;

/*video sufix flag*/
Expand Down
Loading
Loading