-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9927 from Florin9doi/master
Integrate sceUsbGps and sceUsbCam with Android
- Loading branch information
Showing
20 changed files
with
1,572 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,4 +22,3 @@ void Register_sceUsb(); | |
| void __UsbInit(); | ||
| void __UsbDoState(PointerWrap &p); | ||
|
|
||
| void Register_sceUsbCam(); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| // Copyright (c) 2012- PPSSPP Project. | ||
|
|
||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, version 2.0 or later versions. | ||
|
|
||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License 2.0 for more details. | ||
|
|
||
| // A copy of the GPL 2.0 should have been included with the program. | ||
| // If not, see http://www.gnu.org/licenses/ | ||
|
|
||
| // Official git repository and contact information can be found at | ||
| // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. | ||
|
|
||
| #include <mutex> | ||
|
|
||
| #include "base/NativeApp.h" | ||
| #include "Common/ChunkFile.h" | ||
| #include "Core/HLE/HLE.h" | ||
| #include "Core/HLE/FunctionWrappers.h" | ||
| #include "Core/HLE/sceUsbCam.h" | ||
| #include "Core/MemMapHelpers.h" | ||
|
|
||
| PspUsbCamSetupMicParam micParam; | ||
| PspUsbCamSetupVideoParam videoParam; | ||
|
|
||
| unsigned int videoBufferLength = 0; | ||
| unsigned int nextVideoFrame = 0; | ||
| unsigned char videoBuffer[40 * 1000]; | ||
| std::mutex videoBufferMutex; | ||
|
|
||
| static int sceUsbCamSetupMic(u32 paramAddr, u32 workareaAddr, int wasize) { | ||
| INFO_LOG(HLE, "UNIMPL sceUsbCamSetupMic"); | ||
| if (Memory::IsValidRange(paramAddr, sizeof(micParam))) { | ||
| Memory::ReadStruct(paramAddr, &micParam); | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| static int sceUsbCamStartMic() { | ||
| INFO_LOG(HLE, "UNIMPL sceUsbCamStartMic"); | ||
| return 0; | ||
| } | ||
|
|
||
| static int sceUsbCamStopMic() { | ||
| INFO_LOG(HLE, "UNIMPL sceUsbCamStopMic"); | ||
| return 0; | ||
| } | ||
|
|
||
| static int sceUsbCamSetupVideo(u32 paramAddr, u32 workareaAddr, int wasize) { | ||
| INFO_LOG(HLE, "UNIMPL sceUsbCamSetupVideo"); | ||
| if (Memory::IsValidRange(paramAddr, sizeof(videoParam))) { | ||
| Memory::ReadStruct(paramAddr, &videoParam); | ||
| } | ||
|
|
||
| std::lock_guard<std::mutex> lock(videoBufferMutex); | ||
| videoBufferLength = sizeof(sceUsbCamDummyImage); | ||
| memset(videoBuffer, 0, sizeof(videoBuffer)); | ||
| memcpy(videoBuffer, sceUsbCamDummyImage, sizeof(sceUsbCamDummyImage)); | ||
|
|
||
| INFO_LOG(HLE, "UNIMPL sceUsbCamSetupVideo - size: %d", videoParam.size); | ||
| INFO_LOG(HLE, "UNIMPL sceUsbCamSetupVideo - resolution: %d", videoParam.resolution); | ||
| return 0; | ||
| } | ||
|
|
||
| static int sceUsbCamStartVideo() { | ||
| INFO_LOG(HLE, "UNIMPL sceUsbCamStartVideo"); | ||
| System_SendMessage("camera_command", "startVideo"); | ||
| return 0; | ||
| } | ||
|
|
||
| static int sceUsbCamStopVideo() { | ||
| INFO_LOG(HLE, "UNIMPL sceUsbCamStopVideo"); | ||
| System_SendMessage("camera_command", "stopVideo"); | ||
| return 0; | ||
| } | ||
|
|
||
| static int sceUsbCamAutoImageReverseSW(int rev) { | ||
| INFO_LOG(HLE, "UNIMPL sceUsbCamAutoImageReverseSW"); | ||
| return 0; | ||
| } | ||
|
|
||
| static int sceUsbCamReadVideoFrameBlocking(u32 bufAddr, u32 size) { | ||
| std::lock_guard<std::mutex> lock(videoBufferMutex); | ||
| for (unsigned int i = 0; i < videoBufferLength && i < size; i++) { | ||
| if (Memory::IsValidAddress(bufAddr + i)) { | ||
| Memory::Write_U8(videoBuffer[i], bufAddr + i); | ||
| } | ||
| } | ||
| return videoBufferLength; | ||
| } | ||
|
|
||
| static int sceUsbCamReadVideoFrame(u32 bufAddr, u32 size) { | ||
| std::lock_guard<std::mutex> lock(videoBufferMutex); | ||
| for (unsigned int i = 0; i < videoBufferLength && i < size; i++) { | ||
| if (Memory::IsValidAddress(bufAddr + i)) { | ||
| Memory::Write_U8(videoBuffer[i], bufAddr + i); | ||
| } | ||
| } | ||
| nextVideoFrame = videoBufferLength; | ||
| return 0; | ||
| } | ||
|
|
||
| static int sceUsbCamPollReadVideoFrameEnd() { | ||
| INFO_LOG(HLE, "UNIMPL sceUsbCamPollReadVideoFrameEnd: %d", nextVideoFrame); | ||
| return nextVideoFrame; | ||
| } | ||
|
|
||
| const HLEFunction sceUsbCam[] = | ||
| { | ||
| { 0X03ED7A82, &WrapI_UUI<sceUsbCamSetupMic>, "sceUsbCamSetupMic", 'i', "xxi" }, | ||
| { 0X2E930264, nullptr, "sceUsbCamSetupMicEx", '?', "" }, | ||
| { 0X82A64030, &WrapI_V<sceUsbCamStartMic>, "sceUsbCamStartMic", 'i', "" }, | ||
| { 0X5145868A, &WrapI_V<sceUsbCamStopMic>, "sceUsbCamStopMic", 'i', "" }, | ||
| { 0X36636925, nullptr, "sceUsbCamReadMicBlocking", '?', "" }, | ||
| { 0X3DC0088E, nullptr, "sceUsbCamReadMic", '?', "" }, | ||
| { 0XB048A67D, nullptr, "sceUsbCamWaitReadMicEnd", '?', "" }, | ||
| { 0XF8847F60, nullptr, "sceUsbCamPollReadMicEnd", '?', "" }, | ||
| { 0X5778B452, nullptr, "sceUsbCamGetMicDataLength", '?', "" }, | ||
| { 0X08AEE98A, nullptr, "sceUsbCamSetMicGain", '?', "" }, | ||
|
|
||
| { 0X17F7B2FB, &WrapI_UUI<sceUsbCamSetupVideo>, "sceUsbCamSetupVideo", 'i', "xxi" }, | ||
| { 0XCFE9E999, nullptr, "sceUsbCamSetupVideoEx", '?', "" }, | ||
| { 0X574A8C3F, &WrapI_V<sceUsbCamStartVideo>, "sceUsbCamStartVideo", 'i', "" }, | ||
| { 0X6CF32CB9, &WrapI_V<sceUsbCamStopVideo>, "sceUsbCamStopVideo", 'i', "" }, | ||
| { 0X7DAC0C71, &WrapI_UU<sceUsbCamReadVideoFrameBlocking>, "sceUsbCamReadVideoFrameBlocking", 'i', "xx" }, | ||
| { 0X99D86281, &WrapI_UU<sceUsbCamReadVideoFrame>, "sceUsbCamReadVideoFrame", 'i', "xx" }, | ||
| { 0XF90B2293, nullptr, "sceUsbCamWaitReadVideoFrameEnd", '?', "" }, | ||
| { 0X41E73E95, &WrapI_V<sceUsbCamPollReadVideoFrameEnd>, "sceUsbCamPollReadVideoFrameEnd", 'i', "" }, | ||
| { 0XDF9D0C92, nullptr, "sceUsbCamGetReadVideoFrameSize", '?', "" }, | ||
|
|
||
| { 0X3F0CF289, nullptr, "sceUsbCamSetupStill", '?', "" }, | ||
| { 0X0A41A298, nullptr, "sceUsbCamSetupStillEx", '?', "" }, | ||
| { 0X61BE5CAC, nullptr, "sceUsbCamStillInputBlocking", '?', "" }, | ||
| { 0XFB0A6C5D, nullptr, "sceUsbCamStillInput", '?', "" }, | ||
| { 0X7563AFA1, nullptr, "sceUsbCamStillWaitInputEnd", '?', "" }, | ||
| { 0X1A46CFE7, nullptr, "sceUsbCamStillPollInputEnd", '?', "" }, | ||
| { 0XA720937C, nullptr, "sceUsbCamStillCancelInput", '?', "" }, | ||
| { 0XE5959C36, nullptr, "sceUsbCamStillGetInputLength", '?', "" }, | ||
|
|
||
| { 0XF93C4669, &WrapI_I<sceUsbCamAutoImageReverseSW>, "sceUsbCamAutoImageReverseSW", 'i', "i" }, | ||
| { 0X11A1F128, nullptr, "sceUsbCamGetAutoImageReverseState", '?', "" }, | ||
| { 0X4C34F553, nullptr, "sceUsbCamGetLensDirection", '?', "" }, | ||
|
|
||
| { 0X383E9FA8, nullptr, "sceUsbCamGetSaturation", '?', "" }, | ||
| { 0X6E205974, nullptr, "sceUsbCamSetSaturation", '?', "" }, | ||
| { 0X70F522C5, nullptr, "sceUsbCamGetBrightness", '?', "" }, | ||
| { 0X4F3D84D5, nullptr, "sceUsbCamSetBrightness", '?', "" }, | ||
| { 0XA063A957, nullptr, "sceUsbCamGetContrast", '?', "" }, | ||
| { 0X09C26C7E, nullptr, "sceUsbCamSetContrast", '?', "" }, | ||
| { 0XFDB68C23, nullptr, "sceUsbCamGetSharpness", '?', "" }, | ||
| { 0X622F83CC, nullptr, "sceUsbCamSetSharpness", '?', "" }, | ||
| { 0X994471E0, nullptr, "sceUsbCamGetImageEffectMode", '?', "" }, | ||
| { 0XD4876173, nullptr, "sceUsbCamSetImageEffectMode", '?', "" }, | ||
| { 0X2BCD50C0, nullptr, "sceUsbCamGetEvLevel", '?', "" }, | ||
| { 0X1D686870, nullptr, "sceUsbCamSetEvLevel", '?', "" }, | ||
| { 0XD5279339, nullptr, "sceUsbCamGetReverseMode", '?', "" }, | ||
| { 0X951BEDF5, nullptr, "sceUsbCamSetReverseMode", '?', "" }, | ||
| { 0X9E8AAF8D, nullptr, "sceUsbCamGetZoom", '?', "" }, | ||
| { 0XC484901F, nullptr, "sceUsbCamSetZoom", '?', "" }, | ||
| { 0XAA7D94BA, nullptr, "sceUsbCamGetAntiFlicker", '?', "" }, | ||
| { 0X6784E6A8, nullptr, "sceUsbCamSetAntiFlicker", '?', "" }, | ||
|
|
||
| { 0XD293A100, nullptr, "sceUsbCamRegisterLensRotationCallback", '?', "" }, | ||
| { 0X41EE8797, nullptr, "sceUsbCamUnregisterLensRotationCallback", '?', "" }, | ||
| }; | ||
|
|
||
| void Register_sceUsbCam() | ||
| { | ||
| RegisterModule("sceUsbCam", ARRAY_SIZE(sceUsbCam), sceUsbCam); | ||
| } | ||
|
|
||
| void Camera::pushCameraImage(long long length, unsigned char* image) { | ||
| std::lock_guard<std::mutex> lock(videoBufferMutex); | ||
| videoBufferLength = length; | ||
| memset (videoBuffer, 0, sizeof(videoBuffer)); | ||
| memcpy (videoBuffer, image, length); | ||
| } |
Oops, something went wrong.