mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'genesys-session-ccd-size-divisor' into 'master' 

genesys: Use ScanSession to compute ccd_size_divisor on all chips

See merge request sane-project/backends!143
merge-requests/144/head
Povilas Kanapickas 2019-08-31 16:45:04 +00:00
rodzic da5d0bc916 687b549f0a
commit dc7c1f81f3
3 zmienionych plików z 19 dodań i 18 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

23
backend/genesys_gl124.cc
Wyświetl plik

@ -1092,13 +1092,11 @@ static void gl124_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
debug_dump(DBG_info, session.params); debug_dump(DBG_info, session.params);
unsigned ccd_size_divisor = sensor.get_ccd_size_divisor_for_dpi(session.params.xres); unsigned optical_res = sensor.optical_res / session.ccd_size_divisor;
unsigned optical_res = sensor.optical_res / ccd_size_divisor;
DBG (DBG_info, "%s: optical_res=%d\n", __func__, optical_res); DBG (DBG_info, "%s: optical_res=%d\n", __func__, optical_res);
/* stagger */ /* stagger */
if (ccd_size_divisor == 1 && (dev->model->flags & GENESYS_FLAG_STAGGERED_LINE)) { if (session.ccd_size_divisor == 1 && (dev->model->flags & GENESYS_FLAG_STAGGERED_LINE)) {
stagger = (4 * session.params.yres) / dev->motor.base_ydpi; stagger = (4 * session.params.yres) / dev->motor.base_ydpi;
} else { } else {
stagger = 0; stagger = 0;
@ -1155,7 +1153,7 @@ static void gl124_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
} }
else else
{ {
exposure_time = gl124_compute_exposure(sensor, used_res, ccd_size_divisor); exposure_time = gl124_compute_exposure(sensor, used_res, session.ccd_size_divisor);
scan_step_type = sanei_genesys_compute_step_type(gl124_motor_profiles, scan_step_type = sanei_genesys_compute_step_type(gl124_motor_profiles,
dev->model->motor_type, exposure_time); dev->model->motor_type, exposure_time);
} }
@ -1177,7 +1175,7 @@ static void gl124_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
// now _LOGICAL_ optical values used are known, setup registers // now _LOGICAL_ optical values used are known, setup registers
gl124_init_optical_regs_scan(dev, sensor, reg, exposure_time, session, used_res, start, gl124_init_optical_regs_scan(dev, sensor, reg, exposure_time, session, used_res, start,
used_pixels, session.params.channels, session.params.depth, used_pixels, session.params.channels, session.params.depth,
ccd_size_divisor, session.params.color_filter); session.ccd_size_divisor, session.params.color_filter);
/*** motor parameters ***/ /*** motor parameters ***/
@ -1238,7 +1236,7 @@ static void gl124_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens
dev->current_setup.lines = lincnt; dev->current_setup.lines = lincnt;
dev->current_setup.exposure_time = exposure_time; dev->current_setup.exposure_time = exposure_time;
dev->current_setup.xres = used_res; dev->current_setup.xres = used_res;
dev->current_setup.ccd_size_divisor = ccd_size_divisor; dev->current_setup.ccd_size_divisor = session.ccd_size_divisor;
dev->current_setup.stagger = stagger; dev->current_setup.stagger = stagger;
dev->current_setup.max_shift = max_shift + stagger; dev->current_setup.max_shift = max_shift + stagger;
@ -1291,7 +1289,7 @@ gl124_calculate_current_setup (Genesys_Device * dev, const Genesys_Sensor& senso
session.params.color_filter = dev->settings.color_filter; session.params.color_filter = dev->settings.color_filter;
session.params.flags = 0; session.params.flags = 0;
unsigned ccd_size_divisor = sensor.get_ccd_size_divisor_for_dpi(session.params.xres); gl124_compute_session(dev, session, sensor);
DBG(DBG_info, "%s ", __func__); DBG(DBG_info, "%s ", __func__);
debug_dump(DBG_info, session.params); debug_dump(DBG_info, session.params);
@ -1312,7 +1310,7 @@ gl124_calculate_current_setup (Genesys_Device * dev, const Genesys_Sensor& senso
used_pixels = (session.params.pixels * optical_res) / session.params.xres; used_pixels = (session.params.pixels * optical_res) / session.params.xres;
DBG (DBG_info, "%s: used_pixels=%d\n", __func__, used_pixels); DBG (DBG_info, "%s: used_pixels=%d\n", __func__, used_pixels);
exposure_time = gl124_compute_exposure(sensor, session.params.xres, ccd_size_divisor); exposure_time = gl124_compute_exposure(sensor, session.params.xres, session.ccd_size_divisor);
DBG (DBG_info, "%s : exposure_time=%d pixels\n", __func__, exposure_time); DBG (DBG_info, "%s : exposure_time=%d pixels\n", __func__, exposure_time);
max_shift = sanei_genesys_compute_max_shift(dev, session.params.channels, max_shift = sanei_genesys_compute_max_shift(dev, session.params.channels,
@ -1321,11 +1319,12 @@ gl124_calculate_current_setup (Genesys_Device * dev, const Genesys_Sensor& senso
// compute hw dpi for sensor // compute hw dpi for sensor
dpihw = sensor.get_register_hwdpi(used_res); dpihw = sensor.get_register_hwdpi(used_res);
const SensorProfile& sensor_profile = get_sensor_profile(sensor, dpihw, ccd_size_divisor); const SensorProfile& sensor_profile = get_sensor_profile(sensor, dpihw,
session.ccd_size_divisor);
dev->segnb = sensor_profile.custom_regs.get_value(0x98) & 0x0f; dev->segnb = sensor_profile.custom_regs.get_value(0x98) & 0x0f;
/* stagger */ /* stagger */
if (ccd_size_divisor == 1 && (dev->model->flags & GENESYS_FLAG_STAGGERED_LINE)) { if (session.ccd_size_divisor == 1 && (dev->model->flags & GENESYS_FLAG_STAGGERED_LINE)) {
stagger = (4 * session.params.yres) / dev->motor.base_ydpi; stagger = (4 * session.params.yres) / dev->motor.base_ydpi;
} else { } else {
stagger = 0; stagger = 0;
@ -1340,7 +1339,7 @@ gl124_calculate_current_setup (Genesys_Device * dev, const Genesys_Sensor& senso
dev->current_setup.lines = lincnt; dev->current_setup.lines = lincnt;
dev->current_setup.exposure_time = exposure_time; dev->current_setup.exposure_time = exposure_time;
dev->current_setup.xres = used_res; dev->current_setup.xres = used_res;
dev->current_setup.ccd_size_divisor = ccd_size_divisor; dev->current_setup.ccd_size_divisor = session.ccd_size_divisor;
dev->current_setup.stagger = stagger; dev->current_setup.stagger = stagger;
dev->current_setup.max_shift = max_shift + stagger; dev->current_setup.max_shift = max_shift + stagger;
} }

10
backend/genesys_gl843.cc
Wyświetl plik

@ -1453,14 +1453,16 @@ gl843_calculate_current_setup(Genesys_Device * dev, const Genesys_Sensor& sensor
session.params.color_filter = dev->settings.color_filter; session.params.color_filter = dev->settings.color_filter;
session.params.flags = 0; session.params.flags = 0;
gl843_compute_session(dev, session, sensor);
DBG(DBG_info, "%s ", __func__); DBG(DBG_info, "%s ", __func__);
debug_dump(DBG_info, session.params); debug_dump(DBG_info, session.params);
/* optical_res */ // optical_res
optical_res = sensor.optical_res / ccd_size_divisor; optical_res = sensor.optical_res / session.ccd_size_divisor;
/* stagger */ /* stagger */
if (ccd_size_divisor == 1 && (dev->model->flags & GENESYS_FLAG_STAGGERED_LINE)) { if (session.ccd_size_divisor == 1 && (dev->model->flags & GENESYS_FLAG_STAGGERED_LINE)) {
stagger = (4 * session.params.yres) / dev->motor.base_ydpi; stagger = (4 * session.params.yres) / dev->motor.base_ydpi;
} else { } else {
stagger = 0; stagger = 0;
@ -1512,7 +1514,7 @@ gl843_calculate_current_setup(Genesys_Device * dev, const Genesys_Sensor& sensor
dev->current_setup.lines = lincnt; dev->current_setup.lines = lincnt;
dev->current_setup.exposure_time = exposure; dev->current_setup.exposure_time = exposure;
dev->current_setup.xres = used_res; dev->current_setup.xres = used_res;
dev->current_setup.ccd_size_divisor = ccd_size_divisor; dev->current_setup.ccd_size_divisor = session.ccd_size_divisor;
dev->current_setup.stagger = stagger; dev->current_setup.stagger = stagger;
dev->current_setup.max_shift = max_shift + stagger; dev->current_setup.max_shift = max_shift + stagger;

4
backend/genesys_gl847.cc
Wyświetl plik

@ -1191,11 +1191,11 @@ gl847_calculate_current_setup(Genesys_Device * dev, const Genesys_Sensor& sensor
session.params.color_filter = dev->settings.color_filter; session.params.color_filter = dev->settings.color_filter;
session.params.flags = 0; session.params.flags = 0;
gl847_compute_session(dev, session, sensor);
DBG(DBG_info, "%s ", __func__); DBG(DBG_info, "%s ", __func__);
debug_dump(DBG_info, session.params); debug_dump(DBG_info, session.params);
gl847_compute_session(dev, session, sensor);
/* optical_res */ /* optical_res */
optical_res = sensor.optical_res; optical_res = sensor.optical_res;