Skip to content
This repository was archived by the owner on Oct 31, 2022. It is now read-only.

Commit f183eb0

Browse files
committed
MacOS multithreaded decode
- update Xcode project for new file - fix copy & paste mistake in MacOS multithreaded function - add missing new-lines to ends of new files
1 parent b4412a6 commit f183eb0

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

Hap Codec.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
E25D566617E0E4E7008DD459 /* libsquish.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = BDE9DE0A16169D82008DC368 /* libsquish.dylib */; };
4949
E28C1FAB143B598500F2CD73 /* Utility.c in Sources */ = {isa = PBXBuildFile; fileRef = E28C1FAA143B598500F2CD73 /* Utility.c */; };
5050
E2C99CAA13789AC60077AC75 /* Tasks.c in Sources */ = {isa = PBXBuildFile; fileRef = E2C99CA813789AC60077AC75 /* Tasks.c */; };
51+
E2CCA54A18DBC577001FD4C0 /* ParallelLoops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E2CCA54818DBC577001FD4C0 /* ParallelLoops.cpp */; };
5152
E2ECC4CC16FE86830016167B /* YCoCgDXT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E2ECC4CB16FE86830016167B /* YCoCgDXT.cpp */; };
5253
FBFA8C990829E75000560632 /* HapCompressor.c in Sources */ = {isa = PBXBuildFile; fileRef = FBFA8C8C0829E75000560632 /* HapCompressor.c */; };
5354
FBFA8C9A0829E75000560632 /* HapDecompressor.c in Sources */ = {isa = PBXBuildFile; fileRef = FBFA8C8E0829E75000560632 /* HapDecompressor.c */; };
@@ -155,6 +156,8 @@
155156
E28C1FAA143B598500F2CD73 /* Utility.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Utility.c; sourceTree = "<group>"; };
156157
E2C99CA813789AC60077AC75 /* Tasks.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Tasks.c; sourceTree = "<group>"; };
157158
E2C99CA913789AC60077AC75 /* Tasks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tasks.h; sourceTree = "<group>"; };
159+
E2CCA54818DBC577001FD4C0 /* ParallelLoops.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParallelLoops.cpp; sourceTree = "<group>"; };
160+
E2CCA54918DBC577001FD4C0 /* ParallelLoops.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParallelLoops.h; sourceTree = "<group>"; };
158161
E2ECC4CB16FE86830016167B /* YCoCgDXT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YCoCgDXT.cpp; sourceTree = "<group>"; };
159162
E2F8FE91143B5A8F00683004 /* Utility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utility.h; sourceTree = "<group>"; };
160163
FBFA8C8B0829E75000560632 /* HapCodecVersion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HapCodecVersion.h; sourceTree = "<group>"; };
@@ -245,6 +248,8 @@
245248
E20D395516FCDF3F001725BF /* Lock.h */,
246249
BDF1AF051376DD7C00C0F4D1 /* Buffers.h */,
247250
BDF1AF041376DD7C00C0F4D1 /* Buffers.c */,
251+
E2CCA54918DBC577001FD4C0 /* ParallelLoops.h */,
252+
E2CCA54818DBC577001FD4C0 /* ParallelLoops.cpp */,
248253
E2C99CA913789AC60077AC75 /* Tasks.h */,
249254
E2C99CA813789AC60077AC75 /* Tasks.c */,
250255
E2F8FE91143B5A8F00683004 /* Utility.h */,
@@ -467,6 +472,7 @@
467472
E2210D2B15CAE914009DD434 /* YCoCg.c in Sources */,
468473
E2210D3B15CAF913009DD434 /* ImageMath.c in Sources */,
469474
BDDAEA8416160F7500FEC70D /* hap.c in Sources */,
475+
E2CCA54A18DBC577001FD4C0 /* ParallelLoops.cpp in Sources */,
470476
BDDA19C616190E190068EBB3 /* YCoCgDXTEncoder.c in Sources */,
471477
BDDA19CA161927080068EBB3 /* SquishEncoder.c in Sources */,
472478
BDDA19CD1619A5C90068EBB3 /* GLDXTEncoder.c in Sources */,

source/HapDecompressor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ typedef struct {
138138
Callback for multithreaded Hap decoding
139139
*/
140140

141-
void HapMTDecode(HapDecodeWorkFunction function, void *p, unsigned int count, void *info)
141+
void HapMTDecode(HapDecodeWorkFunction function, void *p, unsigned int count, void *info HAP_ATTR_UNUSED)
142142
{
143143
HapParallelFor((HapParallelFunction)function, p, count);
144144
}

source/ParallelLoops.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ extern "C" void HapParallelFor(HapParallelFunction function, void *info, unsigne
3636
{
3737
#if defined(__APPLE__)
3838
dispatch_apply(count, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(size_t index) {
39-
function(p, (unsigned int)index);
39+
function(info, (unsigned int)index);
4040
});
4141
#else
4242
concurrency::parallel_for((unsigned int)0, count, [&](unsigned int i) {
4343
function(info, i);
4444
});
4545
#endif
46-
}
46+
}

source/ParallelLoops.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ void HapParallelFor(HapParallelFunction function, void *info, unsigned int count
4343
#ifdef __cplusplus
4444
}
4545
#endif
46-
#endif
46+
#endif

0 commit comments

Comments
 (0)