Changeset 1046 for trunk/include/camera.h
- Timestamp:
- 01/16/11 00:58:48 (2 years ago)
- File:
-
- 1 edited
-
trunk/include/camera.h (modified) (62 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/camera.h
r1017 r1046 53 53 #define ZOOM_OVERRIDE 0 // Shall zoom-override be used? default 0 becoz not implemented right now 54 54 55 # undef DNG_SUPPORT// Camera supports DNG format for saving of RAW images55 #define DNG_SUPPORT 1 // Camera supports DNG format for saving of RAW images 56 56 57 57 #undef CAM_REAR_CURTAIN // Camera do not have front/rear curtain flash sync in menu … … 118 118 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 119 119 #define CAM_HAS_JOGDIAL 1 120 #define DNG_SUPPORT 1121 120 // pattern 122 121 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 161 160 #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 162 161 163 #define DNG_SUPPORT 1164 162 // pattern 165 163 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 204 202 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 205 203 #define CAM_EV_IN_VIDEO 1 206 #define DNG_SUPPORT 1207 204 // pattern 208 205 #define cam_CFAPattern 0x01000201 // Green Blue Red Green … … 247 244 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 248 245 #define CAM_EV_IN_VIDEO 1 249 #define DNG_SUPPORT 1250 246 // pattern 251 247 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 287 283 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 288 284 #define CAM_EV_IN_VIDEO 1 289 #define DNG_SUPPORT 1290 285 // pattern 291 286 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 328 323 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 329 324 #define CAM_EV_IN_VIDEO 1 330 #define DNG_SUPPORT 1331 325 #define CAM_MULTIPART 1 332 326 … … 375 369 #define CAM_EV_IN_VIDEO 1 376 370 377 #define DNG_SUPPORT 1378 371 // pattern 379 372 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 426 419 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2 427 420 #define CAM_EV_IN_VIDEO 1 428 #define DNG_SUPPORT 1429 421 // pattern 430 422 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 467 459 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2 468 460 #define CAM_EV_IN_VIDEO 1 469 #define DNG_SUPPORT 1470 461 // pattern 471 462 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 511 502 #define CAM_CAN_MUTE_MICROPHONE 1 512 503 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 513 #define DNG_SUPPORT 1514 504 // pattern 515 505 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 552 542 #define CAM_CAN_MUTE_MICROPHONE 1 553 543 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 554 #define DNG_SUPPORT 1555 544 // pattern 556 545 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 586 575 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 587 576 #define CAM_EV_IN_VIDEO 1 588 #define DNG_SUPPORT 1589 577 #define CAM_REAR_CURTAIN 1 590 578 // pattern … … 629 617 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 630 618 //#define CAM_EV_IN_VIDEO 1 // not working on 101b!!! 631 #define DNG_SUPPORT 1632 619 // pattern 633 620 #define cam_CFAPattern 0x01000201 // Green Blue Red Green … … 673 660 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2 674 661 #define CAM_EV_IN_VIDEO 1 675 #define DNG_SUPPORT 1676 662 // pattern 677 663 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 708 694 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2 709 695 #define CAM_EV_IN_VIDEO 1 710 #define DNG_SUPPORT 1711 696 // pattern 712 697 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 743 728 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 744 729 #define CAM_EV_IN_VIDEO 1 745 #define DNG_SUPPORT 1746 730 // pattern 747 731 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 779 763 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 780 764 #define CAM_EV_IN_VIDEO 1 781 #define DNG_SUPPORT 1782 765 // pattern 783 766 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 816 799 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 817 800 #define CAM_EV_IN_VIDEO 1 818 #define DNG_SUPPORT 1819 801 // pattern 820 802 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 849 831 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2 850 832 #define CAM_EV_IN_VIDEO 1 851 #define DNG_SUPPORT 1852 833 // pattern 853 834 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 881 862 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 882 863 #define CAM_EV_IN_VIDEO 1 883 #define DNG_SUPPORT 1884 864 #define CAM_REAR_CURTAIN 1 // http://chdk.setepontos.com/index.php/topic,650.msg54434.html#msg54434 885 865 // pattern … … 920 900 #define CAM_EV_IN_VIDEO 1 921 901 #undef CAM_VIDEO_CONTROL 922 #define DNG_SUPPORT 1923 902 // pattern 924 903 #define cam_CFAPattern 0x01000201 // Green Blue Red Green … … 957 936 #define CAM_JPEG_HEIGHT 2736 958 937 959 #define DNG_SUPPORT 1960 938 961 939 #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData … … 1028 1006 #define CAM_VIDEO_QUALITY_ONLY 1 1029 1007 1030 #define DNG_SUPPORT 11031 1008 1032 1009 // #define CAM_EXT_TV_RANGE 1 … … 1129 1106 1130 1107 1131 #define DNG_SUPPORT 11132 1108 // pattern 1133 1109 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 1167 1143 //#define CAM_CONSOLE_LOG_ENABLED 1 1168 1144 #undef CAM_VIDEO_CONTROL 1169 #define DNG_SUPPORT 11170 1145 // pattern 1171 1146 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 1205 1180 //#define CAM_CONSOLE_LOG_ENABLED 1 1206 1181 #undef CAM_VIDEO_CONTROL 1182 #undef DNG_SUPPORT 1207 1183 //---------------------------------------------------------- 1208 1184 … … 1222 1198 #undef CAM_HAS_IS 1223 1199 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2 1224 #define DNG_SUPPORT 11225 1200 // pattern 1226 1201 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 1264 1239 #undef CAM_CHDK_HAS_EXT_VIDEO_MENU 1265 1240 #undef CAM_HAS_IS 1266 #define DNG_SUPPORT 11267 1241 // pattern 1268 1242 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 1305 1279 #undef CAM_HAS_IS 1306 1280 #undef CAM_CHDK_HAS_EXT_VIDEO_MENU 1307 #define DNG_SUPPORT 11308 1281 // pattern 1309 1282 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 1365 1338 1366 1339 // #define CAM_CONSOLE_LOG_ENABLED 1 // Development: internal camera stdout -> A/stdout.txt 1367 #define DNG_SUPPORT 11368 1340 // pattern 1369 1341 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 1403 1375 #undef CAM_HAS_IS 1404 1376 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 1405 #define DNG_SUPPORT 11406 1377 #define CAM_MULTIPART 1 1407 1378 // pattern … … 1448 1419 #undef CAM_CAN_MUTE_MICROPHONE 1449 1420 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 0 1450 #define DNG_SUPPORT 11451 1421 // pattern 1452 1422 #define cam_CFAPattern 0x01000201 // Green Blue Red Green … … 1490 1460 #define CAM_MULTIPART 1 1491 1461 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 1492 #define DNG_SUPPORT 11493 1462 // pattern 1494 1463 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 1530 1499 #define CAM_MULTIPART 1 1531 1500 #undef CAM_SYNCH 1532 #define DNG_SUPPORT 11533 1501 // pattern 1534 1502 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 1566 1534 #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 1567 1535 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2 1568 #define DNG_SUPPORT 11569 1536 1570 1537 // Warning! DNG4PS2 has both ixus800 and sd700 support with different CFA patterns and color matrices. … … 1607 1574 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 1608 1575 #define CAM_MULTIPART 1 1609 #define DNG_SUPPORT 11610 1576 // pattern 1611 1577 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 1651 1617 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 1652 1618 #define CAM_MULTIPART 1 1653 #define DNG_SUPPORT 11654 1619 1655 1620 // pattern … … 1701 1666 #undef CAM_CAN_MUTE_MICROPHONE 1702 1667 #undef CAM_VIDEO_CONTROL 1703 #define DNG_SUPPORT 11704 1668 // pattern 1705 1669 #define cam_CFAPattern 0x01000201 // Green Blue Red Green … … 1788 1752 #undef DEFAULT_RAW_EXT 1789 1753 #define DEFAULT_RAW_EXT 2 // use .CR2 1790 #define DNG_SUPPORT 11791 1754 1792 1755 #undef CAM_ADJUSTABLE_ALT_BUTTON … … 1814 1777 #define CAM_MULTIPART 1 1815 1778 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 1816 #define DNG_SUPPORT 11817 1779 // pattern 1818 1780 #define cam_CFAPattern 0x01000201 // Green Blue Red Green … … 1850 1812 #undef CAM_HAS_USER_TV_MODES 1851 1813 #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 1852 #define DNG_SUPPORT 11853 1814 // pattern 1854 1815 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 1889 1850 #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 1 1890 1851 #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 1891 #define DNG_SUPPORT 11892 1852 #define CAM_EXT_TV_RANGE 1 1893 1853 … … 1955 1915 #define CAM_WHITE_LEVEL ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1) 1956 1916 1957 #define DNG_SUPPORT 11958 1917 // pattern 1959 1918 #define cam_CFAPattern 0x01000201 // Green Blue Red Green … … 2048 2007 #undef CAM_VIDEO_CONTROL 2049 2008 #define CAM_VIDEO_QUALITY_ONLY 1 2050 #define DNG_SUPPORT 12051 2009 2052 2010 #define CAM_EXT_TV_RANGE 1 … … 2156 2114 #define CAM_EXT_TV_RANGE 1 // CHDK can make exposure time longer than 64s 2157 2115 2158 #define DNG_SUPPORT 12159 2116 // pattern 2160 2117 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 2205 2162 #define CAM_EXT_TV_RANGE 1 // CHDK can make exposure time longer than 64s 2206 2163 2207 #define DNG_SUPPORT 12208 2164 // pattern 2209 2165 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 2263 2219 #undef CAM_VIDEO_CONTROL 2264 2220 #define CAM_VIDEO_QUALITY_ONLY 1 2265 #define DNG_SUPPORT 12266 2221 2267 2222 //#define CAM_EXT_TV_RANGE 1 … … 2360 2315 #define CAM_HAS_VIDEO_BUTTON 1 2361 2316 #undef CAM_VIDEO_CONTROL 2362 #define DNG_SUPPORT 12363 2317 // pattern 2364 2318 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 2396 2350 #undef CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 2397 2351 #define CAM_HAS_VIDEO_BUTTON 1 2398 #define DNG_SUPPORT 12399 2352 // pattern 2400 2353 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 2434 2387 #define CAM_HAS_VIDEO_BUTTON 1 2435 2388 #define CAM_EXT_TV_RANGE 1 2436 #define DNG_SUPPORT 12437 2389 // pattern 2438 2390 #define cam_CFAPattern 0x01000201 // Green Blue Red Green … … 2475 2427 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 2476 2428 #define CAM_HAS_VIDEO_BUTTON 1 2477 #define DNG_SUPPORT 12478 2429 // pattern 2479 2430 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 2513 2464 #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 2514 2465 #undef CAM_VIDEO_CONTROL 2515 #define DNG_SUPPORT 12516 2466 #define CAM_REAR_CURTAIN 1 2517 2467 #define CAM_HAS_JOGDIAL 1 … … 2560 2510 #define CAM_UNCACHED_BIT 0x40000000 2561 2511 2562 #define DNG_SUPPORT 12563 2512 // pattern 2564 2513 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 2611 2560 #define CAM_UNCACHED_BIT 0x40000000 2612 2561 2613 #define DNG_SUPPORT 12614 2562 // pattern 2615 2563 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 2680 2628 #undef CAM_BLACK_LEVEL 2681 2629 #define CAM_BLACK_LEVEL 128 2682 #define DNG_SUPPORT 12683 2630 #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 2684 2631 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 2710 2657 #undef CAM_UNCACHED_BIT // shut up compiler 2711 2658 #define CAM_UNCACHED_BIT 0x40000000 2712 #define DNG_SUPPORT 12713 2659 // pattern 2714 2660 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 2864 2810 2865 2811 /**** From SX200IS, ok for G11 ?*/ 2866 #define DNG_SUPPORT 12867 2812 // pattern 2868 2813 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 2957 2902 2958 2903 /**** From SX200IS, ok for S90 ?*/ 2959 #define DNG_SUPPORT 12960 2904 // pattern 2961 2905 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 3002 2946 #define CAM_UNCACHED_BIT 0x40000000 3003 2947 3004 #define DNG_SUPPORT 13005 2948 // pattern 3006 2949 #define cam_CFAPattern 0x02010100 // Red Green Green Blue … … 3101 3044 #define CAM_UNCACHED_BIT 0x40000000 3102 3045 3103 #define DNG_SUPPORT 13104 3046 // pattern 3105 3047 #define cam_CFAPattern 0x01000201 // Green Blue Red Green … … 3247 3189 #define EDGE_HMARGIN 2 3248 3190 3249 #define DNG_SUPPORT 13250 3191 // pattern 3251 3192 #define cam_CFAPattern 0x02010100 // Red Green Green Blue
Note: See TracChangeset
for help on using the changeset viewer.
