Changeset 1590
- Timestamp:
- 01/21/12 07:19:15 (16 months ago)
- Location:
- trunk
- Files:
-
- 5 edited
-
. (modified) (1 prop)
-
include/modelist.h (modified) (1 diff)
-
platform/ixus1000_sd4500/shooting.c (modified) (1 diff)
-
platform/ixus1000_sd4500/sub/100d/stubs_entry.S (modified) (1 diff)
-
platform/ixus1000_sd4500/sub/100f/stubs_entry.S (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/release-1_0 merged: 1589
- Property svn:mergeinfo changed
-
trunk/include/modelist.h
r1338 r1590 115 115 MODE_SCN_FACE_SELF_TIMER, // sx30/g12 (Smart Shutter, Face Self Timer mode) 116 116 MODE_VIDEO_SUPER_SLOW , // IXUS 310 HS Super Slow Motion Movie 117 MODE_SMART_SHUTTER , // ixus1000_sd4500 - the following are not under SCN 118 MODE_HIGHSPEED_BURST , 119 MODE_BEST_IMAGE , 120 MODE_SUPER_VIVID , 121 MODE_POSTER_EFFECT , 122 MODE_FISHEYE , 123 MODE_MINIATURE , 124 MODE_BEACH , 125 MODE_FOLIAGE , 126 MODE_SNOW , 127 MODE_FIREWORK , // ixus1000 end 117 128 }; 118 129 -
trunk/platform/ixus1000_sd4500/shooting.c
r1584 r1590 93 93 }; 94 94 95 // TODO this needs to be updated for ixus100096 95 /* 97 http://www.usa.canon.com/cusa/ support/consumer/digital_cameras/other_powershot/powershot_sx210_is#Specifications96 http://www.usa.canon.com/cusa/consumer/products/cameras/digital_cameras/powershot_sd4500_is#Specifications 98 97 Shooting Modes 99 Auto, P, Av, Tv, M, Portrait, Landscape, 100 Special Scene 101 (Smart Shutter (Smile, Wink Self-timer, Face Detection Self-timer), Low Light, Color Accent, Color Swap, Fisheye Effect, Miniature Effect, Beach, Foliage, Snow, Fireworks, Stitch Assist), 102 Super Macro, Indoor, Kids & Pets, Night Snapshot, Movie 103 Movie: High Definition: 1280 x 720 (30 fps); 104 Standard Definition: 640 x 480 (30 fps), 320 x 240 (30 fps) 105 106 canon mode list FFB6D0A4 in 100c 98 Auto, P, Portrait, Kids&Pets, Smart Shutter, High-speed Burst, Best Image Selection, Handheld Night Scene, Low Light, Super Vivid, Poster Effect, Color Accent, Color Swap, Fish-eye Effect, Miniature Effect, Beach, Foliage, Snow, Fireworks, Long Shutter, Stitch Assist, Movie 99 107 100 */ 108 101 static const CapturemodeMap modemap[] = { 109 { MODE_AUTO, 32768 }, 110 { MODE_P, 32772 }, 111 { MODE_TV, 32771 }, 112 { MODE_AV, 32770 }, 113 { MODE_M, 32769 }, 114 { MODE_EASY, 33314 }, // Changed in SX210 115 { MODE_PORTRAIT, 32783 }, // Changed in SX210 116 { MODE_NIGHT_SNAPSHOT, 32781 }, // Changed in SX210 117 { MODE_LANDSCAPE, 32782 }, // Changed in SX210 118 { MODE_VIDEO_COLOR_ACCENT, 2610 }, //?? 119 { MODE_VIDEO_COLOR_SWAP, 2611 }, //?? 120 { MODE_VIDEO_STD, 2612 },// Changed in SX210 121 { MODE_KIDS_PETS, 32786 },// Changed in SX210 122 { MODE_INDOOR, 32787 },// Changed in SX210 123 124 125 // { MODE_SCN_MINIATURE_EFFECT, 16940 }, //New in sx210 ??? 126 // { MODE_SCN_FISH_EYE, 16939 }, //New in sx210 ??? 127 // { MODE_SCN_LOW_LIGHT, 16417 }, //New in sx210 ??? 128 // { MODE_SCN_SMART_SHUTTER, 33321 }, //New in sx210 ??? 129 // { MODE_SCN_SUNSET, 16402 }, //?? 130 // { MODE_SCN_NIGHT_SCENE, 16398 }, //?? 131 { MODE_SCN_FIREWORK, 16408 },// Changed in SX210 132 { MODE_SCN_BEACH, 16407 },// Changed in SX210 133 { MODE_SCN_AQUARIUM, 16939 },// ??? Is it fisheye? 134 { MODE_SCN_FOLIAGE, 16405 },// Changed in SX210 135 { MODE_SCN_SNOW, 16406 },// Changed in SX210 136 { MODE_SCN_ISO_3200, 16417 }, //?? Is it lowlight 137 { MODE_SCN_COLOR_ACCENT, 16925 }, // Changed in SX210? 138 { MODE_SCN_COLOR_SWAP, 16926 }, // Changed in SX210 139 { MODE_SCN_STITCH, 16908 } // Changed in SX210 102 { MODE_AUTO, 32768 }, 103 { MODE_P, 32772 }, 104 { MODE_PORTRAIT, 32783 }, 105 { MODE_KIDS_PETS, 32786 }, 106 { MODE_SMART_SHUTTER, 33321 }, 107 { MODE_HIGHSPEED_BURST, 33288 }, 108 { MODE_BEST_IMAGE, 33289 }, 109 { MODE_NIGHT_SCENE, 33325 }, // NOTE handheld night scene 110 { MODE_LOWLIGHT, 32801 }, 111 { MODE_SUPER_VIVID, 33318 }, 112 { MODE_POSTER_EFFECT, 33319 }, 113 { MODE_COLOR_ACCENT, 33309 }, 114 { MODE_COLOR_SWAP, 33310 }, 115 { MODE_FISHEYE, 33323 }, 116 { MODE_MINIATURE, 33324 }, 117 { MODE_BEACH, 32791 }, 118 { MODE_FOLIAGE, 32789 }, 119 { MODE_SNOW, 32790 }, 120 { MODE_FIREWORK, 32792 }, 121 { MODE_LONG_SHUTTER, 32774 }, 122 { MODE_STITCH, 33292 }, 123 { MODE_VIDEO_STD, 2614 }, 124 { MODE_VIDEO_SUPER_SLOW, 2619 }, 125 { MODE_VIDEO_MINIATURE, 2620 }, 126 { MODE_VIDEO_COLOR_ACCENT, 2612 }, 127 { MODE_VIDEO_COLOR_SWAP, 2613 }, 140 128 }; 141 129 -
trunk/platform/ixus1000_sd4500/sub/100d/stubs_entry.S
r1448 r1590 20 20 // Check of modemap from 'platform/CAMERA/shooting.c': 21 21 // Firmware modemap table found @ff8a0328 -> ff89cab4 -> ff9b0c74 -> ffaf48dc -> ffc28d28 22 // Mode 32774 in firmware but not in current modemap23 // Mode 33292 in firmware but not in current modemap24 // Mode 33324 in firmware but not in current modemap25 // Mode 33323 in firmware but not in current modemap26 // Mode 33309 in firmware but not in current modemap27 // Mode 33310 in firmware but not in current modemap28 // Mode 33325 in firmware but not in current modemap29 // Mode 32801 in firmware but not in current modemap30 // Mode 33288 in firmware but not in current modemap31 // Mode 33289 in firmware but not in current modemap32 // Mode 32789 in firmware but not in current modemap33 22 // Mode 33320 in firmware but not in current modemap 34 23 // Mode 33322 in firmware but not in current modemap 35 // Mode 33321 in firmware but not in current modemap36 // Mode 33318 in firmware but not in current modemap37 // Mode 33319 in firmware but not in current modemap38 // Mode 32790 in firmware but not in current modemap39 // Mode 32791 in firmware but not in current modemap40 // Mode 32792 in firmware but not in current modemap41 // Mode 2613 in firmware but not in current modemap42 // Mode 2619 in firmware but not in current modemap43 // Mode 2620 in firmware but not in current modemap44 // Mode 2614 in firmware but not in current modemap45 // Current modemap entry not found in firmware - MODE_SCN_STITCH 1690846 // Current modemap entry not found in firmware - MODE_SCN_COLOR_SWAP 1692647 // Current modemap entry not found in firmware - MODE_SCN_COLOR_ACCENT 1692548 // Current modemap entry not found in firmware - MODE_SCN_ISO_3200 1641749 // Current modemap entry not found in firmware - MODE_SCN_SNOW 1640650 // Current modemap entry not found in firmware - MODE_SCN_FOLIAGE 1640551 // Current modemap entry not found in firmware - MODE_SCN_AQUARIUM 1693952 // Current modemap entry not found in firmware - MODE_SCN_BEACH 1640753 // Current modemap entry not found in firmware - MODE_SCN_FIREWORK 1640854 // Current modemap entry not found in firmware - MODE_INDOOR 3278755 // Current modemap entry not found in firmware - MODE_VIDEO_COLOR_SWAP 261156 // Current modemap entry not found in firmware - MODE_VIDEO_COLOR_ACCENT 261057 // Current modemap entry not found in firmware - MODE_LANDSCAPE 3278258 // Current modemap entry not found in firmware - MODE_NIGHT_SNAPSHOT 3278159 // Current modemap entry not found in firmware - MODE_EASY 3331460 // Current modemap entry not found in firmware - MODE_M 3276961 // Current modemap entry not found in firmware - MODE_AV 3277062 // Current modemap entry not found in firmware - MODE_TV 3277163 24 64 25 // Values below can be overridden in 'stubs_min.S': -
trunk/platform/ixus1000_sd4500/sub/100f/stubs_entry.S
r1448 r1590 20 20 // Check of modemap from 'platform/CAMERA/shooting.c': 21 21 // Firmware modemap table found @ff8a0328 -> ff89cab4 -> ff9b0c78 -> ffaf48e0 -> ffc28d2c 22 // Mode 32774 in firmware but not in current modemap23 // Mode 33292 in firmware but not in current modemap24 // Mode 33324 in firmware but not in current modemap25 // Mode 33323 in firmware but not in current modemap26 // Mode 33309 in firmware but not in current modemap27 // Mode 33310 in firmware but not in current modemap28 // Mode 33325 in firmware but not in current modemap29 // Mode 32801 in firmware but not in current modemap30 // Mode 33288 in firmware but not in current modemap31 // Mode 33289 in firmware but not in current modemap32 // Mode 32789 in firmware but not in current modemap33 22 // Mode 33320 in firmware but not in current modemap 34 23 // Mode 33322 in firmware but not in current modemap 35 // Mode 33321 in firmware but not in current modemap36 // Mode 33318 in firmware but not in current modemap37 // Mode 33319 in firmware but not in current modemap38 // Mode 32790 in firmware but not in current modemap39 // Mode 32791 in firmware but not in current modemap40 // Mode 32792 in firmware but not in current modemap41 // Mode 2613 in firmware but not in current modemap42 // Mode 2619 in firmware but not in current modemap43 // Mode 2620 in firmware but not in current modemap44 // Mode 2614 in firmware but not in current modemap45 // Current modemap entry not found in firmware - MODE_SCN_STITCH 1690846 // Current modemap entry not found in firmware - MODE_SCN_COLOR_SWAP 1692647 // Current modemap entry not found in firmware - MODE_SCN_COLOR_ACCENT 1692548 // Current modemap entry not found in firmware - MODE_SCN_ISO_3200 1641749 // Current modemap entry not found in firmware - MODE_SCN_SNOW 1640650 // Current modemap entry not found in firmware - MODE_SCN_FOLIAGE 1640551 // Current modemap entry not found in firmware - MODE_SCN_AQUARIUM 1693952 // Current modemap entry not found in firmware - MODE_SCN_BEACH 1640753 // Current modemap entry not found in firmware - MODE_SCN_FIREWORK 1640854 // Current modemap entry not found in firmware - MODE_INDOOR 3278755 // Current modemap entry not found in firmware - MODE_VIDEO_COLOR_SWAP 261156 // Current modemap entry not found in firmware - MODE_VIDEO_COLOR_ACCENT 261057 // Current modemap entry not found in firmware - MODE_LANDSCAPE 3278258 // Current modemap entry not found in firmware - MODE_NIGHT_SNAPSHOT 3278159 // Current modemap entry not found in firmware - MODE_EASY 3331460 // Current modemap entry not found in firmware - MODE_M 3276961 // Current modemap entry not found in firmware - MODE_AV 3277062 // Current modemap entry not found in firmware - MODE_TV 3277163 24 64 25 // Values below can be overridden in 'stubs_min.S':
Note: See TracChangeset
for help on using the changeset viewer.
