Permalink
Browse files

Upgraded to OpenCV 2.3.0

  • Loading branch information...
1 parent d2def37 commit 55c02f953d45a85d8a703ce94f3240613d920fae @gabriel committed Jul 22, 2011
Showing with 48,834 additions and 22,896 deletions.
  1. +12 −0 Classes/FFProcessing/AVFoundation/FFAVCaptureSessionReader.h
  2. +53 −5 Classes/FFProcessing/AVFoundation/FFAVCaptureSessionReader.m
  3. +24 −0 Classes/FFProcessing/AVFoundation/FFAVDecoder.h
  4. +27 −0 Classes/FFProcessing/AVFoundation/FFAVDecoder.m
  5. +6 −2 Classes/FFProcessing/AVFoundation/FFAVEncoder.h
  6. +48 −0 Classes/FFProcessing/AVFoundation/FFAVEncoder.m
  7. +16 −0 Classes/FFProcessing/AVFoundation/FFAVReader.h
  8. +28 −0 Classes/FFProcessing/AVFoundation/FFAVReader.m
  9. +13 −3 Classes/FFProcessing/FFGLDrawable.m
  10. +2 −0 Classes/FFProcessing/FFImaging/FFGLImaging.h
  11. +8 −3 Classes/FFProcessing/FFImaging/FFGLImaging.m
  12. +2 −1 Classes/FFProcessing/FFMPEG/FFMPDecoder.h
  13. +1 −0 Classes/FFProcessing/FFMPEG/FFMPReadThread.m
  14. +6 −7 Classes/FFProcessing/FFPlayerAppDelegate.m
  15. +4 −2 Classes/FFProcessing/FFPlayerView.m
  16. +0 −1 Classes/FFProcessing/FFProcessingThread.m
  17. +6 −21 Classes/FFProcessing/FFTypes.h
  18. +9 −9 Classes/FFProcessing/FFTypes.m
  19. +2 −0 Classes/FFProcessing/FFUtils.h
  20. +42 −0 Classes/FFProcessing/FFUtils.m
  21. +3 −3 Classes/FFProcessing/Filters/{FFCannyEdgeFilter.h → FFCanny.h}
  22. +7 −8 Classes/FFProcessing/Filters/{FFCannyEdgeFilter.m → FFCanny.m}
  23. +17 −0 Classes/FFProcessing/Filters/FFChromaKeyFilter.h
  24. +52 −0 Classes/FFProcessing/Filters/FFChromaKeyFilter.m
  25. +27 −0 Classes/FFProcessing/Filters/FFCornerHarris.h
  26. +53 −0 Classes/FFProcessing/Filters/FFCornerHarris.m
  27. +22 −0 Classes/FFProcessing/Filters/FFFeatureTracking.h
  28. +67 −0 Classes/FFProcessing/Filters/FFFeatureTracking.m
  29. +26 −0 Classes/FFProcessing/Filters/FFOpticalFlow.h
  30. +113 −0 Classes/FFProcessing/Filters/FFOpticalFlow.m
  31. +16 −0 Classes/FFProcessing/Filters/FFSmoothFilter.h
  32. +33 −0 Classes/FFProcessing/Filters/FFSmoothFilter.m
  33. +9 −8 Classes/FFProcessing/OpenGL/GHGLUtils.m
  34. +8 −5 Classes/FFProcessing/OpenGL/GHGLView.m
  35. +5 −3 Classes/FFProcessing/Processors/FFEncodeProcessor.m
  36. +2 −2 Classes/PB/PBApplicationController.h
  37. +9 −9 Classes/PB/PBApplicationController.m
  38. +4 −11 Classes/PB/PBCameraCaptureController.m
  39. +12 −6 Classes/PB/PBProcessing.m
  40. +0 −1 Classes/PB/PBSaveThread.m
  41. +2 −2 Classes/PB/PBTestApplicationController.m
  42. +39 −0 Classes/PB/UI/Options/PBUIBaseOptionsView.h
  43. +66 −0 Classes/PB/UI/Options/PBUIBaseOptionsView.m
  44. +24 −0 Classes/PB/UI/Options/PBUICornerOptionsView.h
  45. +80 −0 Classes/PB/UI/Options/PBUICornerOptionsView.m
  46. +24 −0 Classes/PB/UI/Options/PBUIEdgeOptionsView.h
  47. +28 −13 Classes/PB/UI/{ → Options}/PBUIEdgeOptionsView.m
  48. +2 −9 Classes/PB/UI/{ → Options}/PBUIErodeOptionsView.h
  49. +6 −5 Classes/PB/UI/{ → Options}/PBUIErodeOptionsView.m
  50. +16 −0 Classes/PB/UI/Options/PBUIFeatureTrackingOptionsView.h
  51. +30 −0 Classes/PB/UI/Options/PBUIFeatureTrackingOptionsView.m
  52. +12 −8 Classes/PB/UI/{PBUIOptionsView.h → Options/PBUIModeNavigationView.h}
  53. +78 −40 Classes/PB/UI/{PBUIOptionsView.m → Options/PBUIModeNavigationView.m}
  54. +33 −0 Classes/PB/UI/Options/PBUIModeOptionsView.h
  55. +92 −0 Classes/PB/UI/Options/PBUIModeOptionsView.m
  56. +16 −0 Classes/PB/UI/Options/PBUIOpticalFlowOptionsView.h
  57. +31 −0 Classes/PB/UI/Options/PBUIOpticalFlowOptionsView.m
  58. +3 −1 Classes/PB/UI/{ → Options}/PBUISliderOptionsView.h
  59. 0 Classes/PB/UI/{ → Options}/PBUISliderOptionsView.m
  60. +19 −0 Classes/PB/UI/Options/PBUISmoothOptionsView.h
  61. +30 −0 Classes/PB/UI/Options/PBUISmoothOptionsView.m
  62. +0 −31 Classes/PB/UI/PBUIEdgeOptionsView.h
  63. +0 −16 Classes/PB/UI/PBUIModeOptionsView.h
  64. +0 −40 Classes/PB/UI/PBUIModeOptionsView.m
  65. +8 −4 Config/Shared.xcconfig
  66. +4 −2 Config/Tests.xcconfig
  67. +178 −145 FFProcessing.xcodeproj/gabe.mode1v3
  68. +1,841 −2,093 FFProcessing.xcodeproj/gabe.pbxuser
  69. +282 −252 FFProcessing.xcodeproj/project.pbxproj
  70. +7 −0 FFProcessing.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  71. +7,568 −0 ...ocessing.xcodeproj/project.xcworkspace/xcuserdata/gabe.xcuserdatad/UserInterfaceState.xcuserstate
  72. +5 −0 FFProcessing.xcodeproj/xcuserdata/gabe.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
  73. +88 −0 FFProcessing.xcodeproj/xcuserdata/gabe.xcuserdatad/xcschemes/FFProcessing.xcscheme
  74. +76 −0 FFProcessing.xcodeproj/xcuserdata/gabe.xcuserdatad/xcschemes/Tests.xcscheme
  75. +32 −0 FFProcessing.xcodeproj/xcuserdata/gabe.xcuserdatad/xcschemes/xcschememanagement.plist
  76. +0 −97 Libraries/GHKit/GHNSArray+Utils.m
  77. +0 −124 Libraries/GHKit/GHNSInvocation+Utils.m
  78. +0 −211 Libraries/GHKit/GHNSInvocationProxy.m
  79. +0 −156 Libraries/GHKit/GHNSObject+Invocation.m
  80. +0 −127 Libraries/GHKit/GHNSObject+Swizzle.m
  81. +0 −375 Libraries/GHKit/GHNSString+Utils.m
  82. +0 −93 Libraries/GHKit/GHNSStringEnumerator.m
  83. +1 −0 Libraries/GHKitIOS.framework/GHKitIOS
  84. +1 −0 Libraries/GHKitIOS.framework/Headers
  85. +1 −0 Libraries/GHKitIOS.framework/Resources
  86. BIN Libraries/GHKitIOS.framework/Versions/A/GHKitIOS
  87. +34 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHCGUtils.h
  88. +95 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHKeychainStore.h
  89. +200 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHKit.h
  90. 0 Libraries/{GHKit → GHKitIOS.framework/Versions/A/Headers}/GHKitDefines.h
  91. +2 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHKitIOS.h
  92. +55 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHLogger.h
  93. +5 −1 Libraries/{GHKit → GHKitIOS.framework/Versions/A/Headers}/GHNSArray+Utils.h
  94. +56 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSBundle+Utils.h
  95. +140 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSDate+Parsing.h
  96. +251 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSDate+Utils.h
  97. +83 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSDictionary+NSNull.h
  98. +160 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSDictionary+Utils.h
  99. +53 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSError+Utils.h
  100. +89 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSFileManager+Utils.h
  101. +4 −4 Libraries/{GHKit → GHKitIOS.framework/Versions/A/Headers}/GHNSInvocation+Utils.h
  102. +55 −18 Libraries/{GHKit → GHKitIOS.framework/Versions/A/Headers}/GHNSInvocationProxy.h
  103. +11 −4 Libraries/{GHKit → GHKitIOS.framework/Versions/A/Headers}/GHNSMutableArray+Utils.h
  104. +69 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSMutableDictionary+Utils.h
  105. +44 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSNotificationCenter+Utils.h
  106. +107 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSNumber+Utils.h
  107. +32 −3 Libraries/{GHKit → GHKitIOS.framework/Versions/A/Headers}/GHNSObject+Invocation.h
  108. +15 −1 Libraries/{GHKit → GHKitIOS.framework/Versions/A/Headers}/GHNSObject+Swizzle.h
  109. +18 −15 Libraries/{libGHUnitIPhone3_0/GHUnit.h → GHKitIOS.framework/Versions/A/Headers/GHNSObject+Utils.h}
  110. +54 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSString+HMAC.h
  111. +74 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSString+TimeInterval.h
  112. +59 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSString+UIKitUtils.h
  113. +83 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSString+URL.h
  114. +107 −11 Libraries/{GHKit → GHKitIOS.framework/Versions/A/Headers}/GHNSString+Utils.h
  115. +42 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSString+XML.h
  116. +28 −2 Libraries/{GHKit → GHKitIOS.framework/Versions/A/Headers}/GHNSStringEnumerator.h
  117. +182 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSURL+Utils.h
  118. +107 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHNSUserDefaults+Utils.h
  119. +48 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHReversableDictionary.h
  120. +91 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/GHUIColor+Utils.h
  121. +35 −35 Libraries/{GHKit/GHNSMutableArray+Utils.m → GHKitIOS.framework/Versions/A/Headers/GHValidators.h}
  122. +27 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/hmac.h
  123. +28 −0 Libraries/GHKitIOS.framework/Versions/A/Headers/sha1.h
  124. +18 −0 Libraries/GHKitIOS.framework/Versions/A/Resources/Info.plist
  125. +1 −0 Libraries/GHKitIOS.framework/Versions/Current
  126. +1 −0 Libraries/GHUnitIOS.framework/GHUnitIOS
  127. +1 −0 Libraries/GHUnitIOS.framework/Headers
  128. +1 −0 Libraries/GHUnitIOS.framework/Resources
  129. BIN Libraries/GHUnitIOS.framework/Versions/A/GHUnitIOS
  130. +51 −28 Libraries/{libGHUnitIPhone3_0 → GHUnitIOS.framework/Versions/A/Headers}/GHAsyncTestCase.h
  131. +44 −0 Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTest+JUnitXML.h
  132. +32 −44 Libraries/{libGHUnitIPhone3_0 → GHUnitIOS.framework/Versions/A/Headers}/GHTest.h
  133. +10 −5 Libraries/{libGHUnitIPhone3_0 → GHUnitIOS.framework/Versions/A/Headers}/GHTestCase.h
  134. +42 −0 Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTestGroup+JUnitXML.h
  135. +41 −45 Libraries/{libGHUnitIPhone3_0 → GHUnitIOS.framework/Versions/A/Headers}/GHTestGroup.h
  136. +238 −234 Libraries/{libGHUnitIPhone3_0 → GHUnitIOS.framework/Versions/A/Headers}/GHTestMacros.h
  137. +46 −0 Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTestOperation.h
  138. +13 −10 Libraries/{libGHUnitIPhone3_0 → GHUnitIOS.framework/Versions/A/Headers}/GHTestRunner.h
  139. +10 −6 Libraries/{libGHUnitIPhone3_0 → GHUnitIOS.framework/Versions/A/Headers}/GHTestSuite.h
  140. +169 −0 Libraries/GHUnitIOS.framework/Versions/A/Headers/GHTestViewModel.h
  141. +14 −3 Libraries/{libGHUnitIPhone3_0 → GHUnitIOS.framework/Versions/A/Headers}/GHTesting.h
  142. +629 −0 Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnit.h
  143. +9 −6 ...tIPhone3_0/GHUNSObject+Swizzle.h → GHUnitIOS.framework/Versions/A/Headers/GHUnitIOSAppDelegate.h}
  144. +41 −0 Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnitIOSTableViewDataSource.h
  145. +43 −0 Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnitIOSTestViewController.h
  146. +55 −0 Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnitIOSView.h
  147. +71 −0 Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnitIOSViewController.h
  148. +36 −0 Libraries/GHUnitIOS.framework/Versions/A/Headers/GHUnitIPhoneAppDelegate.h
  149. +11 −2 ...ibGHUnitIPhone3_0 → GHUnitIOS.framework/Versions/A/Headers}/NSException+GHTestFailureExceptions.h
  150. +5 −1 Libraries/{libGHUnitIPhone3_0 → GHUnitIOS.framework/Versions/A/Headers}/NSValue+GHValueFormatter.h
  151. +18 −0 Libraries/GHUnitIOS.framework/Versions/A/Resources/Info.plist
  152. +1 −0 Libraries/GHUnitIOS.framework/Versions/Current
  153. +83 −0 Libraries/OpenCV-2.3.0/include/opencv/cv.h
  154. +52 −0 Libraries/OpenCV-2.3.0/include/opencv/cv.hpp
  155. +65 −0 Libraries/OpenCV-2.3.0/include/opencv/cvaux.h
  156. +51 −0 Libraries/OpenCV-2.3.0/include/opencv/cvaux.hpp
  157. +46 −0 Libraries/OpenCV-2.3.0/include/opencv/cvwimage.h
  158. +53 −0 Libraries/OpenCV-2.3.0/include/opencv/cxcore.h
  159. +52 −0 Libraries/OpenCV-2.3.0/include/opencv/cxcore.hpp
  160. +49 −0 Libraries/OpenCV-2.3.0/include/opencv/cxeigen.hpp
  161. +6 −0 Libraries/OpenCV-2.3.0/include/opencv/cxmisc.h
  162. +50 −0 Libraries/OpenCV-2.3.0/include/opencv/highgui.h
  163. +48 −0 Libraries/OpenCV-2.3.0/include/opencv/ml.h
  164. +760 −0 Libraries/OpenCV-2.3.0/include/opencv2/calib3d/calib3d.hpp
  165. +613 −0 Libraries/OpenCV-2.3.0/include/opencv2/contrib/contrib.hpp
  166. +4,250 −0 Libraries/OpenCV-2.3.0/include/opencv2/core/core.hpp
  167. +1,885 −2,126 Libraries/{OpenCV/include/cxcore.h → OpenCV-2.3.0/include/opencv2/core/core_c.h}
  168. +186 −0 Libraries/OpenCV-2.3.0/include/opencv2/core/eigen.hpp
  169. +196 −31 Libraries/{OpenCV/include/cxmisc.h → OpenCV-2.3.0/include/opencv2/core/internal.hpp}
  170. +2,517 −0 Libraries/OpenCV-2.3.0/include/opencv2/core/mat.hpp
  171. +1,495 −355 Libraries/{OpenCV/include/cxoperations.hpp → OpenCV-2.3.0/include/opencv2/core/operations.hpp}
  172. +124 −47 Libraries/{OpenCV/include/cxtypes.h → OpenCV-2.3.0/include/opencv2/core/types_c.h}
  173. +5 −5 Libraries/{OpenCV/include/cvver.h → OpenCV-2.3.0/include/opencv2/core/version.hpp}
  174. +4 −4 Libraries/{OpenCV/include/cvwimage.h → OpenCV-2.3.0/include/opencv2/core/wimage.hpp}
  175. +3,047 −0 Libraries/OpenCV-2.3.0/include/opencv2/features2d/features2d.hpp
  176. +76 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/all_indices.h
  177. +187 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/allocator.h
  178. +615 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/autotuned_index.h
  179. +162 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/composite_index.h
  180. +360 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/dist.h
  181. +196 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/flann.hpp
  182. +259 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/flann_base.hpp
  183. +146 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/general.h
  184. +95 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/ground_truth.h
  185. +163 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/hdf5.h
  186. +208 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/heap.h
  187. +291 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/index_testing.h
  188. +621 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/kdtree_index.h
  189. +1,115 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/kmeans_index.h
  190. +121 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/linear_index.h
  191. +96 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/logger.h
  192. +118 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/matrix.h
  193. +106 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/nn_index.h
  194. +94 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/object_factory.h
  195. +133 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/random.h
  196. +318 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/result_set.h
  197. +94 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/sampling.h
  198. +115 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/saving.h
  199. +186 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/simplex_downhill.h
  200. +90 −0 Libraries/OpenCV-2.3.0/include/opencv2/flann/timer.h
  201. +965 −0 Libraries/OpenCV-2.3.0/include/opencv2/gpu/NCV.hpp
  202. +657 −0 Libraries/OpenCV-2.3.0/include/opencv2/gpu/NPP_staging.hpp
  203. +146 −0 Libraries/OpenCV-2.3.0/include/opencv2/gpu/devmem2d.hpp
  204. +1,575 −0 Libraries/OpenCV-2.3.0/include/opencv2/gpu/gpu.hpp
  205. +499 −0 Libraries/OpenCV-2.3.0/include/opencv2/gpu/matrix_operations.hpp
  206. +64 −0 Libraries/OpenCV-2.3.0/include/opencv2/gpu/stream_accessor.hpp
  207. +174 −0 Libraries/OpenCV-2.3.0/include/opencv2/highgui/highgui.hpp
  208. +242 −299 Libraries/{OpenCV/include/highgui.h → OpenCV-2.3.0/include/opencv2/highgui/highgui_c.h}
  209. +887 −0 Libraries/OpenCV-2.3.0/include/opencv2/imgproc/imgproc.hpp
  210. +783 −0 Libraries/OpenCV-2.3.0/include/opencv2/imgproc/imgproc_c.h
  211. +536 −0 Libraries/OpenCV-2.3.0/include/opencv2/imgproc/types_c.h
  212. +77 −466 Libraries/{OpenCV/include/cvvidsurv.hpp → OpenCV-2.3.0/include/opencv2/legacy/blobtrack.hpp}
  213. +608 −0 Libraries/OpenCV-2.3.0/include/opencv2/legacy/compat.hpp
  214. +559 −363 Libraries/{OpenCV/include/cvaux.h → OpenCV-2.3.0/include/opencv2/legacy/legacy.hpp}
  215. +3 −3 Libraries/{OpenCV/include/cvstreams.h → OpenCV-2.3.0/include/opencv2/legacy/streams.hpp}
  216. +2,160 −0 Libraries/OpenCV-2.3.0/include/opencv2/ml/ml.hpp
  217. +603 −0 Libraries/OpenCV-2.3.0/include/opencv2/objdetect/objdetect.hpp
  218. +60 −0 Libraries/OpenCV-2.3.0/include/opencv2/opencv.hpp
  219. +481 −0 Libraries/OpenCV-2.3.0/include/opencv2/video/background_segm.hpp
  220. +342 −0 Libraries/OpenCV-2.3.0/include/opencv2/video/tracking.hpp
  221. +49 −0 Libraries/OpenCV-2.3.0/include/opencv2/video/video.hpp
  222. BIN Libraries/OpenCV-2.3.0/lib/debug-universal/liblibjasper.a
  223. BIN Libraries/OpenCV-2.3.0/lib/debug-universal/liblibjpeg.a
  224. BIN Libraries/OpenCV-2.3.0/lib/debug-universal/liblibpng.a
  225. BIN Libraries/OpenCV-2.3.0/lib/debug-universal/liblibtiff.a
  226. BIN Libraries/OpenCV-2.3.0/lib/debug-universal/libopencv_calib3d.a
  227. BIN Libraries/OpenCV-2.3.0/lib/debug-universal/libopencv_contrib.a
  228. BIN Libraries/{OpenCV/lib/libcv.a → OpenCV-2.3.0/lib/debug-universal/libopencv_core.a}
  229. BIN Libraries/OpenCV-2.3.0/lib/debug-universal/libopencv_features2d.a
  230. BIN Libraries/OpenCV-2.3.0/lib/debug-universal/libopencv_flann.a
  231. BIN Libraries/{OpenCV/lib/libcxcore.a → OpenCV-2.3.0/lib/debug-universal/libopencv_imgproc.a}
  232. BIN Libraries/{OpenCV/lib/libcvaux.a → OpenCV-2.3.0/lib/debug-universal/libopencv_legacy.a}
  233. BIN Libraries/OpenCV-2.3.0/lib/debug-universal/libopencv_ml.a
  234. BIN Libraries/OpenCV-2.3.0/lib/debug-universal/libopencv_objdetect.a
  235. BIN Libraries/OpenCV-2.3.0/lib/debug-universal/libopencv_video.a
  236. BIN Libraries/OpenCV-2.3.0/lib/debug-universal/libzlib.a
  237. BIN Libraries/OpenCV-2.3.0/lib/release-universal/liblibjasper.a
  238. BIN Libraries/OpenCV-2.3.0/lib/release-universal/liblibjpeg.a
  239. BIN Libraries/OpenCV-2.3.0/lib/release-universal/liblibpng.a
  240. BIN Libraries/OpenCV-2.3.0/lib/release-universal/liblibtiff.a
  241. BIN Libraries/OpenCV-2.3.0/lib/release-universal/libopencv_calib3d.a
  242. BIN Libraries/OpenCV-2.3.0/lib/release-universal/libopencv_contrib.a
  243. BIN Libraries/OpenCV-2.3.0/lib/release-universal/libopencv_core.a
  244. BIN Libraries/OpenCV-2.3.0/lib/release-universal/libopencv_features2d.a
  245. BIN Libraries/OpenCV-2.3.0/lib/release-universal/libopencv_flann.a
  246. BIN Libraries/OpenCV-2.3.0/lib/release-universal/libopencv_imgproc.a
  247. BIN Libraries/OpenCV-2.3.0/lib/release-universal/libopencv_legacy.a
  248. BIN Libraries/OpenCV-2.3.0/lib/release-universal/libopencv_ml.a
  249. BIN Libraries/OpenCV-2.3.0/lib/release-universal/libopencv_objdetect.a
  250. BIN Libraries/OpenCV-2.3.0/lib/release-universal/libopencv_video.a
  251. BIN Libraries/OpenCV-2.3.0/lib/release-universal/libzlib.a
  252. +0 −1,615 Libraries/OpenCV/include/cv.h
  253. +0 −1,014 Libraries/OpenCV/include/cv.hpp
  254. +0 −1,234 Libraries/OpenCV/include/cvaux.hpp
  255. +0 −1,080 Libraries/OpenCV/include/cvcompat.h
  256. +0 −386 Libraries/OpenCV/include/cvtypes.h
  257. +0 −2,248 Libraries/OpenCV/include/cxcore.hpp
  258. +0 −190 Libraries/OpenCV/include/cxerror.h
  259. +0 −220 Libraries/OpenCV/include/cxflann.h
  260. +0 −4,587 Libraries/OpenCV/include/cxmat.hpp
  261. +0 −130 Libraries/OpenCV/include/highgui.hpp
  262. +0 −1,948 Libraries/OpenCV/include/ml.h
  263. BIN Libraries/OpenCV/lib/libhighgui.a
  264. BIN Libraries/OpenCV/lib/libml.a
  265. +0 −2 Libraries/YelpKit/iPhone/AttributedText/YKAttributedString.m
  266. +2 −0 Libraries/YelpKit/iPhone/Buttons/YKUIControl.h
  267. +0 −1 Libraries/YelpKit/iPhone/Cells/YKUITableViewCell.m
  268. +0 −2 Libraries/YelpKit/iPhone/Controllers/YKUINavigationController+PopView.m
  269. +0 −2 Libraries/YelpKit/iPhone/Controllers/YKUIViewController.m
  270. +0 −1 Libraries/YelpKit/iPhone/UI/YKUIActivityLabel.m
  271. +0 −1 Libraries/YelpKit/iPhone/UI/YKUIAlertView.m
  272. +21 −2 Libraries/YelpKit/iPhone/UI/YKUIGridView.h
  273. +26 −9 Libraries/YelpKit/iPhone/UI/YKUIGridView.m
  274. +0 −18 Libraries/libGHUnitIPhone3_0/GHUnitIPhoneAppDelegate.h
  275. +0 −59 Libraries/libGHUnitIPhone3_0/GHUnitIPhoneTestMain.m
  276. +0 −15 Libraries/libGHUnitIPhone3_0/Makefile
  277. BIN Libraries/libGHUnitIPhone3_0/libGHUnitIPhone4_0.a
  278. +1 −0 Prefix.pch
  279. +1 −1 Resources/FFProcessing-Info.plist
