Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Removing min_fps param not longer required for librraew

  • Loading branch information...
commit 1b6f451ba33e08dff301fade6fa76f2c1e322453 1 parent 359bf70
@mmontero mmontero authored
View
4 src/cli_mt9p031.vala
@@ -8,7 +8,7 @@ public interface Imt9p031: Object{
public abstract int sensor_flip_vertically(string state) throws IOError;
public abstract int sensor_flip_horizontally(string state) throws IOError;
public abstract bool get_exposure_time(out int exp_time) throws IOError;
- public abstract int set_exposure_time(int _exp_time) throws IOError;
+ public abstract int set_exposure_time(uint _exp_time) throws IOError;
}
public class cli_mt9p031 : AbstcCliRegister{
@@ -125,7 +125,7 @@ public class cli_mt9p031 : AbstcCliRegister{
return -1;
}
- int time = int.parse(args[1]);
+ uint time = int.parse(args[1]);
try {
int ret = sensor.set_exposure_time(time);
View
18 src/ipipe-client.vala
@@ -16,7 +16,7 @@ public interface ICliIpipe: Object{
public abstract string get_video_processor() throws IOError;
public abstract string get_sensor() throws IOError;
public abstract int init_aew(string wb, string ae, string g, string meter,
- int time, int fps, int segment_factor, int width, int height,
+ int time, int segment_factor, int width, int height,
int center_percentage) throws IOError;
public abstract void close_aew() throws IOError;
}
@@ -194,7 +194,7 @@ public class IpipeCli: GLib.Object {
#if (RRAEW)
int i=0;
// Check if there are missing args
- while (i < 11) {
+ while (i < 10) {
if (args[i] == null) {
Posix.stdout.printf("Error:\nMissing argument.Execute:'help <command>'\n");
return -1;
@@ -202,14 +202,13 @@ public class IpipeCli: GLib.Object {
i++;
}
int wait_time = int.parse(args[5]);
- int min_fps = int.parse(args[6]);
- int width = int.parse(args[8]);
- int height = int.parse(args[9]);
- int segment_factor = int.parse(args[7]);
- int center_percentage = int.parse(args[10]);
+ int width = int.parse(args[7]);
+ int height = int.parse(args[8]);
+ int segment_factor = int.parse(args[6]);
+ int center_percentage = int.parse(args[9]);
try {
int ret = ipipe.init_aew(args[1], args[2], args[3], args[4], wait_time,
- min_fps, segment_factor, width, height, center_percentage);
+ segment_factor, width, height, center_percentage);
if (ret < 0) {
Posix.stderr.printf("Error:\n Failed to initialize aew\n");
return -1;
@@ -264,7 +263,7 @@ public class IpipeCli: GLib.Object {
"Enable/Disable debug messages", "\n\ttrue: enables debug, "
+ "\n\tfalse: disables debug" );
cmd.new_command("init-aew", cli_ini_aew, "init-aew <WB> <AE> <G> <EM> "
- + "<T[us]> <fps> <seg> <width> <height> <center_percentage>",
+ + "<T[us]> <seg> <width> <height> <center_percentage>",
"Initialize AEW algorithms",
"\n\tWB: white balance algorithm, the options are:"
+ "\n\t\tG -for gray world algorithm"
@@ -291,7 +290,6 @@ public class IpipeCli: GLib.Object {
+ "\n\t\ton 6 pieces and weighting them to avoid backlighting"
+ "\n\tT: wait time in us, specifies the time between "
+ "\n\t\talgorithm adjustments, max value=1s=1000000us"
- + "\n\tfps: minimum frame rate"
+ "\n\tseg: frame segmentation factor, each frame is segmented into "
+ "\n\t\tregions, this factor represents the percentage of the "
+ "\n\t\tmaximum number of possible regions"
View
2  src/ipiped-dm365.vala
@@ -391,7 +391,7 @@ public class Ipiped_dm365 : AbstcVideoProcessor{
}
strcpy(mod_param.version,cap.version);
- mod_param.module_id = PREV_LUM_ADJ;;
+ mod_param.module_id = PREV_LUM_ADJ;
mod_param.len =(uint8)sizeof(LumAdj);
mod_param.param = &lum_adj;
View
4 src/ipiped-mt9p031.vala
@@ -263,7 +263,7 @@ public class Ipiped_mt9p031 : AbstcSensor{
return 0;
}
- public int set_exposure_time(int _exp_time) throws IOError{
+ public int set_exposure_time(uint _exp_time) throws IOError{
if (this.capture_fd < 0){
if (open_sensor() < 0)
return -1;
@@ -403,7 +403,7 @@ public class Ipiped_mt9p031 : AbstcSensor{
return -1;
}
sensor.colorptn = colorptn;
- sensor.max_exp_time = 2500;
+ sensor.max_exp_time = 0x7fffffff;
sensor.min_exp_time = 1;
sensor.max_gain = 128;
sensor.min_gain = 1;
View
5 src/ipiped.vala
@@ -116,11 +116,10 @@ using rraew;
* exposure algorithm, can be "S" for spot or "P" for partial or "C" for
* electronic centric or "SG" for segmented image or "A" for average.
* @param time it is the time between aew algorithms iterations
- * @param fps is the minimum allowed frame rate
* @param segment_factor a percentage of the maximun image divisions
*/
public int init_aew(string wb, string ae, string g, string meter,
- int time, int fps, int segment_factor, int width, int height,
+ int time, int segment_factor, int width, int height,
int center_percentage) throws IOError
{
/** File descriptors information*/
@@ -211,7 +210,7 @@ using rraew;
fd.owner_capture_fd = sensor_abstract.owner_capture_fd;
rraew = create_rraew(wb_algo, ae_algo, meter_type,
- width, height, fps, segment_factor, center_percentage, gain_type,
+ width, height, segment_factor, center_percentage, gain_type,
&fd, &sensor, &interf);
aew_running = true;
Please sign in to comment.
Something went wrong with that request. Please try again.