Changeset 433

Timestamp:

07/06/08 00:14:11 (1 year ago)

Author:

EWAVR

Message:

Corrected behavior of optical+digital zoom during movie recording

Files:

• trunk/core/gui.c (modified) (2 diffs)
• trunk/include/platform.h (modified) (5 diffs)
• trunk/platform/a450/sub/100d/stubs_min.S (modified) (1 diff)
• trunk/platform/a460/sub/100d/stubs_min.S (modified) (1 diff)
• trunk/platform/a530/sub/100a/stubs_min.S (modified) (1 diff)
• trunk/platform/a540/sub/100b/stubs_min.S (modified) (1 diff)
• trunk/platform/a550/sub/100c/stubs_min.S (modified) (1 diff)
• trunk/platform/a560/sub/100a/stubs_min.S (modified) (1 diff)
• trunk/platform/a570/sub/100e/stubs_min.S (modified) (1 diff)
• trunk/platform/a570/sub/101a/stubs_min.S (modified) (1 diff)
• trunk/platform/a610/sub/100e/stubs_min.S (modified) (1 diff)
• trunk/platform/a610/sub/100f/stubs_min.S (modified) (1 diff)
• trunk/platform/a620/sub/100f/stubs_min.S (modified) (1 diff)
• trunk/platform/a630/sub/100c/stubs_min.S (modified) (1 diff)
• trunk/platform/a640/sub/100b/stubs_min.S (modified) (1 diff)
• trunk/platform/a650/sub/100d/stubs_min.S (modified) (1 diff)
• trunk/platform/a700/sub/100b/stubs_min.S (modified) (1 diff)
• trunk/platform/a710/sub/100a/stubs_min.S (modified) (1 diff)
• trunk/platform/a720/sub/100c/stubs_min.S (modified) (1 diff)
• trunk/platform/g7/sub/100e/stubs_min.S (modified) (1 diff)
• trunk/platform/g7/sub/100g/stubs_min.S (modified) (1 diff)
• trunk/platform/g7/sub/100i/stubs_min.S (modified) (1 diff)
• trunk/platform/g7/sub/100j/stubs_min.S (modified) (1 diff)
• trunk/platform/generic/wrappers.c (modified) (2 diffs)
• trunk/platform/ixus50_sd400/sub/101a/stubs_entry_2.S (modified) (1 diff)
• trunk/platform/ixus50_sd400/sub/101a/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus50_sd400/sub/101b/stubs_entry_2.S (modified) (1 diff)
• trunk/platform/ixus50_sd400/sub/101b/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus55_sd450/sub/100b/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus55_sd450/sub/100c/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus55_sd450/sub/100d/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus700_sd500/sub/101a/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus700_sd500/sub/101b/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus70_sd1000/sub/100c/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus70_sd1000/sub/101b/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus70_sd1000/sub/102a/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus800_sd700/sub/100b/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus800_sd700/sub/101b/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus850_sd800/sub/100e/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus860_sd870/sub/100c/stubs_min.S (modified) (1 diff)
• trunk/platform/ixus950_sd850/sub/100c/stubs_min.S (modified) (1 diff)

trunk/core/gui.c

@@ -1768 +1768 @@
-
-void other_kbd_process(){
+ int key;
-#if CAM_AF_SCAN_DURING_VIDEO_RECORD
-  
@@ -1775 +1776 @@
-
-#endif
+
+#if CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
+
+#if CAM_HAS_ZOOM_LEVER
+   key=KEY_ZOOM_OUT;
+#else
+   key=KEY_DOWN;
+#endif
+    if ((movie_status==VIDEO_RECORD_IN_PROGRESS) &&  kbd_is_key_clicked(key)){
+     short x;
+     get_property_case(PROPCASE_DIGITAL_ZOOM_STATE, &x, sizeof(x));
+     if (x) {
+      get_property_case(PROPCASE_DIGITAL_ZOOM_POSITION, &x, sizeof(x));
+      if (x==0) zoom_status=ZOOM_OPTICAL_MEDIUM;
+     }
+    }
+#endif
+
-}
-

trunk/include/platform.h

