mirror of
https://github.com/RPCSX/rpcsx.git
synced 2026-04-06 06:55:09 +00:00
Big improvements to cellCamera and cellGem
This commit is contained in:
Raul Tambre
parent
43a95d709d
commit
cc6ba726eb
5 changed files with 572 additions and 9 deletions
|
|
@ -6,10 +6,16 @@
|
|||
#include "cellCamera.h"
|
||||
|
||||
Module *cellCamera = nullptr;
|
||||
const char* attributes[] = {"GAIN", "REDBLUEGAIN", "SATURATION", "EXPOSURE", "BRIGHTNESS", "AEC", "AGC", "AWB", "ABC", "LED", "AUDIOGAIN", "QS", "NONZEROCOEFFS", "YUVFLAG",
|
||||
"JPEGFLAG", "BACKLIGHTCOMP", "MIRRORFLAG", "MEASUREDQS", "422FLAG", "USBLOAD", "GAMMA", "GREENGAIN", "AGCLIMIT", "DENOISE", "FRAMERATEADJUST",
|
||||
"PIXELOUTLIERFILTER", "AGCLOW", "AGCHIGH", "DEVICELOCATION", "FORMATCAP", "FORMATINDEX", "NUMFRAME", "FRAMEINDEX", "FRAMESIZE", "INTERVALTYPE",
|
||||
"INTERVALINDEX", "INTERVALVALUE", "COLORMATCHING", "PLFREQ", "DEVICEID", "DEVICECAP", "DEVICESPEED", "UVCREQCODE", "UVCREQDATA", "DEVICEID2",
|
||||
"READMODE", "GAMEPID", "PBUFFER", "READFINISH", "ATTRIBUTE_UNKNOWN"};
|
||||
|
||||
struct cellCameraInternal
|
||||
{
|
||||
bool m_bInitialized;
|
||||
CellCamera m_camera;
|
||||
|
||||
cellCameraInternal()
|
||||
: m_bInitialized(false)
|
||||
|
|
@ -26,7 +32,51 @@ int cellCameraInit()
|
|||
if (cellCameraInstance.m_bInitialized)
|
||||
return CELL_CAMERA_ERROR_ALREADY_INIT;
|
||||
|
||||
// TODO: Check if camera is connected, if not return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND
|
||||
if (Ini.Camera.GetValue() == 0)
|
||||
return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND;
|
||||
|
||||
if (Ini.CameraType.GetValue() == 1)
|
||||
{
|
||||
CellCamera camera;
|
||||
camera.attributes.SATURATION = 164;
|
||||
camera.attributes.BRIGHTNESS = 96;
|
||||
camera.attributes.AEC = 1;
|
||||
camera.attributes.AGC = 1;
|
||||
camera.attributes.AWB = 1;
|
||||
camera.attributes.ABC = 0;
|
||||
camera.attributes.LED = 1;
|
||||
camera.attributes.QS = 0;
|
||||
camera.attributes.NONZEROCOEFFS[0] = 32;
|
||||
camera.attributes.NONZEROCOEFFS[1] = 32;
|
||||
camera.attributes.YUVFLAG = 0;
|
||||
camera.attributes.BACKLIGHTCOMP = 0;
|
||||
camera.attributes.MIRRORFLAG = 1;
|
||||
camera.attributes._422FLAG = 1;
|
||||
camera.attributes.USBLOAD = 4;
|
||||
cellCameraInstance.m_camera = camera;
|
||||
}
|
||||
else if (Ini.CameraType.GetValue() == 2)
|
||||
{
|
||||
CellCamera camera;
|
||||
camera.attributes.SATURATION = 64;
|
||||
camera.attributes.BRIGHTNESS = 8;
|
||||
camera.attributes.AEC = 1;
|
||||
camera.attributes.AGC = 1;
|
||||
camera.attributes.AWB = 1;
|
||||
camera.attributes.LED = 1;
|
||||
camera.attributes.BACKLIGHTCOMP = 0;
|
||||
camera.attributes.MIRRORFLAG = 1;
|
||||
camera.attributes.GAMMA = 1;
|
||||
camera.attributes.AGCLIMIT = 4;
|
||||
camera.attributes.DENOISE = 0;
|
||||
camera.attributes.FRAMERATEADJUST = 0;
|
||||
camera.attributes.PIXELOUTLIERFILTER = 1;
|
||||
camera.attributes.AGCLOW = 48;
|
||||
camera.attributes.AGCHIGH = 64;
|
||||
cellCameraInstance.m_camera = camera;
|
||||
}
|
||||
// TODO: Some other default attributes? Need to check the actual behaviour on a real PS3.
|
||||
|
||||
cellCameraInstance.m_bInitialized = true;
|
||||
|
||||
return CELL_OK;
|
||||
|
|
@ -122,23 +172,231 @@ int cellCameraIsStarted()
|
|||
return CELL_OK;
|
||||
}
|
||||
|
||||
int cellCameraGetAttribute()
|
||||
int cellCameraGetAttribute(s32 dev_num, CellCameraAttribute attrib, vm::ptr<u32> arg1, vm::ptr<u32> arg2)
|
||||
{
|
||||
UNIMPLEMENTED_FUNC(cellCamera);
|
||||
cellCamera->Warning("cellCameraGetAttribute(dev_num=%d, attrib=%s(%d), arg1=0x%x, arg2=0x%x)", dev_num, attributes[attrib], arg1.addr(), arg2.addr());
|
||||
|
||||
if (!cellCameraInstance.m_bInitialized)
|
||||
return CELL_CAMERA_ERROR_NOT_INIT;
|
||||
|
||||
if (attrib == 0)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.GAIN;
|
||||
else if (attrib == 1)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.REDBLUEGAIN;
|
||||
else if (attrib == 2)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.SATURATION;
|
||||
else if (attrib == 3)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.EXPOSURE;
|
||||
else if (attrib == 4)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.BRIGHTNESS;
|
||||
else if (attrib == 5)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.AEC;
|
||||
else if (attrib == 6)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.AGC;
|
||||
else if (attrib == 7)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.AWB;
|
||||
else if (attrib == 8)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.ABC;
|
||||
else if (attrib == 9)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.LED;
|
||||
else if (attrib == 10)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.AUDIOGAIN;
|
||||
else if (attrib == 11)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.QS;
|
||||
else if (attrib == 12)
|
||||
{
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.NONZEROCOEFFS[0];
|
||||
*arg2 = cellCameraInstance.m_camera.attributes.NONZEROCOEFFS[1];
|
||||
}
|
||||
else if (attrib == 13)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.YUVFLAG;
|
||||
else if (attrib == 14)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.JPEGFLAG;
|
||||
else if (attrib == 15)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.BACKLIGHTCOMP;
|
||||
else if (attrib == 16)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.MIRRORFLAG;
|
||||
else if (attrib == 17)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.MEASUREDQS;
|
||||
else if (attrib == 18)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes._422FLAG;
|
||||
else if (attrib == 19)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.USBLOAD;
|
||||
else if (attrib == 20)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.GAMMA;
|
||||
else if (attrib == 21)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.GREENGAIN;
|
||||
else if (attrib == 22)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.AGCLIMIT;
|
||||
else if (attrib == 23)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.DENOISE;
|
||||
else if (attrib == 24)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.FRAMERATEADJUST;
|
||||
else if (attrib == 25)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.PIXELOUTLIERFILTER;
|
||||
else if (attrib == 26)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.AGCLOW;
|
||||
else if (attrib == 27)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.AGCHIGH;
|
||||
else if (attrib == 28)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.DEVICELOCATION;
|
||||
else if (attrib == 29)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.FORMATCAP;
|
||||
else if (attrib == 30)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.FORMATINDEX;
|
||||
else if (attrib == 31)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.NUMFRAME;
|
||||
else if (attrib == 32)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.FRAMEINDEX;
|
||||
else if (attrib == 33)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.FRAMESIZE;
|
||||
else if (attrib == 34)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.INTERVALTYPE;
|
||||
else if (attrib == 35)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.INTERVALINDEX;
|
||||
else if (attrib == 36)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.INTERVALVALUE;
|
||||
else if (attrib == 37)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.COLORMATCHING;
|
||||
else if (attrib == 38)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.PLFREQ;
|
||||
else if (attrib == 39)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.DEVICEID;
|
||||
else if (attrib == 40)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.DEVICECAP;
|
||||
else if (attrib == 41)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.DEVICESPEED;
|
||||
else if (attrib == 42)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.UVCREQCODE;
|
||||
else if (attrib == 43)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.UVCREQDATA;
|
||||
else if (attrib == 44)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.DEVICEID2;
|
||||
else if (attrib == 45)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.READMODE;
|
||||
else if (attrib == 46)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.GAMEPID;
|
||||
else if (attrib == 47)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.PBUFFER;
|
||||
else if (attrib == 48)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.READFINISH;
|
||||
else if (attrib == 49)
|
||||
*arg1 = cellCameraInstance.m_camera.attributes.ATTRIBUTE_UNKNOWN;
|
||||
|
||||
return CELL_OK;
|
||||
}
|
||||
|
||||
int cellCameraSetAttribute()
|
||||
int cellCameraSetAttribute(s32 dev_num, CellCameraAttribute attrib, u32 arg1, u32 arg2)
|
||||
{
|
||||
UNIMPLEMENTED_FUNC(cellCamera);
|
||||
cellCamera->Warning("cellCameraSetAttribute(dev_num=%d, attrib=%s(%d), arg1=%d, arg2=%d)", dev_num, attributes[attrib], attrib, arg1, arg2);
|
||||
|
||||
if (!cellCameraInstance.m_bInitialized)
|
||||
return CELL_CAMERA_ERROR_NOT_INIT;
|
||||
|
||||
if (attrib == 0)
|
||||
cellCameraInstance.m_camera.attributes.GAIN = arg1;
|
||||
else if (attrib == 1)
|
||||
cellCameraInstance.m_camera.attributes.REDBLUEGAIN = arg1;
|
||||
else if (attrib == 2)
|
||||
cellCameraInstance.m_camera.attributes.SATURATION = arg1;
|
||||
else if (attrib == 3)
|
||||
cellCameraInstance.m_camera.attributes.EXPOSURE = arg1;
|
||||
else if (attrib == 4)
|
||||
cellCameraInstance.m_camera.attributes.BRIGHTNESS = arg1;
|
||||
else if (attrib == 5)
|
||||
cellCameraInstance.m_camera.attributes.AEC = arg1;
|
||||
else if (attrib == 6)
|
||||
cellCameraInstance.m_camera.attributes.AGC = arg1;
|
||||
else if (attrib == 7)
|
||||
cellCameraInstance.m_camera.attributes.AWB = arg1;
|
||||
else if (attrib == 8)
|
||||
cellCameraInstance.m_camera.attributes.ABC = arg1;
|
||||
else if (attrib == 9)
|
||||
cellCameraInstance.m_camera.attributes.LED = arg1;
|
||||
else if (attrib == 10)
|
||||
cellCameraInstance.m_camera.attributes.AUDIOGAIN = arg1;
|
||||
else if (attrib == 11)
|
||||
cellCameraInstance.m_camera.attributes.QS = arg1;
|
||||
else if (attrib == 12)
|
||||
{
|
||||
cellCameraInstance.m_camera.attributes.NONZEROCOEFFS[0] = arg1;
|
||||
cellCameraInstance.m_camera.attributes.NONZEROCOEFFS[1] = arg2;
|
||||
}
|
||||
else if (attrib == 13)
|
||||
cellCameraInstance.m_camera.attributes.YUVFLAG = arg1;
|
||||
else if (attrib == 14)
|
||||
cellCameraInstance.m_camera.attributes.JPEGFLAG = arg1;
|
||||
else if (attrib == 15)
|
||||
cellCameraInstance.m_camera.attributes.BACKLIGHTCOMP = arg1;
|
||||
else if (attrib == 16)
|
||||
cellCameraInstance.m_camera.attributes.MIRRORFLAG = arg1;
|
||||
else if (attrib == 17)
|
||||
return CELL_CAMERA_ERROR_PARAM;
|
||||
else if (attrib == 18)
|
||||
cellCameraInstance.m_camera.attributes._422FLAG = arg1;
|
||||
else if (attrib == 19)
|
||||
cellCameraInstance.m_camera.attributes.USBLOAD = arg1;
|
||||
else if (attrib == 20)
|
||||
cellCameraInstance.m_camera.attributes.GAMMA = arg1;
|
||||
else if (attrib == 21)
|
||||
cellCameraInstance.m_camera.attributes.GREENGAIN = arg1;
|
||||
else if (attrib == 22)
|
||||
cellCameraInstance.m_camera.attributes.AGCLIMIT = arg1;
|
||||
else if (attrib == 23)
|
||||
cellCameraInstance.m_camera.attributes.DENOISE = arg1;
|
||||
else if (attrib == 24)
|
||||
cellCameraInstance.m_camera.attributes.FRAMERATEADJUST = arg1;
|
||||
else if (attrib == 25)
|
||||
cellCameraInstance.m_camera.attributes.PIXELOUTLIERFILTER = arg1;
|
||||
else if (attrib == 26)
|
||||
cellCameraInstance.m_camera.attributes.AGCLOW = arg1;
|
||||
else if (attrib == 27)
|
||||
cellCameraInstance.m_camera.attributes.AGCHIGH = arg1;
|
||||
else if (attrib == 28)
|
||||
cellCameraInstance.m_camera.attributes.DEVICELOCATION = arg1;
|
||||
else if (attrib == 29)
|
||||
cellCamera->Error("Tried to write to read-only (?) value: FORMATCAP");
|
||||
else if (attrib == 30)
|
||||
cellCameraInstance.m_camera.attributes.FORMATINDEX = arg1;
|
||||
else if (attrib == 31)
|
||||
cellCameraInstance.m_camera.attributes.NUMFRAME = arg1;
|
||||
else if (attrib == 32)
|
||||
cellCameraInstance.m_camera.attributes.FRAMEINDEX = arg1;
|
||||
else if (attrib == 33)
|
||||
cellCameraInstance.m_camera.attributes.FRAMESIZE = arg1;
|
||||
else if (attrib == 34)
|
||||
cellCameraInstance.m_camera.attributes.INTERVALTYPE = arg1;
|
||||
else if (attrib == 35)
|
||||
cellCameraInstance.m_camera.attributes.INTERVALINDEX = arg1;
|
||||
else if (attrib == 36)
|
||||
cellCameraInstance.m_camera.attributes.INTERVALVALUE = arg1;
|
||||
else if (attrib == 37)
|
||||
cellCameraInstance.m_camera.attributes.COLORMATCHING = arg1;
|
||||
else if (attrib == 38)
|
||||
cellCameraInstance.m_camera.attributes.PLFREQ = arg1;
|
||||
else if (attrib == 39)
|
||||
return CELL_CAMERA_ERROR_PARAM;
|
||||
else if (attrib == 40)
|
||||
cellCameraInstance.m_camera.attributes.DEVICECAP = arg1;
|
||||
else if (attrib == 41)
|
||||
cellCameraInstance.m_camera.attributes.DEVICESPEED = arg1;
|
||||
else if (attrib == 42)
|
||||
cellCameraInstance.m_camera.attributes.UVCREQCODE = arg1;
|
||||
else if (attrib == 43)
|
||||
cellCameraInstance.m_camera.attributes.UVCREQDATA = arg1;
|
||||
else if (attrib == 44)
|
||||
return CELL_CAMERA_ERROR_PARAM;
|
||||
else if (attrib == 45)
|
||||
cellCamera->Error("Tried to write to read-only (?) value: READMODE");
|
||||
else if (attrib == 46)
|
||||
cellCameraInstance.m_camera.attributes.GAMEPID = arg1;
|
||||
else if (attrib == 47)
|
||||
cellCameraInstance.m_camera.attributes.PBUFFER = arg1;
|
||||
else if (attrib == 48)
|
||||
cellCameraInstance.m_camera.attributes.READFINISH = arg1;
|
||||
else if (attrib == 49)
|
||||
cellCamera->Error("Tried to write to read-only (?) value: ATTRIBUTE_UNKNOWN");
|
||||
|
||||
return CELL_OK;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue