Bienvenido: Ingresar
location: attachment:parcheBUC2203_v01.patch de HowTo/BUC2203LinuxInst

Adjunto 'parcheBUC2203_v01.patch'

Descargar

   1 === modified file 'libunicap/cpi/euvccam/euvccam_devspec.c'
   2 --- libunicap/cpi/euvccam/euvccam_devspec.c	2011-07-24 07:31:50 +0000
   3 +++ libunicap/cpi/euvccam/euvccam_devspec.c	2012-09-10 20:23:57 +0000
   4 @@ -266,6 +266,154 @@
   5        enumerate_func: NULL,
   6     },
   7  };
   8 +static euvccam_property_t properties_8201_mono[] =
   9 +{
  10 +   {
  11 +      {
  12 +	identifier: "Shutter", 
  13 +	category: "Exposure",
  14 +	unit: "s",
  15 +	relations: NULL,
  16 +	relations_count: 0, 
  17 +	{value: 0}, 
  18 +	{range: { min: 0.0001, max: 0.25 } },
  19 +	stepping: 0.0001,
  20 +	type: UNICAP_PROPERTY_TYPE_RANGE,
  21 +	flags: UNICAP_FLAGS_MANUAL,
  22 +	flags_mask: UNICAP_FLAGS_MANUAL | UNICAP_FLAGS_AUTO,
  23 +	property_data: NULL, 
  24 +	property_data_size: 0,
  25 +      },
  26 +      
  27 +      get_func: euvccam_device_get_exposure,
  28 +      set_func: euvccam_device_set_exposure,
  29 +      enumerate_func: NULL,
  30 +   },
  31 +   {
  32 +      {
  33 +	identifier: "Gain", 
  34 +	category: "Exposure",
  35 +	unit: "",
  36 +	relations: NULL,
  37 +	relations_count: 0, 
  38 +	{value: 0}, 
  39 +	{range: { min: 16, max: 63 } },
  40 +	stepping: 1.0,
  41 +	type: UNICAP_PROPERTY_TYPE_RANGE,
  42 +	flags: UNICAP_FLAGS_MANUAL,
  43 +	flags_mask: UNICAP_FLAGS_MANUAL | UNICAP_FLAGS_AUTO,
  44 +	property_data: NULL, 
  45 +	property_data_size: 0,
  46 +      },
  47 +      
  48 +      get_func: euvccam_device_get_gain,
  49 +      set_func: euvccam_device_set_gain,
  50 +      enumerate_func: NULL,
  51 +   },
  52 +   {
  53 +      {
  54 +   	identifier: "Frame Rate",
  55 +   	category: "Video",
  56 +   	unit: "",
  57 +   	relations: NULL,
  58 +   	relations_count: 0,
  59 +   	{value: 0},
  60 +   	{range: { min: 0, max: 0 } },
  61 +   	stepping: 1.0,
  62 +   	type: UNICAP_PROPERTY_TYPE_VALUE_LIST,
  63 +   	flags: UNICAP_FLAGS_MANUAL,
  64 +   	flags_mask: UNICAP_FLAGS_MANUAL,
  65 +   	property_data: NULL,
  66 +   	property_data_size: 0,
  67 +      },
  68 +      
  69 +      get_func: euvccam_device_get_frame_rate,
  70 +      set_func: euvccam_device_set_frame_rate,
  71 +      enumerate_func: euvccam_device_enumerate_frame_rate,
  72 +   },
  73 +   {
  74 +      {
  75 +	identifier: N_("trigger"),
  76 +	category: N_("device"),
  77 +	unit: "",
  78 +	relations: NULL,
  79 +	relations_count: 0,
  80 +	{menu_item: TRIGGER_FREE_RUNNING},
  81 +	{menu: { menu_items: trigger_menu, 
  82 +		 menu_item_count: sizeof( trigger_menu ) / sizeof( char * ) } },
  83 +	stepping: 0.0,
  84 +	type: UNICAP_PROPERTY_TYPE_MENU,
  85 +	flags: UNICAP_FLAGS_MANUAL,
  86 +	flags_mask: UNICAP_FLAGS_MANUAL,
  87 +	property_data: NULL,
  88 +	property_data_size: 0
  89 +      },
  90 +      
  91 +      get_func: euvccam_device_get_trigger,
  92 +      set_func: euvccam_device_set_trigger,
  93 +      enumerate_func: euvccam_device_enumerate_trigger,
  94 +   },
  95 +   {
  96 +      {
  97 +	identifier: N_("software trigger"),
  98 +	category: N_("device"),
  99 +	unit: "",
 100 +	relations: NULL,
 101 +	relations_count: 0,
 102 +	stepping: 0.0,
 103 +	type: UNICAP_PROPERTY_TYPE_FLAGS,
 104 +	flags: UNICAP_FLAGS_ONE_PUSH | UNICAP_FLAGS_MANUAL,
 105 +	flags_mask: UNICAP_FLAGS_ONE_PUSH | UNICAP_FLAGS_MANUAL,
 106 +	property_data: NULL,
 107 +	property_data_size: 0
 108 +      },
 109 +      
 110 +      get_func: euvccam_device_get_software_trigger,
 111 +      set_func: euvccam_device_set_software_trigger,
 112 +      enumerate_func: euvccam_device_enumerate_software_trigger,
 113 +   },
 114 +#if 0
 115 +   {
 116 +      {
 117 +	identifier: N_("reset sensor"),
 118 +	category: N_("device"),
 119 +	unit: "",
 120 +	relations: NULL,
 121 +	relations_count: 0,
 122 +	stepping: 0.0,
 123 +	type: UNICAP_PROPERTY_TYPE_FLAGS,
 124 +	flags: UNICAP_FLAGS_ONE_PUSH | UNICAP_FLAGS_MANUAL,
 125 +	flags_mask: UNICAP_FLAGS_ONE_PUSH | UNICAP_FLAGS_MANUAL,
 126 +	property_data: NULL,
 127 +	property_data_size: 0
 128 +      },
 129 +      
 130 +      get_func: euvccam_device_get_reset_mt9v024,
 131 +      set_func: euvccam_device_set_reset_mt9v024,
 132 +   },
 133 +#endif
 134 +   {
 135 +      {
 136 +	identifier: "IIC Command", 
 137 +	category: "Device",
 138 +	unit: "",
 139 +	relations: NULL,
 140 +	relations_count: 0, 
 141 +	{value: 0}, 
 142 +	{range: { min: 5, max: 120 } },
 143 +	stepping: 1.0,
 144 +	type: UNICAP_PROPERTY_TYPE_DATA,
 145 +	flags: UNICAP_FLAGS_MANUAL,
 146 +	flags_mask: UNICAP_FLAGS_MANUAL,
 147 +	property_data: NULL, 
 148 +	property_data_size: 0,
 149 +      },
 150 +      
 151 +      get_func: euvccam_device_read_iic,
 152 +      set_func: euvccam_device_write_iic,
 153 +      enumerate_func: NULL,
 154 +   },
 155 +};
 156  
 157  static euvccam_property_t properties_8206[] =
 158  {
 159 @@ -1166,6 +1314,89 @@
 160        
 161  };
 162  
 163 +static double format_8201_mono_framerates[] = {   87, 60, 30, 25, 15, 7.5, 5};
 164 +static int    format_8201_mono_framerate_map[] = { 7, 6,  0,  1,  2,   3, 4};
 165 +
 166 +static struct euvccam_video_format_description formats_8201_mono[] =
 167 +{
 168 +   {
 169 +      1,
 170 +      3,
 171 +      { identifier: "Y800 320x240",
 172 +	size: {0,0,320,240},
 173 +	min_size: { 0,0,320,240 },
 174 +	max_size: { 0,0,320,240 },
 175 +	h_stepping: 0,
 176 +	v_stepping: 0, 
 177 +	sizes: NULL,
 178 +	size_count: 0,
 179 +	bpp: 8,
 180 +	buffer_size: 320 * 240,
 181 +	fourcc: FOURCC( 'Y', '8', '0', '0' ),
 182 +	flags: 0, 
 183 +	buffer_types: UNICAP_BUFFER_TYPE_SYSTEM | UNICAP_BUFFER_TYPE_USER, 
 184 +	system_buffer_count: EUVCCAM_SYSTEM_BUFFER_COUNT,
 185 +	buffer_type: 0
 186 +      },
 187 +      N_ELEMENTS( format_8201_mono_framerates ), 
 188 +      format_8201_mono_framerates,
 189 +      format_8201_mono_framerate_map,
 190 +      320 * 240, 
 191 +      NULL, 
 192 +      EUVCCAM_FORMAT_IS_PARTIAL_SCAN,
 193 +   },
 194 +   {
 195 +      1,
 196 +      2,
 197 +      { identifier: "Y800 640x480",
 198 +	size: {0,0,640,480},
 199 +	min_size: { 0,0,640,480 },
 200 +	max_size: { 0,0,640,480 },
 201 +	h_stepping: 0,
 202 +	v_stepping: 0, 
 203 +	sizes: NULL,
 204 +	size_count: 0,
 205 +	bpp: 8,
 206 +	buffer_size: 640 * 480,
 207 +	fourcc: FOURCC( 'Y', '8', '0', '0' ),
 208 +	flags: 0, 
 209 +	buffer_types: UNICAP_BUFFER_TYPE_SYSTEM | UNICAP_BUFFER_TYPE_USER, 
 210 +	system_buffer_count: EUVCCAM_SYSTEM_BUFFER_COUNT,
 211 +	buffer_type: 0
 212 +      },
 213 +      N_ELEMENTS( format_8201_mono_framerates ), 
 214 +      format_8201_mono_framerates,
 215 +      format_8201_mono_framerate_map,
 216 +      640 * 480, 
 217 +      NULL,
 218 +   },
 219 +   {
 220 +      1,
 221 +      1,
 222 +      { identifier: "Y800 744x480",
 223 +	size: {0,0,744,480},
 224 +	min_size: { 0,0,744,480 },
 225 +	max_size: { 0,0,744,480 },
 226 +	h_stepping: 0,
 227 +	v_stepping: 0, 
 228 +	sizes: NULL,
 229 +	size_count: 0,
 230 +	bpp: 8,
 231 +	buffer_size: 744 * 480,
 232 +	fourcc: FOURCC( 'Y', '8', '0', '0' ),
 233 +	flags: 0, 
 234 +	buffer_types: UNICAP_BUFFER_TYPE_SYSTEM | UNICAP_BUFFER_TYPE_USER, 
 235 +	system_buffer_count: EUVCCAM_SYSTEM_BUFFER_COUNT,
 236 +	buffer_type: 0
 237 +      },
 238 +      N_ELEMENTS( format_8201_mono_framerates ), 
 239 +      format_8201_mono_framerates,
 240 +      format_8201_mono_framerate_map,
 241 +     744 * 480, 
 242 +      NULL, 
 243 +   },
 244 +};
 245 +
 246  
 247  static double format_8202_framerates[] = {   87, 60, 30, 25, 15, 7.5, 5};
 248  static int    format_8202_framerate_map[] = { 7, 6,  0,  1,  2,   3, 4};
 249 @@ -2147,14 +2378,24 @@
 250  
 251  struct euvccam_devspec euvccam_devspec[] =
 252  {
 253 +    /*Lo que había originalmente*/
 254 +   /*{*/
 255 +      /*0x8201,*/
 256 +      /*0, */
 257 +      /*0,*/
 258 +      /*N_ELEMENTS( formats_8201 ),*/
 259 +      /*formats_8201,*/
 260 +      /*N_ELEMENTS( properties_8201 ),*/
 261 +      /*properties_8201,*/
 262 +   /*},*/
 263     { 
 264        0x8201,
 265        0, 
 266        0,
 267 -      N_ELEMENTS( formats_8201 ),
 268 -      formats_8201, 
 269 -      N_ELEMENTS( properties_8201 ),
 270 -      properties_8201,
 271 +      N_ELEMENTS( formats_8201_mono ),
 272 +      formats_8201_mono, 
 273 +      N_ELEMENTS( properties_8201_mono ),
 274 +      properties_8202_mono,
 275     },
 276     {
 277        0x8202,

Archivos adjuntos

Para referirse a los adjuntos de una página, usa attachment:nombredelarchivo, como se muestra abajo en la lista de archivos. NO uses la URL del enlace [get], ya que puede cambiar fácilmente y dejar de funcionar.
  • [obtener | ver] (2012-10-05 17:33:42, 1.1 KB) [[attachment:opencv_unicap2_support_Y800.patch]]
  • [obtener | ver] (2012-09-10 21:13:43, 6.8 KB) [[attachment:parcheBUC2203_v01.patch]]
 All files | Selected Files: delete move to page copy to page

No tienes permisos para adjuntar un archivo a esta página.