@@ -66 +66 @@
-};
-
-
+     // most digic3 cameras
- #define PROPCASE_DRIVE_MODE                                    102
- #define PROPCASE_FOCUS_MODE                                    133
@@ -87 +87 @@
- #define PROPCASE_SHOOTING_MODE                                 49
- #define PROPCASE_IS_MODE                                           145
-
+
+
+
- #define PROPCASE_DRIVE_MODE                                    6
- #define PROPCASE_FOCUS_MODE                                    12
@@ -108 +110 @@
- #define PROPCASE_SHOOTING_MODE                                 0
- #define PROPCASE_IS_MODE                                       229
+ #define PROPCASE_DIGITAL_ZOOM_STATE                            58
+ #define PROPCASE_DIGITAL_ZOOM_POSITION                         57
-#else
- #error unknown camera processor
@@ -131 +135 @@
-#define KBD_INITIAL_DELAY 300
-
-e
+us
-#define VIDEO_RECORD_NEVER_STARTED 0 
-#define VIDEO_RECORD_STOPPED 1 
-#define VIDEO_RECORD_IN_PROGRESS 4
+
+//Optical & digital zoom status constants, see zoom_status variable 
+#define ZOOM_OPTICAL_MIN         1
+#define ZOOM_OPTICAL_MAX         2
+#define ZOOM_OPTICAL_MEDIUM      3
+#define ZOOM_OPTICAL_IN          4
+#define ZOOM_OPTICAL_OUT         5
+#define ZOOM_OPTICAL_REACHED_MIN 7
+
+#define ZOOM_DIGITAL_MAX         9
+#define ZOOM_DIGITAL_MEDIUM      10
+#define ZOOM_DIGITAL_IN          11
+#define ZOOM_DIGITAL_OUT         12
+#define ZOOM_DIGITAL_REACHED_MAX 13
-
-typedef struct {
@@ -452 +470 @@
-void MakeAFScan(void);
-extern int movie_status;
+extern int zoom_status;
-
-#define started() debug_led(1)

trunk/platform/a450/sub/100d/stubs_min.S

@@ -12 +12 @@
-DEF(movie_status, 0x91D54)  
-DEF(some_flag_for_af_scan, 0xCF88)
+DEF(zoom_status, 0x2658)

trunk/platform/a460/sub/100d/stubs_min.S

@@ -12 +12 @@
-DEF(movie_status, 0x91D54)  
-DEF(some_flag_for_af_scan, 0xCF88)
+DEF(zoom_status, 0x2658)

trunk/platform/a530/sub/100a/stubs_min.S

@@ -13 +13 @@
-DEF(some_flag_for_af_scan, 0x64D40)
-DEF(parameter_for_af_scan, 0x64D38)
+DEF(zoom_status, 0x7374)

trunk/platform/a540/sub/100b/stubs_min.S

@@ -21 +21 @@
-DEF(some_flag_for_af_scan, 0x64DD0)
-DEF(parameter_for_af_scan, 0x64DC8)
+DEF(zoom_status, 0x733C)

trunk/platform/a550/sub/100c/stubs_min.S

@@ -12 +12 @@
-DEF(movie_status, 0x9BAFC)  
-DEF(some_flag_for_af_scan, 0xB92C)
+DEF(zoom_status, 0x2650)
+

trunk/platform/a560/sub/100a/stubs_min.S

@@ -13 +13 @@
-DEF(movie_status, 0xA2780)  
-DEF(some_flag_for_af_scan, 0xBFA8)
+DEF(zoom_status, 0x2660)

trunk/platform/a570/sub/100e/stubs_min.S

@@ -14 +14 @@
-DEF(movie_status, 0xA30C8)  
-DEF(some_flag_for_af_scan, 0xC2F8)
+DEF(zoom_status, 0x264C)

trunk/platform/a570/sub/101a/stubs_min.S

@@ -13 +13 @@
-DEF(movie_status, 0xA30C8)  
-DEF(some_flag_for_af_scan, 0xC2F8)
+DEF(zoom_status, 0x264C)

trunk/platform/a610/sub/100e/stubs_min.S

@@ -13 +13 @@
-DEF(some_flag_for_af_scan, 0x73D28)
-DEF(parameter_for_af_scan, 0x73D20)
+DEF(zoom_status, 0x8004)

trunk/platform/a610/sub/100f/stubs_min.S

@@ -12 +12 @@
-DEF(some_flag_for_af_scan, 0x73D28)
-DEF(parameter_for_af_scan, 0x73D20)
+DEF(zoom_status, 0x8004)

trunk/platform/a620/sub/100f/stubs_min.S

@@ -12 +12 @@
-DEF(some_flag_for_af_scan, 0x741B8)
-DEF(parameter_for_af_scan, 0x741B0)
+DEF(zoom_status, 0x807C)

trunk/platform/a630/sub/100c/stubs_min.S

@@ -11 +11 @@
-DEF(movie_status, 0x666CC)
-DEF(some_flag_for_af_scan, 0x621C)
+DEF(zoom_status, 0x75AC)

trunk/platform/a640/sub/100b/stubs_min.S

@@ -11 +11 @@
-DEF(movie_status, 0x66894)
-DEF(some_flag_for_af_scan, 0x6278)
+DEF(zoom_status, 0x761C)

trunk/platform/a650/sub/100d/stubs_min.S

@@ -18 +18 @@
-DEF(movie_status, 0x5550)    // 0x5518 + 0x38
-DEF(some_flag_for_af_scan, 0x11040)
+DEF(zoom_status, 0x11174)

trunk/platform/a700/sub/100b/stubs_min.S

@@ -13 +13 @@
-DEF(some_flag_for_af_scan, 0x6EAB8)
-DEF(parameter_for_af_scan, 0x6EAB0)
+DEF(zoom_status, 0x7318)

trunk/platform/a710/sub/100a/stubs_min.S

@@ -11 +11 @@
-DEF(movie_status, 0x715BC)
-DEF(some_flag_for_af_scan, 0x6230)
+DEF(zoom_status, 0x74F0)

trunk/platform/a720/sub/100c/stubs_min.S

@@ -12 +12 @@
-DEF(movie_status, 0x5570)  // 0x5538 + 0x38
-DEF(some_flag_for_af_scan, 0xD688)
+DEF(zoom_status, 0xD7C4)

trunk/platform/g7/sub/100e/stubs_min.S

@@ -13 +13 @@
-DEF(movie_status, 0x771E8)  
-DEF(some_flag_for_af_scan, 0x6E64)
+DEF(zoom_status, 0x83AC)

trunk/platform/g7/sub/100g/stubs_min.S

@@ -13 +13 @@
-DEF(movie_status, 0x771E8)  
-DEF(some_flag_for_af_scan, 0x6E64)
+DEF(zoom_status, 0x83AC)

trunk/platform/g7/sub/100i/stubs_min.S

@@ -13 +13 @@
-DEF(movie_status, 0x771E8)  
-DEF(some_flag_for_af_scan, 0x6E64)
+DEF(zoom_status, 0x83AC)

trunk/platform/g7/sub/100j/stubs_min.S

@@ -13 +13 @@
-DEF(movie_status, 0x771E8)  
-DEF(some_flag_for_af_scan, 0x6E64)
+DEF(zoom_status, 0x83AC)

trunk/platform/generic/wrappers.c

@@ -295 +295 @@
-    return _localtime(_tod);
-#else
-#warning  A650, A720
+// for DRYOS cameras
-  static int x[9];
-  return _LocalTime(_tod, &x);   
@@ -357 +357 @@
-    return _readdir(d);
-#else
-#warning
+// for DRYOS cameras
-  static char de[40];
-  _ReadFastDir(d, &de);

trunk/platform/ixus50_sd400/sub/101a/stubs_entry_2.S

@@ -35 +35 @@
-NHSTUB(kbd_read_keys_r2, 0xFF8118C0)
-
-E0
+DB
-
-NHSTUB(GetDrive_ClusterSize, 0xFF8743BC)

trunk/platform/ixus50_sd400/sub/101a/stubs_min.S

@@ -11 +11 @@
-DEF(canon_shoot_menu_active,0x68F1) // (0x68F4 - 0x4 + 0x1) found in "taskcreate_DSITask"
-DEF(recreview_hold, 0x73CF0)
+DEF(zoom_status, 0x6804)
+DEF(movie_status, 0x6F95C)

trunk/platform/ixus50_sd400/sub/101b/stubs_entry_2.S

@@ -35 +35 @@
-NHSTUB(kbd_read_keys_r2, 0xFF8118C0)
-
-E54
+D1C
-
-NHSTUB(GetDrive_ClusterSize, 0xFF8743BC) // OK!

trunk/platform/ixus50_sd400/sub/101b/stubs_min.S

@@ -11 +11 @@
-DEF(canon_shoot_menu_active,0x68F1) // (0x68F4 - 0x4 + 0x1) found in "taskcreate_DSITask" OK!
-DEF(recreview_hold, 0x73CF0) // OK!
+DEF(zoom_status, 0x6804)
+DEF(movie_status, 0x6F95C)

trunk/platform/ixus55_sd450/sub/100b/stubs_min.S

@@ -21 +21 @@
-DEF(playrec_mode, 0x6FA0) // found at unknown_libname_442 within task_SsStartupTask
-DEF(recreview_hold, 0x86838)
+DEF(zoom_status, 0x7FBC)
+DEF(movie_status, 0x7CDBC)

trunk/platform/ixus55_sd450/sub/100c/stubs_min.S

@@ -21 +21 @@
-DEF(playrec_mode, 0x6FA0) // found at unknown_libname_442 within task_SsStartupTask
-DEF(recreview_hold, 0x86838)
+DEF(zoom_status, 0x7FBC)
+DEF(movie_status, 0x7CDBC)

trunk/platform/ixus55_sd450/sub/100d/stubs_min.S

@@ -21 +21 @@
-DEF(playrec_mode, 0x6FA0) // found at unknown_libname_442 within task_SsStartupTask
-DEF(recreview_hold, 0x86838)
+DEF(zoom_status, 0x7FBC)
+DEF(movie_status, 0x7CDBC)

trunk/platform/ixus700_sd500/sub/101a/stubs_min.S

@@ -11 +11 @@
-DEF(canon_shoot_menu_active,0x65B5)
-DEF(recreview_hold, 0x739F8)
+DEF(zoom_status, 0x64C0)
+DEF(movie_status, 0x6F684)

trunk/platform/ixus700_sd500/sub/101b/stubs_min.S

@@ -10 +10 @@
-DEF(canon_shoot_menu_active,0x65B5)
-DEF(recreview_hold, 0x739F8)
+DEF(zoom_status, 0x64C0)
+DEF(movie_status, 0x6F684)

trunk/platform/ixus70_sd1000/sub/100c/stubs_min.S

@@ -11 +11 @@
-DEF(canon_shoot_menu_active,0x27C9) // (0x27CC - 0x4 + 0x1) found in "taskcreate_DSITask"
-DEF(recreview_hold, 0x25AC) // (0x25B0 - 0x4) found in "AR:Snd:0x%04x"
+DEF(zoom_status, 0x2680)
+DEF(movie_status, 0xBB558)
+

trunk/platform/ixus70_sd1000/sub/101b/stubs_min.S

@@ -11 +11 @@
-DEF(canon_shoot_menu_active,0x27C9) // (0x27CC - 0x4 + 0x1) found in "taskcreate_DSITask"
-DEF(recreview_hold, 0x25AC) // (0x25B0 - 0x4) found in "AR:Snd:0x%04x"
+DEF(zoom_status, 0x2680)
+DEF(movie_status, 0xBB558)

trunk/platform/ixus70_sd1000/sub/102a/stubs_min.S

@@ -11 +11 @@
-DEF(canon_shoot_menu_active,0x27C9) // (0x27CC - 0x4 + 0x1) found in "taskcreate_DSITask"
-DEF(recreview_hold, 0x25AC) // (0x25B0 - 0x4) found in "AR:Snd:0x%04x"
+DEF(zoom_status, 0x2680)
+DEF(movie_status, 0xBB558)

trunk/platform/ixus800_sd700/sub/100b/stubs_min.S

@@ -11 +11 @@
-DEF(canon_shoot_menu_active,0x7539)
-DEF(recreview_hold, 0x76D78)
+DEF(zoom_status, 0x73DC)
+DEF(movie_status, 0x6ECA4)

trunk/platform/ixus800_sd700/sub/101b/stubs_min.S

@@ -11 +11 @@
-DEF(canon_shoot_menu_active,0x7539)
-DEF(recreview_hold, 0x76D78)
+DEF(zoom_status, 0x73DC)
+DEF(movie_status, 0x6ECA4)

trunk/platform/ixus850_sd800/sub/100e/stubs_min.S

@@ -220 +220 @@
-
-DEF(recreview_hold, 0x7CF0) // (0x7CF4 - 0x4) found in "AR:Snd:0x%04x", LDR R3, =0x7CF4;
+
+DEF(zoom_status, 0x7DB0)
+DEF(movie_status, 0x8BC00)

trunk/platform/ixus860_sd870/sub/100c/stubs_min.S

@@ -16 +16 @@
-DEF(canon_shoot_menu_active,0xB65D)   // 0xB65C+1
-DEF(recreview_hold, 0xB474) // 0xB3C8+0xAC
+DEF(zoom_status, 0xE560)
+DEF(movie_status, 0x551C)  // 0x54E0 + 0x3C

trunk/platform/ixus950_sd850/sub/100c/stubs_min.S

@@ -17 +17 @@
-DEF(recreview_hold, 0x25E0)             // after "AR:Snd:0x%04x", LDR R3, =0x25E4; then
-                                        // 0x25E4-4=0x25E0 (quietschi's prescription, SD1000)
+
+DEF(zoom_status, 0x26B4)
+DEF(movie_status, 0xA8640)