summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2012-02-28 10:59:55 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2012-02-28 10:59:55 +0100
commitde69599bf89708c8f7044fd3a84155551d0391e8 (patch)
treef18781f610de953225bb0a76a65b6eec0389e982 /src
parent893efbe69cd5db78f82c664c3fa7e546496d8a1c (diff)
downloaduca-de69599bf89708c8f7044fd3a84155551d0391e8.tar.gz
uca-de69599bf89708c8f7044fd3a84155551d0391e8.tar.bz2
uca-de69599bf89708c8f7044fd3a84155551d0391e8.tar.xz
uca-de69599bf89708c8f7044fd3a84155551d0391e8.zip
Disable pco_set_time_base()
Diffstat (limited to 'src')
-rw-r--r--src/cameras/pco.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/cameras/pco.c b/src/cameras/pco.c
index 4510fa6..319412a 100644
--- a/src/cameras/pco.c
+++ b/src/cameras/pco.c
@@ -399,7 +399,7 @@ uint32_t uca_pco_init(struct uca_camera_priv **cam, struct uca_grabber_priv *gra
pco_set_rec_state(pco, 0);
pco_set_timestamp_mode(pco, TIMESTAMP_MODE_ASCII);
- pco_set_timebase(pco, 1, 1);
+ /* pco_set_timebase(pco, 1, 1); */
/* pco_arm_camera(pco); */
/* Prepare frame grabber for recording */
@@ -437,8 +437,10 @@ uint32_t uca_pco_init(struct uca_camera_priv **cam, struct uca_grabber_priv *gra
val = UCA_TRIGGER_AUTO;
grabber->set_property(grabber, UCA_GRABBER_TRIGGER_MODE, &val);
- uint32_t width, height;
- pco_get_actual_size(pco, &width, &height);
+ uint16_t width_std, height_std, width_ex, height_ex;
+ pco_get_resolution(pco, &width_std, &height_std, &width_ex, &height_ex);
+
+ uint32_t width = width_std, height = height_std;
uca->frame_width = width;
uca->frame_height = height;
pco_d->roi[0] = pco_d->roi[1] = 1;