Skip to content

Commit e5f241c

Browse files
committed
Version 1.5.0 (#40)
- Update version numbers across project files: - ccap_config.h: 1.4.1 -> 1.5.0 - ccap.podspec: 1.4.1 -> 1.5.0 - BUILD_AND_INSTALL.md: 1.4.1 -> 1.5.0 - Fix code formatting issues: - .vscode/tasks.json: Remove unused "Reload Project" task definition - examples/desktop/5-play_video.cpp: Fix line continuation formatting - examples/desktop/5-play_video_c.c: Fix comment spacing - src/ccap_file_reader_windows.cpp: Fix switch statement indentation and comment spacing - src/ccap_imp.cpp: Remove trailing whitespace, fix formatting consistency
1 parent 5511816 commit e5f241c

9 files changed

Lines changed: 37 additions & 58 deletions

File tree

.vscode/tasks.json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -192,20 +192,6 @@
192192
],
193193
"dependsOrder": "sequence"
194194
},
195-
{
196-
"label": "Reload Project",
197-
"type": "shell",
198-
"command": "echo",
199-
"args": [
200-
"Done!",
201-
],
202-
"group": "build",
203-
"dependsOn": [
204-
"Clean Project",
205-
"Load Project"
206-
],
207-
"dependsOrder": "sequence"
208-
},
209195
{
210196
"label": "Reload Project (Shared)",
211197
"type": "shell",

BUILD_AND_INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,6 @@ git clean -fdx install/
250250

251251
## Version Information
252252

253-
Current version: 1.4.1
253+
Current version: 1.5.0
254254

255255
This is the first official release of the ccap project, including complete CMake configuration and cross-platform build support.

ccap.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "ccap"
3-
s.version = "1.4.1"
3+
s.version = "1.5.0"
44
s.summary = "CameraCapture And Player"
55
s.description = <<-DESC
66
Pod of https://github.com/wysaid/CameraCapture

examples/desktop/5-play_video.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ int main(int argc, char** argv) {
2121
#ifdef __linux__
2222
std::cerr << "\n[WARNING] Video playback is currently not supported on Linux." << std::endl;
2323
std::cerr << "This feature may be implemented in a future version." << std::endl;
24-
std::cerr << "Currently supported platforms: Windows, macOS\n" << std::endl;
24+
std::cerr << "Currently supported platforms: Windows, macOS\n"
25+
<< std::endl;
2526
return 0;
2627
#endif
2728

examples/desktop/5-play_video_c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ int main(int argc, char** argv) {
8282
}
8383
}
8484

85-
char captureDir[1024 + 32]; // Extra space for "/video_frames" and safety margin
85+
char captureDir[1024 + 32]; // Extra space for "/video_frames" and safety margin
8686
snprintf(captureDir, sizeof(captureDir), "%s/video_frames", cwd);
8787
createDirectory(captureDir);
8888

include/ccap_config.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
/* ========== Version Information ========== */
1616

1717
#define CCAP_VERSION_MAJOR 1
18-
#define CCAP_VERSION_MINOR 4
19-
#define CCAP_VERSION_PATCH 1
20-
#define CCAP_VERSION_STRING "1.4.1"
18+
#define CCAP_VERSION_MINOR 5
19+
#define CCAP_VERSION_PATCH 0
20+
#define CCAP_VERSION_STRING "1.5.0"
2121

2222
/* ========== Export/Import Macro Definitions ========== */
2323

scripts/release.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@
66

77
set -e
88

9-
# Check bash version (associative arrays require bash 4+)
10-
if ((BASH_VERSINFO[0] < 4)); then
11-
echo "❌ Error: This script requires bash 4.0 or later"
12-
echo " Current version: ${BASH_VERSION}"
13-
echo " On macOS, install newer bash: brew install bash"
14-
exit 1
15-
fi
16-
179
# Color definitions for output
1810
RED='\033[0;31m'
1911
GREEN='\033[0;32m'

src/ccap_file_reader_windows.cpp

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,32 @@ HRESULT WINAPI SHStrDupW(LPCWSTR psz, LPWSTR* ppwsz);
3636
inline HRESULT PropVariantToInt64(REFPROPVARIANT propvar, LONGLONG* pllVal) {
3737
if (!pllVal) return E_POINTER;
3838
switch (propvar.vt) {
39-
case VT_I8:
40-
*pllVal = propvar.hVal.QuadPart;
41-
return S_OK;
42-
case VT_UI8:
43-
*pllVal = static_cast<LONGLONG>(propvar.uhVal.QuadPart);
44-
return S_OK;
45-
case VT_I4:
46-
*pllVal = propvar.lVal;
47-
return S_OK;
48-
case VT_UI4:
49-
*pllVal = propvar.ulVal;
50-
return S_OK;
51-
case VT_I2:
52-
*pllVal = propvar.iVal;
53-
return S_OK;
54-
case VT_UI2:
55-
*pllVal = propvar.uiVal;
56-
return S_OK;
57-
case VT_I1:
58-
*pllVal = propvar.cVal;
59-
return S_OK;
60-
case VT_UI1:
61-
*pllVal = propvar.bVal;
62-
return S_OK;
63-
default:
64-
return DISP_E_TYPEMISMATCH;
39+
case VT_I8:
40+
*pllVal = propvar.hVal.QuadPart;
41+
return S_OK;
42+
case VT_UI8:
43+
*pllVal = static_cast<LONGLONG>(propvar.uhVal.QuadPart);
44+
return S_OK;
45+
case VT_I4:
46+
*pllVal = propvar.lVal;
47+
return S_OK;
48+
case VT_UI4:
49+
*pllVal = propvar.ulVal;
50+
return S_OK;
51+
case VT_I2:
52+
*pllVal = propvar.iVal;
53+
return S_OK;
54+
case VT_UI2:
55+
*pllVal = propvar.uiVal;
56+
return S_OK;
57+
case VT_I1:
58+
*pllVal = propvar.cVal;
59+
return S_OK;
60+
case VT_UI1:
61+
*pllVal = propvar.bVal;
62+
return S_OK;
63+
default:
64+
return DISP_E_TYPEMISMATCH;
6565
}
6666
}
6767
#endif
@@ -76,7 +76,7 @@ inline HRESULT PropVariantToInt64(REFPROPVARIANT propvar, LONGLONG* pllVal) {
7676
#pragma comment(lib, "mfuuid.lib")
7777
#pragma comment(lib, "shlwapi.lib")
7878
#pragma comment(lib, "propsys.lib")
79-
#endif // _MSC_VER
79+
#endif // _MSC_VER
8080

8181
namespace {
8282
// Conversion factor: 1 second = 10,000,000 units (100-nanosecond units used by Media Foundation)

src/ccap_imp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ void ProviderImp::newFrameAvailable(std::shared_ptr<VideoFrame> frame) {
185185
std::lock_guard<std::mutex> lock(m_availableFrameMutex);
186186

187187
m_availableFrames.push(std::move(frame));
188-
188+
189189
// Camera mode: drop old frames when queue is full (real-time streaming)
190190
// File mode: never drop frames (backpressure will pause reading)
191191
if (!m_isFileMode && m_availableFrames.size() > m_maxAvailableFrameSize) {
@@ -206,7 +206,7 @@ bool ProviderImp::shouldReadMoreFrames() const {
206206
if (!m_isFileMode) {
207207
return true;
208208
}
209-
209+
210210
// File mode: stop reading when queue is full to avoid dropping frames
211211
// This implements backpressure - we wait for the consumer to catch up
212212
std::lock_guard<std::mutex> lock(const_cast<std::mutex&>(m_availableFrameMutex));

0 commit comments

Comments
 (0)