source: trunk/platform/a630/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, 288, "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    {  34, 1084, "1/2500",  400 },
66};
67
68const ISOTable iso_table[] = {
69    { -1,    1,   "HI", -1},
70    {  0,    0, "Auto", -1},
71    {  1,   80,   "80", -1},
72    {  2,  100,  "100", -1},
73    {  3,  200,  "200", -1},
74    {  4,  400,  "400", -1},
75    {  5,  800,  "800", -1},
76};         
77
78/*
79 valid modes from 100c dump @FFD682D0, names guessed from a540, g7,
80from
81http://www.usa.canon.com/consumer/controller?act=ModelInfoAct&tabact=ModelTechSpecsTabAct&fcategoryid=221&modelid=14108
82Shooting Modes
83    Auto; Creative: P, Av, Tv, M, C; Image: Portrait, Landscape, Night Scene,
84    Special Scene
85        Foliage, Snow, Beach, Fireworks, Underwater, Indoor, Kids & Pets,
86        Night Snapshot, Color Accent, Color Swap,
87    Stitch Assist, Movie
88Video resolutions
89    640 x 480 / 320 x 240 (30 fps/15 fps) available up to 1GB or 1 hour for each file size,
90    160 x 120 (3 min. at 15 fps)
91*/
92static const CapturemodeMap modemap[] = {
93    // above are common on most cameras except very old vxworks that use 0-n, should be OK
94    { MODE_M,                  32769 },
95    { MODE_AV,                 32770 },
96    { MODE_TV,                 32771 },
97    { MODE_P,                  32772 },
98    { MODE_AUTO,               32768 },
99    { MODE_PORTRAIT,           32781 },
100    { MODE_LANDSCAPE,          32780 },
101    { MODE_STITCH,             33290 },
102    { MODE_NIGHT,              32782 }, // s3is a540 "night scene" on dial, different from "night snapshot" under "scene" below
103    // the following are suspect, but probably fairly similar scene modes
104    { MODE_SCN_NIGHT,          16395 }, // a540 "night snapshot" g7 SCN_NIGHT
105    { MODE_SCN_KIDS_PETS,      16399 }, // a540 "kids and pets" g7 SCN_CHILD
106    { MODE_SCN_INDOOR,         16400 }, // a540 "indoor" g7 SCN_PARTY
107    { MODE_SCN_FOLIAGE,        16401 }, // a540 "foliage" g7 SCN_GRASS
108    { MODE_SCN_SNOW,           16402 }, // a540, g7 "snow"
109    { MODE_SCN_BEACH,          16403 }, // a540, g7 "beach"
110    { MODE_SCN_FIREWORK,       16404 }, // a540, g7 "fireworks"
111    { MODE_SCN_UNDERWATER,     16405 }, // a540 "under water"
112    // the following are very suspect
113    { MODE_MY_COLORS,          16922 }, // g7 MODE_MY_COLORS
114    { MODE_SCN_COLOR_ACCENT,   16921 }, // a540 MODE_SCN_COLOR_SWAP, g7 MODE_SCN_COLOR_ACCENT
115    { MODE_VIDEO_COLOR_ACCENT,  2594 }, // a540 MODE_VIDEO_SPEED, g7 MODE_VIDEO_COLOR_ACCENT
116    { MODE_VIDEO_MY_COLORS,     2595 }, // a540 MODE_VIDEO_COMPACT, g7 MODE_VIDEO_MY_COLORS
117    { MODE_VIDEO_STD,           2596 }, // g7 MODE_VIDEO_STD
118    { MODE_VIDEO_COMPACT,       2598 }, // g7 MODE_VIDEO_COMPACT
119//    { ???,      8221  }, // in canon list, C maybe ?
120};
121
122#include "../generic/shooting.c"
123
124long get_file_next_counter() {
125    return get_file_counter();
126}
127
128long get_target_file_num() {
129    long n;
130   
131    n = get_file_next_counter();
132    n = (n>>4)&0x3FFF;
133    return n;
134}
135
136long get_target_dir_num() {
137    long n;
138   
139    n = get_file_next_counter();
140    n = (n>>18)&0x3FF;
141    return n;
142}
143
144int circle_of_confusion = 6;
Note: See TracBrowser for help on using the repository browser.