eddy/CCD_Capture
1
0
Fork 0
mirror of https://github.com/eddyem/CCD_Capture.git synced 2026-03-20 00:31:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

change stored size (8/16 bit); allocate img for server in shared memory (TODO: add to client ability of reading from shm)

Browse Source
This commit is contained in:
Edward Emelianov
2023-12-14 16:55:03 +03:00
parent cb38636d78
commit 8132c07479
19 changed files with 637 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
BASLER_cameras/basler.c
View File

@@ -293,10 +293,10 @@ static int setdevno(int N){
return TRUE;
}
static int setbitdepth(int i){
static int setbitdepth(int depth){
#define MONON 4
const char *fmts[MONON] = {"Mono16", "Mono14", "Mono12", "Mono10"};
if(i == 0){ // 8 bit
if(depth == 0){ // 8 bit
if(!PylonDeviceFeatureIsAvailable( hDev, "EnumEntry_PixelFormat_Mono8" )) return FALSE;
PYLONFN(PylonDeviceFeatureFromString, hDev, "PixelFormat", "Mono8");
green("Pixel format: Mono8\n");
@@ -370,21 +370,21 @@ static int capture(IMG *ima){
int width = grabResult.SizeX, height = grabResult.SizeY, stride = grabResult.SizeX + grabResult.PaddingX;
//TIMESTAMP("start converting");
if(is16bit){
int s2 = stride<<1, w2 = width<<1;
int s2 = stride<<1;
OMP_FOR()
for(int y = 0; y < height; ++y){
uint16_t *Out = &ima->data[y*width];
uint8_t *Out = &((uint8_t*)ima->data)[y*width];
const uint8_t *In = &imgBuf[y*s2];
memcpy(Out, In, w2);
for(int x = 0; x < width; ++x){
*Out++ = *In; In += 2;
}
}
}else{
OMP_FOR()
for(int y = 0; y < height; ++y){
uint16_t *Out = &ima->data[y*width];
uint16_t *Out = &((uint16_t*)ima->data)[y*width];
const uint8_t *In = &imgBuf[y*stride];
for(int x = 0; x < width; ++x){
*Out++ = *In++;
}
memcpy(Out, In, width);
}
}
//TIMESTAMP("image ready");