source: trunk/platform/a700/shooting.c @ 855

Revision 855, 4.9 KB checked in by reyalp, 3 years ago (diff)
  • attempt to fix broken mode maps in a630, a640, ixus65_sd630. Untested, but definitely closer than what was there before. checked against canon mode list and known correct cameras.
  • tweak some others: remove some invalid modes from a700, try to guess better values, add guessed MODE_MYCOLORS to ixus60_sd600, comments on g7, a540
  • Property svn:eol-style set to native
Line 
1#define PARAM_FILE_COUNTER      0x34
2
3#include "platform.h"
4
5const ApertureSize aperture_sizes_table[] = {
6    {  9, 283, "2.8" },
7    { 10, 320, "3.2" },
8    { 11, 352, "3.5" },
9    { 12, 384, "4.0" },
10    { 13, 416, "4.5" },
11    { 14, 448, "5.0" },
12    { 15, 480, "5.6" },
13    { 16, 512, "6.3" },
14    { 17, 544, "7.1" },
15    { 18, 576, "8.0" },
16};
17
18const ShutterSpeed shutter_speeds_table[] = {
19    { -12, -384, "15", 15000000 },
20    { -11, -352, "13", 13000000 },
21    { -10, -320, "10", 10000000 },
22    {  -9, -288, "8",   8000000 },
23    {  -8, -256, "6",   6000000 },
24    {  -7, -224, "5",   5000000 },
25    {  -6, -192, "4",   4000000 },
26    {  -5, -160, "3.2", 3200000 },
27    {  -4, -128, "2.5", 2500000 },
28    {  -3,  -96, "2",   2000000 },
29    {  -2,  -64, "1.6", 1600000 },
30    {  -1,  -32, "1.3", 1300000 },
31    {   0,    0, "1",   1000000 },
32    {   1,   32, "0.8",  800000 },
33    {   2,   64, "0.6",  600000 },
34    {   3,   96, "0.5",  500000 },
35    {   4,  128, "0.4",  400000 },
36    {   5,  160, "0.3",  300000 },
37    {   6,  192, "1/4",  250000 },
38    {   7,  224, "1/5",  200000 },
39    {   8,  256, "1/6",  166667 },
40    {   9,  288, "1/8",  125000 },
41    {  10,  320, "1/10", 100000 },
42    {  11,  352, "1/13",  76923 },
43    {  12,  384, "1/15",  66667 },
44    {  13,  416, "1/20",  50000 },
45    {  14,  448, "1/25",  40000 },
46    {  15,  480, "1/30",  33333 },
47    {  16,  512, "1/40",  25000 },
48    {  17,  544, "1/50",  20000 },
49    {  18,  576, "1/60",  16667 },
50    {  19,  608, "1/80",  12500 },
51    {  20,  640, "1/100", 10000 },
52    {  21,  672, "1/125",  8000 },
53    {  22,  704, "1/160",  6250 },
54    {  23,  736, "1/200",  5000 },
55    {  24,  768, "1/250",  4000 },
56    {  25,  800, "1/320",  3125 },
57    {  26,  832, "1/400",  2500 },
58    {  27,  864, "1/500",  2000 },
59    {  28,  896, "1/640",  1563 },
60    {  29,  928, "1/800",  1250 },
61    {  30,  960, "1/1000", 1000 },
62    {  31,  992, "1/1250",  800 },
63    {  32, 1021, "1/1600",  625 },
64    {  33, 1053, "1/2000",  500 },
65};
66
67const ISOTable iso_table[] = {
68    { -1,    1,   "HI", -1},
69    {  0,    0, "Auto", -1},
70    {  1,   80,   "80", -1},
71    {  2,  100,  "100", -1},
72    {  3,  200,  "200", -1},
73    {  4,  400,  "400", -1},
74    {  5,  800,  "800", -1},
75};         
76
77/*
78canon list @FFD5912C in 100b
79from http://www.usa.canon.com/consumer/controller?act=ModelInfoAct&tabact=ModelTechSpecsTabAct&fcategoryid=221&modelid=12944
80Shooting Modes
81    Auto; Creative: P, Av, Tv, M; Image: Portrait, Landscape, Night Scene, Special Scene (Foliage, Snow, Beach, Fireworks, Indoor, Kids & Pets, Night Snapshot, Color Accent, Color Swap), My Colors, Stitch Assist, Movie
82
83Video resolutions
84640 x 480 / 320 x 240 (30 fps/15 fps) available up to 1GB or 1 hour for each file size,
85320 x 240 (1 min. at 60 fps), 160 x 120 (3 min. at 15 fps)
86*/
87static const CapturemodeMap modemap[] = {
88    // common modes, probably OK
89    { MODE_AUTO,               32768 },
90    { MODE_P,                  32772 },
91    { MODE_TV,                 32771 },
92    { MODE_AV,                 32770 },
93    { MODE_M,                  32769 },
94    { MODE_PORTRAIT,           32781 },
95    { MODE_NIGHT,              32782 },
96    { MODE_LANDSCAPE,          32780 },
97    { MODE_STITCH,             33290 },
98//    { MODE_VIDEO_STD,          2596  }, // NOT in canon list!
99//    { MODE_VIDEO_SPEED,        2597  }, ""
100//    { MODE_VIDEO_COMPACT,      2598  }, ""
101//    { ???,    2595  }, was MODE_VIDEO_MY_COLORS
102//    { ???, 2594  }, was MODE_VIDEO_COLOR_ACCENT
103//    { ???, 2591  }, in canon list, not original map
104//    { ???, 2592  }, in canon list, not original map
105//    { ???, 2593  }, in canon list, not original map
106// the video mode numbers in the canon list and video modes in canon description match a540, so I'm using those values. NOT VERIFIED!
107    { MODE_VIDEO_STD,          2593  },
108    { MODE_VIDEO_SPEED,        2594  },
109    { MODE_VIDEO_COMPACT,      2595  },
110    { MODE_VIDEO_COLOR_ACCENT, 2591  },
111    { MODE_VIDEO_COLOR_SWAP,   2592  },
112//    { MODE_MY_COLORS,          16922 }, // NOT in canon list!
113//    { MODE_SCN_WATER,          16405 }, // NOT in canon list!
114    { MODE_SCN_NIGHT,          16395 },
115    { MODE_SCN_CHILD,          16399 },
116    { MODE_SCN_PARTY,          16400 },
117    { MODE_SCN_GRASS,          16401 },
118    { MODE_SCN_SNOW,           16402 },
119    { MODE_SCN_BEACH,          16403 },
120    { MODE_SCN_FIREWORK,       16404 },
121//    { ???,   16921 } ??? was MODE_SCN_COLOR_ACCENT
122//    { ???,   16920 } ???
123// using these from a540, NOT VERIFIED!
124    { MODE_SCN_COLOR_ACCENT,   16920 }, // "color accent"
125    { MODE_SCN_COLOR_SWAP,     16921 }, // "color swap"
126};
127
128#include "../generic/shooting.c"
129
130long get_file_next_counter() {
131    return ((get_file_counter()>>4)+1)<<4;
132}
133
134long get_target_file_num() {
135    long n;
136   
137    n = get_file_next_counter();
138    n = (n>>4)&0x3FFF;
139    return n;
140}
141
142long get_target_dir_num() {
143    long n;
144   
145    n = get_file_next_counter();
146    n = (n>>18)&0x3FF;
147    return n;
148}
149
150int circle_of_confusion = 5;
Note: See TracBrowser for help on using the repository browser.