@@ -9,6 +9,7 @@
#import <AVFoundation/AVFoundation.h>
#import "FFReader.h"
+#if !TARGET_IPHONE_SIMULATOR
@interface FFAVCaptureSessionReader : NSObject <FFReader, AVCaptureVideoDataOutputSampleBufferDelegate> {
AVCaptureSession *_captureSession;
AVCaptureVideoDataOutput *_videoOutput;
@@ -22,7 +23,18 @@
CVImageBufferRef _imageBuffer;
+ NSString *_sessionPreset;
+
dispatch_queue_t _queue;
}
+@property (retain, nonatomic) NSString *sessionPreset;
+
+@end
+#else
+@interface FFAVCaptureSessionReader : NSObject <FFReader> {
+ FFVFrameRef _frame;
+}
@end
+#endif
+
@@ -8,32 +8,60 @@
#import "FFAVCaptureSessionReader.h"
#import "FFUtils.h"
+#import "FFTypes.h"
#import "FFAVUtils.h"
+#if !TARGET_IPHONE_SIMULATOR
+
#define kCVPixelFormat kCVPixelFormatType_32BGRA
//#define kCVPixelFormat kCVPixelFormatType_1Monochrome
//#define kCVPixelFormat kCVPixelFormatType_24RGB
@implementation FFAVCaptureSessionReader
+@synthesize sessionPreset=_sessionPreset;
+
- (void)dealloc {
[self close];
+ [_sessionPreset release];
[super dealloc];
}
+- (void)_setupVideoDevice:(AVCaptureDevice *)videoCaptureDevice {
+ [videoCaptureDevice lockForConfiguration:nil];
+ if ([videoCaptureDevice isFocusModeSupported:AVCaptureFocusModeContinuousAutoFocus])
+ videoCaptureDevice.focusMode = AVCaptureFocusModeContinuousAutoFocus;
+
+ if ([videoCaptureDevice isExposureModeSupported:AVCaptureExposureModeContinuousAutoExposure])
+ videoCaptureDevice.exposureMode = AVCaptureExposureModeContinuousAutoExposure;
+
+ if ([videoCaptureDevice isWhiteBalanceModeSupported:AVCaptureWhiteBalanceModeContinuousAutoWhiteBalance])
+ videoCaptureDevice.whiteBalanceMode = AVCaptureWhiteBalanceModeContinuousAutoWhiteBalance;
+ [videoCaptureDevice unlockForConfiguration];
+}
+
- (BOOL)_start:(NSError **)error {
if (_captureSession) {
FFSetError(error, 0, @"Capture session already started");
return NO;
}
_captureSession = [[AVCaptureSession alloc] init];
- AVCaptureDevice *videoCaptureDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
+ NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+ FFDebug(@"Devices: %@", devices);
+ // [devices lastObject]; // For front camera
+ AVCaptureDevice *videoCaptureDevice = [devices gh_firstObject];
+ if (!videoCaptureDevice) return NO;
+ [self _setupVideoDevice:videoCaptureDevice];
+
AVCaptureDeviceInput *videoInput = [AVCaptureDeviceInput deviceInputWithDevice:videoCaptureDevice error:error];
if (!videoInput) return NO;
-
- [_captureSession setSessionPreset:AVCaptureSessionPresetMedium];
+
+ NSString *sessionPreset = _sessionPreset;
+ if (!sessionPreset) sessionPreset = AVCaptureSessionPresetLow;
+
+ [_captureSession setSessionPreset:sessionPreset];
[_captureSession addInput:videoInput];
NSArray *audioCaptureDevices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
@@ -45,8 +73,8 @@ - (BOOL)_start:(NSError **)error {
}
_videoOutput = [[AVCaptureVideoDataOutput alloc] init];
- _videoOutput.minFrameDuration = CMTimeMake(1, 15);
- //_videoOutput.alwaysDiscardsLateVideoFrames = TRUE;
+ //_videoOutput.minFrameDuration = CMTimeMake(1, 15);
+ _videoOutput.alwaysDiscardsLateVideoFrames = TRUE;
_videoOutput.videoSettings = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithUnsignedInt:kCVPixelFormat], kCVPixelBufferPixelFormatTypeKey,
nil];
@@ -164,3 +192,23 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
}
@end
+
+#else
+
+@implementation FFAVCaptureSessionReader
+
+- (FFVFrameRef)nextFrame:(NSError **)error {
+ if (_frame == NULL) {
+ _frame = FFVFrameCreate(FFVFormatMake(320, 480, kFFPixelFormatType_32BGRA));
+ FFFill32BGRAImage(_frame, 0);
+ FFDebug(@"Filled 32BGRA image");
+ }
+ FFDebug(@"[FRAME]");
+ return _frame;
+}
+
+- (void)close { }
+
+@end
+
+#endif
@@ -0,0 +1,24 @@
+//
+// FFAVDecoder.h
+// FFProcessing
+//
+// Created by Gabriel Handford on 7/14/10.
+// Copyright 2010. All rights reserved.
+//
+
+#import "FFDecoderOptions.h"
+
+#import "FFDecoder.h"
+
+@interface FFAVDecoder : NSObject <FFDecoder> {
+ FFDecoderOptions *_options;
+
+ int64_t _readVideoPTS;
+ int64_t _videoDuration;
+}
+
+@property (readonly, nonatomic) FFDecoderOptions *options;
+@property (readonly, nonatomic) int64_t readVideoPTS;
+@property (readonly, nonatomic) int64_t videoDuration;
+
+@end
@@ -0,0 +1,27 @@
+//
+// FFAVDecoder.m
+// FFProcessing
+//
+// Created by Gabriel Handford on 7/14/10.
+// Copyright 2010. All rights reserved.
+//
+
+#import "FFAVDecoder.h"
+
+
+@implementation FFAVDecoder
+
+@synthesize options=_options, readVideoPTS=_readVideoPTS, videoDuration=_videoDuration;
+
+- (BOOL)openWithURL:(NSURL *)URL format:(NSString *)format error:(NSError **)error {
+ return NO;
+}
+
+- (BOOL)decodeFrame:(FFVFrameRef)frame error:(NSError **)error {
+ return NO;
+}
+
+- (void)close {
+}
+
+@end
@@ -6,9 +6,13 @@
// Copyright 2010. All rights reserved.
//
+#import "FFEncoder.h"
+#import "FFEncoderOptions.h"
-@interface FFAVEncoder : NSObject {
-
+@interface FFAVEncoder : NSObject <FFEncoder> {
+ FFEncoderOptions *_options;
}
+- (id)initWithOptions:(FFEncoderOptions *)options;
+
@end
@@ -11,6 +11,54 @@
@implementation FFAVEncoder
+- (id)initWithOptions:(FFEncoderOptions *)options {
+ if ((self = [self init])) {
+ _options = [options retain];
+ }
+ return self;
+}
+
+- (void)dealloc {
+ [_options release];
+ [super dealloc];
+}
+
+- (BOOL)open:(NSError **)error {
+ return NO;
+}
+
+- (BOOL)isOpen {
+ return NO;
+}
+
+- (BOOL)writeHeader:(NSError **)error {
+ return NO;
+}
+
+- (int)encodeFrame:(FFVFrameRef)frame error:(NSError **)error {
+ return 0;
+}
+
+- (BOOL)writeVideoBuffer:(NSError **)error {
+ return NO;
+}
+
+- (BOOL)writeTrailer:(NSError **)error {
+ return NO;
+}
+
+- (void)close {
+}
+
+/*!
+ Access underlying coded frame.
+
+ For FFMPEncoder is an (AVFrame *).
+ */
+- (void *)codedFrame {
+ return NULL;
+}
+
/*
- () {
_output = [[AVCaptureMovieFileOutput alloc] init];
@@ -0,0 +1,16 @@
+//
+// FFAVReader.h
+// FFProcessing
+//
+// Created by Gabriel Handford on 7/14/10.
+// Copyright 2010 All rights reserved.
+//
+
+#import "FFReading.h"
+
+
+@interface FFAVReader : NSObject <FFReading> {
+
+}
+
+@end
@@ -0,0 +1,28 @@
+//
+// FFAVReader.m
+// FFProcessing
+//
+// Created by Gabriel Handford on 7/14/10.
+// Copyright 2010 All rights reserved.
+//
+
+#import "FFAVReader.h"
+
+
+@implementation FFAVReader
+
+- (FFVFormat)format {
+ return FFVFormatNone;
+}
+
+- (BOOL)readFrame:(FFVFrameRef)frame {
+ return NO;
+}
+
+- (void)start {
+}
+
+- (void)close {
+}
+
+@end
@@ -47,13 +47,18 @@ - (void)setupView:(GHGLView *)view {
TextureCoord3D texCoord = {1, 1};
_imaging = [[FFGLImaging alloc] initWithTextureSize:texSize textureCoord:texCoord];
_imageEncoder = [[FFGLImageEncoder alloc] initWithWidth:texSize.wide height:texSize.high format:_GLFormat];
+
+ GHGLCheckError();
}
- (BOOL)drawView:(GHGLView *)view {
NSAssert(_reader, @"No reader");
FFVFrameRef frame = [_reader nextFrame:nil];
- if (frame == NULL) return NO;
+ if (frame == NULL) {
+ //FFDebug(@"No frame");
+ return NO;
+ }
if (_filter) {
frame = [_filter filterFrame:frame error:nil];
@@ -63,17 +68,21 @@ - (BOOL)drawView:(GHGLView *)view {
uint8_t *data = FFVFrameGetData(frame, 0);
FFVFormat format = FFVFrameGetFormat(frame);
// TODO(gabe): Assert (pixel) format is correct for our GL setup
- if (data == NULL) return NO;
+ if (data == NULL) {
+ //FFDebug(@"No data");
+ return NO;
+ }
//glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glLoadIdentity();
glBindTexture(GL_TEXTURE_2D, _texture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
// You have to do clamp to edge to support NPOT textures
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
if (!_textureLoaded) {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, format.width, format.height, 0, _GLFormat, GL_UNSIGNED_BYTE, data);
@@ -98,6 +107,7 @@ - (BOOL)drawView:(GHGLView *)view {
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ NSAssert(_imaging, @"No imaging");
[_imaging apply:quad options:_imagingOptions];
/*
@@ -57,6 +57,8 @@ static inline FFGLImagingOptions FFGLImagingOptionsMake(FFGLImagingMode mode, fl
- (BOOL)apply:(TexturedVertexData2D[4])quad options:(FFGLImagingOptions)options;
+- (void)draw:(TexturedVertexData2D[4])quad;
+
- (void)brightness:(TexturedVertexData2D[4])quad amount:(float)amount;
- (void)contrast:(TexturedVertexData2D[4])quad amount:(float)amount;
@@ -176,14 +176,19 @@ - (BOOL)apply:(TexturedVertexData2D[4])quad options:(FFGLImagingOptions)options
} else if (FFGLImagingHasMode(options.mode, FFGLImagingContrast)) {
[self contrast:quad amount:options.contrastAmount];
} else {
- glVertexPointer(2, GL_FLOAT, sizeof(TexturedVertexData2D), &quad[0].vertex.x);
- glTexCoordPointer(2, GL_FLOAT, sizeof(TexturedVertexData2D), &quad[0].texCoord.s);
- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+ [self draw:quad];
return NO;
}
return YES;
}
+- (void)draw:(TexturedVertexData2D[4])quad {
+ glVertexPointer(2, GL_FLOAT, sizeof(TexturedVertexData2D), &quad[0].vertex.x);
+ glTexCoordPointer(2, GL_FLOAT, sizeof(TexturedVertexData2D), &quad[0].texCoord.s);
+ glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+ GHGLCheckError();
+}
+
// The following filters change the TexEnv state in various ways.
// To reduce state change overhead, the convention adopted here is
// that each filter is responsible for setting up common state, and
@@ -9,9 +9,10 @@
#include "libavformat/avformat.h"
#include "libavdevice/avdevice.h"
+#import "FFDecoder.h"
#import "FFDecoderOptions.h"
-@interface FFMPDecoder : NSObject {
+@interface FFMPDecoder : NSObject <FFDecoder> {
AVFormatContext *_formatContext;
AVStream *_videoStream;
Oops, something went wrong.

0 comments on commit 55c02f9

Please sign in to comment.