Commit 3d57d3b
fix: restructure video writer to fix Windows build and address review comments
Major changes:
- Replace ccap_writer.mm with ccap_writer.cpp (pure C++ dispatch layer)
using factory function pattern instead of #include of .mm/.cpp files
- Compile platform implementations as separate source files (Apple-only
.mm, Windows-only .cpp) matching the existing file reader pattern
- Rewrite Windows implementation to use MFCreateSinkWriterFromURL
(correct API) instead of non-existent MFCreateMediaSinkForURL
- Guard #pragma comment(lib) behind _MSC_VER for MinGW compatibility
Review comment fixes:
- Respect WriterConfig::codec preference (try requested codec first)
- Replace usleep() with std::this_thread::sleep_for (portability)
- Use high-precision timescale (600000) for CMTime instead of truncating
to integer fps
- Add reportError() calls throughout (not just CCAP_LOG_E)
- Validate frame dimensions match configured output in writeFrame()
- Require even dimensions in open() for NV12 encoding
- Check m_mfInitialized in Windows open() before calling MF APIs
- Fix C API timestamp: pass resolved timestamp to writeFrame()
- Share NV12 conversion code via inline helpers in ccap_writer_imp.h
- Support I420/BGRA32 conversion on Windows (was BGR24/NV12 only)
- Guard playback validation in tests behind CCAP_ENABLE_FILE_PLAYBACK
- Zero-initialize VideoFrame structs in tests
- Use std::error_code overloads in test TearDown() for robustness
- Update frameRate docs to reflect actual behavior (default 30fps)
- Set sample duration on Windows for better seek/playback behavior
- Run format_all.sh
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>1 parent c841c1f commit 3d57d3b
12 files changed
Lines changed: 296 additions & 329 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
138 | | - | |
| 138 | + | |
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
143 | 143 | | |
144 | | - | |
| 144 | + | |
145 | 145 | | |
146 | 146 | | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
147 | 152 | | |
148 | 153 | | |
149 | 154 | | |
| |||
152 | 157 | | |
153 | 158 | | |
154 | 159 | | |
155 | | - | |
156 | 160 | | |
157 | 161 | | |
158 | 162 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
104 | | - | |
| 104 | + | |
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
109 | | - | |
| 109 | + | |
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1003 | 1003 | | |
1004 | 1004 | | |
1005 | 1005 | | |
1006 | | - | |
| 1006 | + | |
1007 | 1007 | | |
1008 | 1008 | | |
1009 | 1009 | | |
| |||
1168 | 1168 | | |
1169 | 1169 | | |
1170 | 1170 | | |
1171 | | - | |
| 1171 | + | |
1172 | 1172 | | |
1173 | 1173 | | |
1174 | 1174 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
96 | | - | |
| 96 | + | |
97 | 97 | | |
98 | 98 | | |
99 | 99 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | 9 | | |
15 | | - | |
16 | | - | |
17 | | - | |
| 10 | + | |
18 | 11 | | |
19 | 12 | | |
20 | 13 | | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | 14 | | |
28 | 15 | | |
29 | | - | |
30 | | - | |
31 | 16 | | |
32 | 17 | | |
33 | 18 | | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
| 19 | + | |
41 | 20 | | |
42 | 21 | | |
43 | 22 | | |
| |||
0 commit comments