Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PS3 Microphone array support #51

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
4174be6
Add test pattern support.
bakercp Dec 13, 2017
74eb6db
Fix bayer memory access.
bakercp Dec 13, 2017
8ee5939
Adding framework CMake file and example app.
marcel303 Jul 24, 2018
0ce231f
Moved libusb header include from ps3eye.h to ps3eye.cpp. FIxes issue …
marcel303 Jul 24, 2018
11a1ea0
Mute PS3 eye debug messages and move debug macro to ps3eye.cpp to ens…
marcel303 Jul 24, 2018
9dde406
Removed unnecessary includes from ps3eye.h for faster compile speeds …
marcel303 Jul 24, 2018
3ff2b2f
Detach kernel driver, as on Linux the operating system has a kernel d…
marcel303 Jul 24, 2018
df0c1f9
Made the framework example work.
marcel303 Jul 24, 2018
ab506c9
Added readme for the Framework library.
marcel303 Jul 24, 2018
541e70d
Initial commit.
marcel303 Jul 24, 2018
b0e235a
Basic init working.
marcel303 Jul 24, 2018
c24e363
Transfers working.
marcel303 Jul 24, 2018
440c08f
Updated example to show audio capture history.
marcel303 Jul 24, 2018
75d2f2f
- Shutdown implementation.
marcel303 Jul 24, 2018
530fbc1
- Don't call cancel_transfer when stopping transfers. It's enough jus…
marcel303 Jul 24, 2018
fb0ecab
- Added space to end microphone test.
marcel303 Jul 24, 2018
86089c6
Moved PS3EYEMic into the ps3eye namespace.
marcel303 Jul 24, 2018
8a54e67
- Added a todo.
marcel303 Jul 24, 2018
bf9774b
- Renamed debug(..) to debugMessage(..).
marcel303 Jul 24, 2018
447b814
- Use the condition variable approach to signal the number of active …
marcel303 Jul 24, 2018
d139b25
- Added a helpful text for Macos to help resolve kernel driver confli…
marcel303 Jul 24, 2018
17c339c
Made PS3EYEMic a class with public and private methods.
marcel303 Jul 24, 2018
3a2d6bd
Updated Framework test app to draw input from all four mics.
marcel303 Jul 24, 2018
5947665
Expose PS3 eye camera audio sample rate.
marcel303 Jul 24, 2018
572b121
Improved Framework test app.
marcel303 Jul 24, 2018
cea3290
Forgot shutdown at the end of the app.
marcel303 Jul 24, 2018
04c33a3
Added summation of the four microphones to the audio history and draw…
marcel303 Jul 24, 2018
4f9cded
Framework test app crash fix for case when there's no PS3 eye camera …
marcel303 Jul 24, 2018
f1836d5
Fix for out of bounds read Framework test app.
marcel303 Jul 24, 2018
cb99c2c
Fix for potential race condition, due to the way transfers are freed …
marcel303 Jul 24, 2018
d88d96a
Fix for accessing invalid read buffer areas in debayer code, due to t…
marcel303 Jul 24, 2018
6b3dc66
Merge commit 'd88d96a0cfc8942c42a235bdfa7925ce54ca20f5' into mic-support
marcel303 Jul 24, 2018
e97a3d9
Merge branch 'freeTransfersFix' into mic-support
marcel303 Jul 24, 2018
2b425e3
Merge commit '74eb6db971cf66467564538fe3d90ef020290b17'
marcel303 Jul 24, 2018
cac9b10
Merge commit '4174be644f566579b1297abfc3ea485149e2b93e'
marcel303 Jul 24, 2018
c58b212
Further tweaked packet sizes and transfers.
marcel303 Jul 24, 2018
7b22e67
Merge branch 'mic-support'
marcel303 Jul 29, 2018
df2e02f
Fix for issue where tabbing apps on Macos could cause 'unknown errors…
marcel303 Aug 7, 2018
e8600c4
Added method to ask if the mic is initialized.
marcel303 Aug 17, 2018
a23706c
- Added stress test (shift + T).
marcel303 Aug 17, 2018
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
Prev Previous commit
Next Next commit
Framework test app crash fix for case when there's no PS3 eye camera …
…connected.
marcel303 committed Jul 24, 2018
commit 4f9cded315d4b85a55328c0180b770db96918a6a
23 changes: 15 additions & 8 deletions framework/main.cpp
Original file line number Diff line number Diff line change
@@ -176,13 +176,20 @@ int main(int argc, char * argv[])
}
#endif

if (eye != nullptr && !eye->init(CAM_SX, CAM_SY, CAM_FPS,
CAM_GRAYSCALE
? PS3EYECam::EOutputFormat::Gray
: PS3EYECam::EOutputFormat::RGB))
errorString = "failed to initialize PS3 eye camera";
else
eye->start();
if (eye != nullptr)
{
if (!eye->init(CAM_SX, CAM_SY, CAM_FPS,
CAM_GRAYSCALE
? PS3EYECam::EOutputFormat::Gray
: PS3EYECam::EOutputFormat::RGB))
{
errorString = "failed to initialize PS3 eye camera";
}
else
{
eye->start();
}
}

PS3EYEMic mic;
MyAudioCallback audioCallback(AUDIO_HISTORY_LENGTH);
@@ -206,7 +213,7 @@ int main(int argc, char * argv[])
if (keyboard.wentDown(SDLK_ESCAPE))
framework.quitRequested = true;

if (eye->isStreaming())
if (eye != nullptr && eye->isStreaming())
{
eye->getFrame(imageData);