Changeset 427


Ignore:
Timestamp:
06/29/08 16:27:10 (5 years ago)
Author:
Jucifer
Message:
  • Updated stuff from the two last trunk commits.

+ Modified a few models to detect motion faster. I hope I got them right.

The rest will follow. I hope.

Location:
branches/juciphox
Files:
96 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/juciphox/core/conf.c

    r416 r427  
    307307    CONF_INFO(168, conf.mute_on_zoom,           CONF_DEF_VALUE, i:0, NULL),  
    308308    CONF_INFO(169, conf.bad_pixel_removal,      CONF_DEF_VALUE, i:0, NULL), 
    309     CONF_INFO(170, conf.osd_color_override,     CONF_DEF_VALUE, cl:MAKE_COLOR(COLOR_BG, COLOR_RED), NULL), 
    310     CONF_INFO(171, conf.override_disable,       CONF_DEF_VALUE, i:2, NULL), 
    311     CONF_INFO(172, conf.override_disable_all,   CONF_DEF_VALUE, i:1, NULL), 
    312     CONF_INFO(173, conf.hide_osd_in_playback,   CONF_DEF_VALUE, i:0, NULL), 
    313     CONF_INFO(174, conf.save_raw_in_video,      CONF_DEF_VALUE, i:0, NULL), 
    314     CONF_INFO(175, conf.show_movie_time,        CONF_DEF_VALUE, i:1, NULL), 
    315     CONF_INFO(176, conf.show_movie_refresh,     CONF_DEF_VALUE, i:1, NULL), 
    316     CONF_INFO(177, conf.mode_video_pos,         CONF_DEF_PTR,   ptr:&def_mode_video_pos , NULL), 
    317     CONF_INFO(178, conf.clear_video,            CONF_DEF_VALUE, i:0, NULL), 
    318     CONF_INFO(179, conf.fast_ev,                CONF_DEF_VALUE, i:0, NULL), 
    319     CONF_INFO(180, conf.fast_ev_step,           CONF_DEF_VALUE, i:1, NULL), 
    320     CONF_INFO(181, conf.mode_ev_pos,            CONF_DEF_PTR,   ptr:&def_mode_ev_pos , NULL), 
    321     CONF_INFO(182, conf.menu_symbol_enable,     CONF_DEF_VALUE, i:1, NULL), 
    322     CONF_INFO(183, conf.menu_symbol_color,      CONF_DEF_VALUE, cl:MAKE_COLOR(COLOR_BG, COLOR_FG), NULL), 
    323     CONF_INFO(184, conf.curve_file,             CONF_DEF_PTR, ptr:"", NULL), 
    324     CONF_INFO(185, conf.curve_enable,           CONF_DEF_VALUE, i:0, NULL), 
    325     CONF_INFO(186, conf.edge_overlay_enable,    CONF_DEF_VALUE, i:0, NULL), 
    326     CONF_INFO(187, conf.edge_overlay_thresh,    CONF_DEF_VALUE, i:40, NULL), 
    327     CONF_INFO(188, conf.edge_overlay_color,     CONF_DEF_VALUE, cl:0x66, NULL), 
    328     CONF_INFO(189, conf.synch_enable,           CONF_DEF_VALUE, i:1, NULL), 
    329     CONF_INFO(190, conf.synch_delay_enable,     CONF_DEF_VALUE, i:0, NULL), 
    330     CONF_INFO(191, conf.synch_delay_value,      CONF_DEF_VALUE, i:100, NULL), 
    331     CONF_INFO(192, conf.synch_delay_coarse_value, CONF_DEF_VALUE, i:0, NULL), 
     309    CONF_INFO(170, conf.video_af_key,           CONF_DEF_VALUE, i:0, NULL), 
     310    CONF_INFO(171, conf.osd_color_override,     CONF_DEF_VALUE, cl:MAKE_COLOR(COLOR_BG, COLOR_RED), NULL), 
     311    CONF_INFO(172, conf.override_disable,       CONF_DEF_VALUE, i:2, NULL), 
     312    CONF_INFO(173, conf.override_disable_all,   CONF_DEF_VALUE, i:1, NULL), 
     313    CONF_INFO(174, conf.hide_osd_in_playback,   CONF_DEF_VALUE, i:0, NULL), 
     314    CONF_INFO(175, conf.save_raw_in_video,      CONF_DEF_VALUE, i:0, NULL), 
     315    CONF_INFO(176, conf.show_movie_time,        CONF_DEF_VALUE, i:1, NULL), 
     316    CONF_INFO(177, conf.show_movie_refresh,     CONF_DEF_VALUE, i:1, NULL), 
     317    CONF_INFO(178, conf.mode_video_pos,         CONF_DEF_PTR,   ptr:&def_mode_video_pos , NULL), 
     318    CONF_INFO(179, conf.clear_video,            CONF_DEF_VALUE, i:0, NULL), 
     319    CONF_INFO(180, conf.fast_ev,                CONF_DEF_VALUE, i:0, NULL), 
     320    CONF_INFO(181, conf.fast_ev_step,           CONF_DEF_VALUE, i:1, NULL), 
     321    CONF_INFO(182, conf.mode_ev_pos,            CONF_DEF_PTR,   ptr:&def_mode_ev_pos , NULL), 
     322    CONF_INFO(183, conf.menu_symbol_enable,     CONF_DEF_VALUE, i:1, NULL), 
     323    CONF_INFO(184, conf.menu_symbol_color,      CONF_DEF_VALUE, cl:MAKE_COLOR(COLOR_BG, COLOR_FG), NULL), 
     324    CONF_INFO(185, conf.curve_file,             CONF_DEF_PTR, ptr:"", NULL), 
     325    CONF_INFO(186, conf.curve_enable,           CONF_DEF_VALUE, i:0, NULL), 
     326    CONF_INFO(187, conf.edge_overlay_enable,    CONF_DEF_VALUE, i:0, NULL), 
     327    CONF_INFO(188, conf.edge_overlay_thresh,    CONF_DEF_VALUE, i:40, NULL), 
     328    CONF_INFO(189, conf.edge_overlay_color,     CONF_DEF_VALUE, cl:0x66, NULL), 
     329    CONF_INFO(190, conf.synch_enable,           CONF_DEF_VALUE, i:1, NULL), 
     330    CONF_INFO(191, conf.synch_delay_enable,     CONF_DEF_VALUE, i:0, NULL), 
     331    CONF_INFO(192, conf.synch_delay_value,      CONF_DEF_VALUE, i:100, NULL), 
     332    CONF_INFO(193, conf.synch_delay_coarse_value, CONF_DEF_VALUE, i:0, NULL), 
    332333}; 
    333334#define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0])) 

  • branches/juciphox/core/gui.c

    r423 r427  
    171171static const char* gui_space_warn_type_enum(int change, int arg); 
    172172static const char* gui_bad_pixel_enum(int change, int arg); 
     173static const char* gui_video_af_key_enum(int change, int arg); 
    173174static const char* gui_show_movie_time(int change, int arg); 
    174175static const char* gui_script_autostart_enum(int change, int arg); 
    … …  
    385386#endif 
    386387#if CAM_CAN_MUTE_MICROPHONE 
    387       {0x05c,LANG_MENU_MUTE_ON_ZOOM,   MENUITEM_BOOL,  &conf.mute_on_zoom}, 
    388 #endif 
    389  
     388      {0x5c,LANG_MENU_MUTE_ON_ZOOM,   MENUITEM_BOOL,  &conf.mute_on_zoom}, 
     389#endif 
     390#if CAM_AF_SCAN_DURING_VIDEO_RECORD  
     391      {0x5e,LANG_MENU_VIDEO_AF_KEY,   MENUITEM_ENUM,    (int*)gui_video_af_key_enum},  
     392#endif 
    390393      {0x51,LANG_MENU_BACK,                    MENUITEM_UP }, 
    391394      {0} 
    … …  
    14091412} 
    14101413  
     1414const char* gui_video_af_key_enum(int change, int arg){  
     1415    static const char* names[]={ "", "Shutter", "Set"};  
     1416    static const int keys[]={0, KEY_SHOOT_HALF, KEY_SET };  
     1417    int i;  
    14111418  
     1419    for (i=0; i<sizeof(names)/sizeof(names[0]); ++i) {  
     1420        if (conf.video_af_key==keys[i]) {  
     1421            break;  
     1422        }  
     1423    }  
     1424  
     1425    i+=change;  
     1426    if (i<0)  
     1427        i=(sizeof(names)/sizeof(names[0]))-1;  
     1428    else if (i>=(sizeof(names)/sizeof(names[0])))  
     1429        i=0;  
     1430  
     1431    conf.video_af_key = keys[i];  
     1432    return names[i];  
     1433} 
     1434     
    14121435const char* gui_bad_pixel_enum(int change, int arg) {  
    14131436    int modes[]={LANG_MENU_BAD_PIXEL_OFF, LANG_MENU_BAD_PIXEL_INTERPOLATION, LANG_MENU_BAD_PIXEL_RAW_CONVERTER};  
    … …  
    18841907    gui_mode = GUI_MODE_NONE; 
    18851908} 
     1909//-------------------------------------------------------------------  
     1910  
     1911void other_kbd_process(){  
     1912#if CAM_AF_SCAN_DURING_VIDEO_RECORD  
     1913    
     1914 if (movie_status==VIDEO_RECORD_IN_PROGRESS) {  
     1915  if (kbd_is_key_clicked(conf.video_af_key)) MakeAFScan();  
     1916 }  
     1917  
     1918#endif  
     1919}  
    18861920 
    18871921//------------------------------------------------------------------- 

  • branches/juciphox/core/gui_lang.c

    r424 r427  
    498498"380 \"Synch Delay 0.1ms\"\n" 
    499499"381 \"Synch Delay 0.1s\"\n" 
     500 
     501"382 \"AF key\"\n" 
    500502; 
    501503 

  • branches/juciphox/core/gui_lang.h

    r416 r427  
    483483#define LANG_MENU_SYNCH_DELAY_VALUE         380 
    484484#define LANG_MENU_SYNCH_DELAY_COARSE_VALUE  381 
     485 
     486#define LANG_MENU_VIDEO_AF_KEY  382 
    485487//------------------------------------------------------------------- 
    486488 
    487 #define GUI_LANG_ITEMS                  381 
     489#define GUI_LANG_ITEMS                  382 
    488490 
    489491//------------------------------------------------------------------- 

  • branches/juciphox/core/gui_osd.c

    r424 r427  
    657657    static int b; 
    658658 
    659     if (!((movie_state > 1) && conf.save_raw_in_video   )) 
     659    if (!((movie_status > 1) && conf.save_raw_in_video   )) 
    660660    {  
    661661    if (conf.show_remaining_raw)  
    … …  
    904904  
    905905 
    906     if (movie_state > 1) record_running = 1; 
     906    if (movie_status > 1) record_running = 1; 
    907907    else  
    908908    {record_running = 0; 

  • branches/juciphox/core/kbd.c

    r423 r427  
    11421142                    return 1; 
    11431143                } 
     1144                other_kbd_process(); // processed other keys in not <alt> mode  
    11441145        } 
    11451146 
    … …  
    11881189    static long key_pressed = 0; 
    11891190if (!(kbd_is_key_pressed(KEY_UP)) && !(kbd_is_key_pressed(KEY_DOWN))) key_pressed = 0; 
    1190     if (kbd_is_key_pressed(KEY_UP) && (mode_get()&MODE_MASK) == MODE_REC &&  ((mode_get()&MODE_SHOOTING_MASK) != MODE_M) &&  ((mode_get()&MODE_SHOOTING_MASK) != MODE_VIDEO_STD) && movie_state<4 && (canon_shoot_menu_active==0)) { 
     1191    if (kbd_is_key_pressed(KEY_UP) && (mode_get()&MODE_MASK) == MODE_REC &&  ((mode_get()&MODE_SHOOTING_MASK) != MODE_M) &&  ((mode_get()&MODE_SHOOTING_MASK) != MODE_VIDEO_STD) && movie_status<4 && (canon_shoot_menu_active==0)) { 
    11911192 
    11921193        if (conf.fast_ev && key_pressed == 0) { 
    … …  
    12031204 
    12041205    }  
    1205     if (kbd_is_key_pressed(KEY_DOWN) && (mode_get()&MODE_MASK) == MODE_REC &&  ((mode_get()&MODE_SHOOTING_MASK) != MODE_M) && ((mode_get()&MODE_SHOOTING_MASK) != MODE_VIDEO_STD) && movie_state<4 && (canon_shoot_menu_active==0)) { 
     1206    if (kbd_is_key_pressed(KEY_DOWN) && (mode_get()&MODE_MASK) == MODE_REC &&  ((mode_get()&MODE_SHOOTING_MASK) != MODE_M) && ((mode_get()&MODE_SHOOTING_MASK) != MODE_VIDEO_STD) && movie_status<4 && (canon_shoot_menu_active==0)) { 
    12061207 
    12071208             

  • branches/juciphox/core/luascript.c

    r419 r427  
    483483static int luaCB_get_moviestate( lua_State* L ) 
    484484{ 
    485   lua_pushnumber( L, movie_state ); 
     485  lua_pushnumber( L, movie_status ); 
    486486  return 1; 
    487487} 

  • branches/juciphox/core/raw.c

    r416 r427  
    5656    state_shooting_progress = SHOOTING_PROGRESS_PROCESSING; 
    5757 
    58      if (conf.save_raw && (!((movie_state > 1) && conf.save_raw_in_video   ))) { 
     58     if (conf.save_raw && (!((movie_status > 1) && conf.save_raw_in_video   ))) { 
    5959        long v; 
    6060         

  • branches/juciphox/include/camera.h

    r421 r427  
    4242    #define CAM_EMUL_KEYPRESS_DURATION  5   // Length of keypress emulation 
    4343 
     44    #undef  CAM_AF_SCAN_DURING_VIDEO_RECORD // CHDK can make single AF scan during video record  
     45 
    4446//---------------------------------------------------------- 
    4547// Overridden values for each camera 
    … …  
    6062    #define CAM_HAS_ND_FILTER           1 
    6163    #undef  CAM_HAS_IS 
    62      
    63  
     64    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
     65     
    6466//========================================================== 
    6567// A-series 
    … …  
    8284    #undef  CAM_HAS_IS 
    8385    #define CAM_CAN_MUTE_MICROPHONE     1 
     86    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
    8487     
    8588//---------------------------------------------------------- 
    … …  
    101104    #undef  CAM_HAS_IS 
    102105    #define CAM_CAN_MUTE_MICROPHONE     1 
     106    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
    103107     
    104108//---------------------------------------------------------- 
    … …  
    123127    #undef  CAM_HAS_IS 
    124128    #define CAM_CAN_MUTE_MICROPHONE     1 
    125  
     129    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2 
     130     
    126131//---------------------------------------------------------- 
    127132#elif defined (CAMERA_a540) 
    … …  
    140145    #undef  CAM_HAS_IS 
    141146    #define CAM_CAN_MUTE_MICROPHONE     1 
    142  
     147    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2 
     148     
    143149//---------------------------------------------------------- 
    144150#elif defined (CAMERA_a550) 
    … …  
    158164    #undef  CAM_HAS_IS 
    159165    #define CAM_CAN_MUTE_MICROPHONE     1 
    160  
     166    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
     167     
    161168//---------------------------------------------------------- 
    162169#elif defined (CAMERA_a560) 
    … …  
    176183    #undef  CAM_HAS_IS 
    177184    #define CAM_CAN_MUTE_MICROPHONE     1 
     185    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
    178186     
    179187//---------------------------------------------------------- 
    … …  
    185193    #define CAM_MULTIPART               1 
    186194    #define CAM_CAN_MUTE_MICROPHONE     1 
     195    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
     196     
    187197//---------------------------------------------------------- 
    188198#elif defined (CAMERA_a610) 
    … …  
    196206    #undef  CAM_HAS_IS 
    197207    #define CAM_CAN_MUTE_MICROPHONE     1 
    198  
     208    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2 
    199209 
    200210//---------------------------------------------------------- 
    … …  
    209219    #undef  CAM_HAS_IS     
    210220    #define CAM_CAN_MUTE_MICROPHONE     1 
    211  
     221    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2 
    212222 
    213223//---------------------------------------------------------- 
    … …  
    223233    #undef  CAM_HAS_IS 
    224234    #define CAM_CAN_MUTE_MICROPHONE     1 
    225  
     235    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
     236     
    226237//---------------------------------------------------------- 
    227238#elif defined (CAMERA_a640) 
    … …  
    236247    #undef  CAM_HAS_IS 
    237248    #define CAM_CAN_MUTE_MICROPHONE     1 
    238  
     249    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
     250     
    239251//---------------------------------------------------------- 
    240252#elif defined (CAMERA_a650) 
    … …  
    251263    #undef  CAM_EMUL_KEYPRESS_DURATION 
    252264    #define CAM_EMUL_KEYPRESS_DURATION  10 
    253  
     265    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
     266     
    254267//---------------------------------------------------------- 
    255268#elif defined (CAMERA_a700) 
    … …  
    261274    #undef  CAM_HAS_IS 
    262275    #define CAM_CAN_MUTE_MICROPHONE     1 
    263  
     276    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2 
     277     
    264278//---------------------------------------------------------- 
    265279#elif defined (CAMERA_a710) 
    … …  
    271285    #define CAM_MULTIPART               1 
    272286    #define CAM_CAN_MUTE_MICROPHONE     1 
     287    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
     288     
    273289//---------------------------------------------------------- 
    274290#elif defined (CAMERA_a720) 
    … …  
    279295    #define CAM_RAW_ROWS                2480   // for new 8 MP 
    280296    #define CAM_CAN_MUTE_MICROPHONE     1 
    281  
     297    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
    282298 
    283299//========================================================== 
    … …  
    437453    #undef  CAM_HAS_USER_TV_MODES 
    438454    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1 
    439  
     455    #define CAM_MULTIPART               1 
     456     
    440457//========================================================== 
    441458// S-Series 
    … …  
    498515    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 
    499516    #define CAM_MULTIPART               1 
    500  
     517    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
    501518 
    502519//---------------------------------------------------------- 

  • branches/juciphox/include/conf.h

    r416 r427  
    215215    int mute_on_zoom; 
    216216    int bad_pixel_removal; 
    217  
     217    int video_af_key; 
     218     
    218219    char curve_file[100]; 
    219220    int curve_enable; 

  • branches/juciphox/include/keyboard.h

    r243 r427  
    2929extern void gui_kbd_enter(); 
    3030extern void gui_kbd_leave(); 
     31extern void other_kbd_process(); 
    3132 
    3233#endif 

  • branches/juciphox/include/lolevel.h

    r394 r427  
    177177void _TurnOnMic(void); 
    178178 
     179extern void _MakeAFScan(int*, int);  
     180extern void _ExpCtrlTool_StartContiAE(int, int);  
     181extern void _ExpCtrlTool_StopContiAE(int, int);  
     182 
     183extern int some_flag_for_af_scan;  
     184extern int parameter_for_af_scan;  
    179185 
    180186#endif 

  • branches/juciphox/include/platform.h

    r416 r427  
    143143#define KBD_INITIAL_DELAY 300 
    144144 
     145// Video recording current status constants, see movie_status variable   
     146#define VIDEO_RECORD_NEVER_STARTED 0   
     147#define VIDEO_RECORD_STOPPED 1   
     148#define VIDEO_RECORD_IN_PROGRESS 4 
     149 
    145150typedef struct { 
    146151    short id; // hacks id 
    … …  
    451456extern int recreview_hold; 
    452457 
    453 extern int movie_state; 
     458extern int movie_status; 
    454459unsigned int GetFreeCardSpaceKb(void); 
    455460unsigned int GetTotalCardSpaceKb(void); 
    … …  
    463468unsigned int GetRawCount(void); 
    464469 
     470void MakeAFScan(void);  
     471extern int movie_status;  
     472 
    465473void wait_until_remote_button_is_released(void); 
    466474 

  • branches/juciphox/lang/english.lng

    r424 r427  
    515515381 "Synch Delay 0.1s" 
    516516 
     517382 "AF key" 
     518 

  • branches/juciphox/lib/ubasic/ubasic.c

    r417 r427  
    250250  case TOKENIZER_GET_MOVIESTATE: 
    251251    accept(TOKENIZER_GET_MOVIESTATE); 
    252     r = movie_state; 
     252    r = movie_status; 
    253253   break; 
    254254  case TOKENIZER_GET_DRIVE_MODE: 

  • branches/juciphox/platform/a450/sub/100d/stubs_entry_2.S

    r395 r427  
    2020NHSTUB(TurnOffMic, 0xFFDC5854) 
    2121NHSTUB(TurnOnMic, 0xFFDC5818) 
     22NHSTUB(ExpCtrlTool_StopContiAE,  0xFFD0DCE0)  
     23NHSTUB(ExpCtrlTool_StartContiAE, 0xFFD0DCB0)  
     24NHSTUB(MakeAFScan,               0xFFE7003C)  

  • branches/juciphox/platform/a450/sub/100d/stubs_min.S

    r416 r427  
    1010DEF(canon_shoot_menu_active,0xD504) 
    1111DEF(recreview_hold, 0x2590) 
    12 DEF (movie_state,0x91D54) 
     12DEF(movie_status, 0x91D54)   
     13DEF(some_flag_for_af_scan, 0xCF88) 

  • branches/juciphox/platform/a460/sub/100d/stubs_entry_2.S

    r395 r427  
    2020NHSTUB(TurnOffMic, 0xFFDC5844) 
    2121NHSTUB(TurnOnMic, 0xFFDC5808) 
     22NHSTUB(ExpCtrlTool_StopContiAE,  0xFFD0DCD8)  
     23NHSTUB(ExpCtrlTool_StartContiAE, 0xFFD0DCA8)  
     24NHSTUB(MakeAFScan,               0xFFE70024)  

  • branches/juciphox/platform/a460/sub/100d/stubs_min.S

    r416 r427  
    1010DEF(canon_shoot_menu_active,0xD504) 
    1111DEF(recreview_hold, 0x2590) 
    12 DEF (movie_state,0x91D54) 
     12DEF(movie_status, 0x91D54)   
     13DEF(some_flag_for_af_scan, 0xCF88) 

  • branches/juciphox/platform/a530/sub/100a/stubs_entry_2.S

    r395 r427  
    1010NHSTUB(TurnOffMic, 0xffc1e774) 
    1111NHSTUB(TurnOnMic, 0xffc1e738) 
     12NHSTUB(ExpCtrlTool_StopContiAE,  0xFFCE0A58)  
     13NHSTUB(ExpCtrlTool_StartContiAE, 0xFFCE0A28)  
     14NHSTUB(MakeAFScan,               0xFFD35C10)  

  • branches/juciphox/platform/a530/sub/100a/stubs_min.S

    r416 r427  
    1010DEF(canon_shoot_menu_active,0x74F1) 
    1111DEF(recreview_hold, 0x6C7C0) 
    12 DEF (movie_state,0x64704) 
     12DEF(movie_status, 0x64704)   
     13DEF(some_flag_for_af_scan, 0x64D40) 
     14DEF(parameter_for_af_scan, 0x64D38) 

  • branches/juciphox/platform/a540/sub/100b/stubs_entry_2.S

    r395 r427  
    1717NHSTUB(TurnOffMic, 0xffc1e788) 
    1818NHSTUB(TurnOnMic, 0xffc1e74c) 
     19 
     20NHSTUB(ExpCtrlTool_StopContiAE,  0xFFCF11C0)  
     21NHSTUB(ExpCtrlTool_StartContiAE, 0xFFCF1190)  
     22NHSTUB(MakeAFScan,               0xFFD4656C)  

  • branches/juciphox/platform/a540/sub/100b/stubs_min.S

    r416 r427  
    1717DEF(lcd_brightness,0xC0910080)  
    1818DEF(lcd_brightness_saved,0x63570)  
    19 DEF (movie_state,0x64794) 
     19 
     20DEF(movie_status, 0x64794)   
     21DEF(some_flag_for_af_scan, 0x64DD0) 
     22DEF(parameter_for_af_scan, 0x64DC8) 

  • branches/juciphox/platform/a550/sub/100c/stubs_entry_2.S

    r395 r427  
    2828NHSTUB(TurnOnMic, 0xffdcc1d4) 
    2929 
     30NHSTUB(ExpCtrlTool_StopContiAE,  0xFFD0A714)  
     31NHSTUB(ExpCtrlTool_StartContiAE, 0xFFD0A6E4)  
     32NHSTUB(MakeAFScan,               0xFFE708D4)  

  • branches/juciphox/platform/a550/sub/100c/stubs_min.S

    r416 r427  
    1010DEF(canon_shoot_menu_active,0x2795) // not found 
    1111DEF(recreview_hold, 0x2588)     // sync with a560 and a630 
    12 DEF (movie_state,0x9BAFC) 
     12DEF(movie_status, 0x9BAFC)   
     13DEF(some_flag_for_af_scan, 0xB92C) 

  • branches/juciphox/platform/a560/sub/100a/stubs_entry_2.S

    r395 r427  
    2020NHSTUB(TurnOffMic, 0xffdde07c) 
    2121NHSTUB(TurnOnMic, 0xffdde040) 
     22NHSTUB(ExpCtrlTool_StopContiAE,  0xFFD15CE8)  
     23NHSTUB(ExpCtrlTool_StartContiAE, 0xFFD15CB8)  
     24NHSTUB(MakeAFScan,               0xFFE952B8)  

  • branches/juciphox/platform/a560/sub/100a/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x2795) 
    1212DEF(recreview_hold, 0x2598) 
    13 DEF (movie_state,0xA2780) 
     13DEF(movie_status, 0xA2780)   
     14DEF(some_flag_for_af_scan, 0xBFA8) 

  • branches/juciphox/platform/a570/sub/100e/stubs_entry_2.S

    r395 r427  
    1818NHSTUB(TurnOffMic, 0xffde8548) 
    1919NHSTUB(TurnOnMic, 0xffde850c) 
     20NHSTUB(ExpCtrlTool_StopContiAE,  0xFFD1ED80)  
     21NHSTUB(ExpCtrlTool_StartContiAE, 0xFFD1ED50)  
     22NHSTUB(MakeAFScan,               0xFFEAA230)  

  • branches/juciphox/platform/a570/sub/100e/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x27B1) 
    1212DEF(recreview_hold, 0x2584) 
    13 DEF (movie_state,0xA30C8) 
     13 
     14DEF(movie_status, 0xA30C8)   
     15DEF(some_flag_for_af_scan, 0xC2F8) 

  • branches/juciphox/platform/a570/sub/101a/stubs_entry_2.S

    r395 r427  
    1818NHSTUB(TurnOffMic, 0xffde85bc) 
    1919NHSTUB(TurnOnMic, 0xffde8580) 
    20  
     20NHSTUB(ExpCtrlTool_StopContiAE,  0xFFD1ED80)  
     21NHSTUB(ExpCtrlTool_StartContiAE, 0xFFD1ED50)  
     22NHSTUB(MakeAFScan,               0xFFEAA2A4)  

  • branches/juciphox/platform/a570/sub/101a/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x27B1) 
    1212DEF(recreview_hold, 0x2584) 
    13 DEF (movie_state,0xA30C8) 
     13DEF(movie_status, 0xA30C8)   
     14DEF(some_flag_for_af_scan, 0xC2F8) 

  • branches/juciphox/platform/a610/sub/100e/lib.c

    r388 r427  
    2525    //return (void*)0x10670d50; 
    2626    void **fb=(void **)0x52EC; 
    27    return fb[ *((unsigned char*)0x52FC) ]; 
     27    unsigned char buff = *((unsigned char*)0x52FC); 
     28    if (buff == 0) { 
     29        buff = 2; 
     30    } 
     31    else { 
     32        buff--; 
     33    } 
     34    return fb[buff]; 
    2835} 
    2936 

  • branches/juciphox/platform/a610/sub/100e/stubs_entry_2.S

    r395 r427  
    2121NHSTUB(TurnOffMic, 0xffc1ec78) 
    2222NHSTUB(TurnOnMic, 0xffc1ec30) 
     23 
     24NHSTUB(ExpCtrlTool_StopContiAE,  0xFFCE05B8)  
     25NHSTUB(ExpCtrlTool_StartContiAE, 0xFFCE05A0)  
     26NHSTUB(MakeAFScan,  0xFFD377B0)  

  • branches/juciphox/platform/a610/sub/100e/stubs_min.S

    r416 r427  
    1010DEF(canon_shoot_menu_active,0x81A9) 
    1111DEF(recreview_hold, 0x7E910) 
    12 DEF (movie_state,0x73634) 
     12DEF(movie_status, 0x73634) 
     13DEF(some_flag_for_af_scan, 0x73D28) 
     14DEF(parameter_for_af_scan, 0x73D20) 

  • branches/juciphox/platform/a610/sub/100f/lib.c

    r388 r427  
    2323void *vid_get_viewport_live_fb() 
    2424{ 
    25     return (void*)0x10670d50; 
     25//    return (void*)0x10670d50; 
     26    void **fb=(void **)0x52EC; 
     27    unsigned char buff = *((unsigned char*)0x52FC); 
     28    if (buff == 0) { 
     29        buff = 2; 
     30    } 
     31    else { 
     32        buff--; 
     33    } 
     34    return fb[buff]; 
    2635} 
    2736 

  • branches/juciphox/platform/a610/sub/100f/stubs_entry_2.S

    r395 r427  
    1212NHSTUB(TurnOffMic, 0xffc1ec78) 
    1313NHSTUB(TurnOnMic, 0xffc1ec30) 
     14 
     15NHSTUB(ExpCtrlTool_StopContiAE,  0xFFCE0940)  
     16NHSTUB(ExpCtrlTool_StartContiAE, 0xFFCE0928)  
     17NHSTUB(MakeAFScan,  0xFFD37B38)  

  • branches/juciphox/platform/a610/sub/100f/stubs_min.S

    r416 r427  
    99DEF(canon_shoot_menu_active,0x81A9) 
    1010DEF(recreview_hold, 0x7E910) 
    11 DEF (movie_state,0x73634) 
     11DEF(movie_status, 0x73634) 
     12DEF(some_flag_for_af_scan, 0x73D28) 
     13DEF(parameter_for_af_scan, 0x73D20) 

  • branches/juciphox/platform/a620/sub/100f/stubs_entry_2.S

    r395 r427  
    2727NHSTUB(TurnOffMic, 0xffc1ec58) 
    2828NHSTUB(TurnOnMic, 0xffc1ec10) 
     29NHSTUB(ExpCtrlTool_StopContiAE,  0xFFCE0A10)  
     30NHSTUB(ExpCtrlTool_StartContiAE, 0xFFCE09F8)  
     31NHSTUB(MakeAFScan,  0xFFD384E4)  

  • branches/juciphox/platform/a620/sub/100f/stubs_min.S

    r416 r427  
    99DEF(canon_shoot_menu_active,0x8221) 
    1010DEF(recreview_hold, 0x7D574) 
    11 DEF (movie_state,0x739A4) 
     11DEF(movie_status, 0x739A4) 
     12DEF(some_flag_for_af_scan, 0x741B8) 
     13DEF(parameter_for_af_scan, 0x741B0) 

  • branches/juciphox/platform/a630/sub/100c/lib.c

    r388 r427  
    2323void *vid_get_viewport_live_fb() 
    2424{ 
    25     return (void*)0; 
     25//    return (void*)0; 
     26    void **fb=(void **)0x5230; 
     27    unsigned char buff = *((unsigned char*)0x5240); 
     28    if (buff == 0) { 
     29        buff = 2; 
     30    } 
     31    else { 
     32        buff--; 
     33    } 
     34    return fb[buff]; 
    2635} 
    2736 

  • branches/juciphox/platform/a630/sub/100c/stubs_entry_2.S

    r395 r427  
    3333NHSTUB(TurnOffMic, 0xffc1eee8) 
    3434NHSTUB(TurnOnMic, 0xffc1eeac) 
     35NHSTUB(ExpCtrlTool_StopContiAE,  0xFFCF6B00)  
     36NHSTUB(ExpCtrlTool_StartContiAE, 0xFFCF6AD0)  
     37NHSTUB(MakeAFScan,  0xFFD54358)  

  • branches/juciphox/platform/a630/sub/100c/stubs_min.S

    r416 r427  
    99DEF(canon_shoot_menu_active,0x7715) 
    1010DEF(recreview_hold, 0x6E9D0) 
    11 DEF (movie_state,0x666CC) 
     11DEF(movie_status, 0x666CC) 
     12DEF(some_flag_for_af_scan, 0x621C) 

  • branches/juciphox/platform/a640/sub/100b/stubs_entry_2.S

    r395 r427  
    1616NHSTUB(TurnOffMic, 0xffc1f588) 
    1717NHSTUB(TurnOnMic, 0xffc1f54c) 
     18NHSTUB(ExpCtrlTool_StopContiAE,  0xFFCF89F8)  
     19NHSTUB(ExpCtrlTool_StartContiAE, 0xFFCF89C8)  
     20NHSTUB(MakeAFScan,  0xFFD56C30)  

  • branches/juciphox/platform/a640/sub/100b/stubs_min.S

    r416 r427  
    99DEF(canon_shoot_menu_active,0x7785) 
    1010DEF(recreview_hold, 0x6ED28) 
    11 DEF (movie_state,0x66894) 
     11DEF(movie_status, 0x66894) 
     12DEF(some_flag_for_af_scan, 0x6278) 

  • branches/juciphox/platform/a650/sub/100d/stubs_entry_2.S

    r395 r427  
    9494NHSTUB(TurnOffMic, 0xFFC382B4) 
    9595 
     96NHSTUB(ExpCtrlTool_StopContiAE,  0xFFC24410)  
     97NHSTUB(ExpCtrlTool_StartContiAE, 0xFFC24250)  
     98NHSTUB(MakeAFScan,  0xFFDE3A8C)  
     99 
    96100 
    97101// null stubs 

  • branches/juciphox/platform/a650/sub/100d/stubs_min.S

    r416 r427  
    1515 
    1616DEF(recreview_hold, 0xE480) 
    17 DEF (movie_state,0x5518+0x38) 
     17 
     18DEF(movie_status, 0x5550)    // 0x5518 + 0x38 
     19DEF(some_flag_for_af_scan, 0x11040) 

  • branches/juciphox/platform/a700/sub/100b/stubs_entry_2.S

    r395 r427  
    1616NHSTUB(TurnOffMic, 0xffc1e100) 
    1717NHSTUB(TurnOnMic, 0xffc1e0c4) 
     18 
     19NHSTUB(ExpCtrlTool_StopContiAE,  0xFFCF1958)  
     20NHSTUB(ExpCtrlTool_StartContiAE, 0xFFCF1928)  
     21NHSTUB(MakeAFScan,  0xFFD46CF0)  

  • branches/juciphox/platform/a700/sub/100b/stubs_min.S

    r416 r427  
    1010DEF(canon_shoot_menu_active,0x74C1) 
    1111DEF(recreview_hold, 0x76570) 
    12 DEF (movie_state,0x6E47C) 
     12DEF(movie_status, 0x6E47C) 
     13DEF(some_flag_for_af_scan, 0x6EAB8) 
     14DEF(parameter_for_af_scan, 0x6EAB0) 

  • branches/juciphox/platform/a710/sub/100a/lib.c

    r388 r427  
    2424void *vid_get_viewport_live_fb() 
    2525{ 
    26     return (void*)0x10670ee0; 
     26//    return (void*)0x10670ee0; 
     27    void **fb=(void **)0x522C; 
     28    unsigned char buff = *((unsigned char*)0x523C); 
     29    if (buff == 0) { 
     30        buff = 2; 
     31    } 
     32    else { 
     33        buff--; 
     34    } 
     35    return fb[buff]; 
    2736} 
    2837 

  • branches/juciphox/platform/a710/sub/100a/stubs_entry_2.S

    r394 r427  
    3737NHSTUB(TurnOffMic,  0xFFC1E944)  
    3838NHSTUB(TurnOnMic,   0xFFC1E908)  
     39NHSTUB(ExpCtrlTool_StopContiAE,  0xFFD0018C)  
     40NHSTUB(ExpCtrlTool_StartContiAE, 0xFFD0015C)  
     41NHSTUB(MakeAFScan,  0xFFD5D538)  

  • branches/juciphox/platform/a710/sub/100a/stubs_min.S

    r416 r427  
    99DEF(canon_shoot_menu_active,0x7655) 
    1010DEF(recreview_hold, 0x798A8) 
    11 DEF (movie_state,0x715BC) 
     11DEF(movie_status, 0x715BC) 
     12DEF(some_flag_for_af_scan, 0x6230) 

  • branches/juciphox/platform/a720/sub/100c/stubs_entry_2.S

    r395 r427  
    112112NHSTUB(TurnOffMic, 0xFFC376F8) 
    113113 
     114NHSTUB(ExpCtrlTool_StopContiAE,  0xFFC23A2C)  
     115NHSTUB(ExpCtrlTool_StartContiAE, 0xFFC23930)  
     116NHSTUB(MakeAFScan,  0xFFDD4AA4)  
     117 
    114118 
    115119// dryos Test 

  • branches/juciphox/platform/a720/sub/100c/stubs_min.S

    r416 r427  
    99DEF(canon_shoot_menu_active,0xAE15)   // 0xAE14+1 
    1010DEF(recreview_hold, 0xABE8) // 0xAB38+0xB0 
    11 DEF (movie_state,0x5538+0x38) 
     11 
     12DEF(movie_status, 0x5570)  // 0x5538 + 0x38 
     13DEF(some_flag_for_af_scan, 0xD688) 

  • branches/juciphox/platform/g7/sub/100e/stubs_entry_2.S

    r298 r427  
    1313NHSTUB(GetDrive_TotalClusters, 0xff87c374) 
    1414NHSTUB(GetDrive_FreeClusters, 0xff87c3b0) 
     15 
     16NHSTUB(ExpCtrlTool_StopContiAE,  0xFF925F18)  
     17NHSTUB(ExpCtrlTool_StartContiAE, 0xFF925EE8)  
     18NHSTUB(MakeAFScan,               0xFF9A04E0)  

  • branches/juciphox/platform/g7/sub/100e/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x8565) 
    1212DEF(recreview_hold, 0x7F8AC) 
    13 DEF (movie_state,0x771E0) 
     13DEF(movie_status, 0x771E8)   
     14DEF(some_flag_for_af_scan, 0x6E64) 

  • branches/juciphox/platform/g7/sub/100g/stubs_entry_2.S

    r298 r427  
    1313NHSTUB(GetDrive_TotalClusters, 0xff87c374) 
    1414NHSTUB(GetDrive_FreeClusters, 0xff87c3b0) 
     15NHSTUB(ExpCtrlTool_StopContiAE,  0xFF925F3C)  
     16NHSTUB(ExpCtrlTool_StartContiAE, 0xFF925F0C)  
     17NHSTUB(MakeAFScan,               0xFF9A0560)  

  • branches/juciphox/platform/g7/sub/100g/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x8565) 
    1212DEF(recreview_hold, 0x7F8AC) 
    13 DEF (movie_state,0x771E0) 
     13DEF(movie_status, 0x771E8)   
     14DEF(some_flag_for_af_scan, 0x6E64) 

  • branches/juciphox/platform/g7/sub/100i/stubs_entry_2.S

    r298 r427  
    1616NHSTUB(GetDrive_TotalClusters, 0xff87c374) 
    1717NHSTUB(GetDrive_FreeClusters, 0xff87c3b0) 
     18NHSTUB(ExpCtrlTool_StopContiAE,  0xFF925F3C)  
     19NHSTUB(ExpCtrlTool_StartContiAE, 0xFF925F0C)  
     20NHSTUB(MakeAFScan,               0xFF9A0560)  

  • branches/juciphox/platform/g7/sub/100i/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x8565) 
    1212DEF(recreview_hold, 0x7F8AC) 
    13 DEF (movie_state,0x771E0) 
     13DEF(movie_status, 0x771E8)   
     14DEF(some_flag_for_af_scan, 0x6E64) 

  • branches/juciphox/platform/g7/sub/100j/stubs_entry_2.S

    r298 r427  
    1414NHSTUB(GetDrive_TotalClusters, 0xff87c374) 
    1515NHSTUB(GetDrive_FreeClusters, 0xff87c3b0) 
     16NHSTUB(ExpCtrlTool_StopContiAE,  0xFF925F3C)  
     17NHSTUB(ExpCtrlTool_StartContiAE, 0xFF925F0C)  
     18NHSTUB(MakeAFScan,               0xFF9A0560)  

  • branches/juciphox/platform/g7/sub/100j/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x8565) 
    1212DEF(recreview_hold, 0x7F8AC) 
    13 DEF (movie_state,0x771E0) 
     13DEF(movie_status, 0x771E8)   
     14DEF(some_flag_for_af_scan, 0x6E64) 

  • branches/juciphox/platform/generic/wrappers.c

    r407 r427  
    549549} 
    550550#endif 
     551 
     552 
     553 
     554#if CAM_AF_SCAN_DURING_VIDEO_RECORD 
     555void MakeAFScan(void){ 
     556 int a=0, save; 
     557 if (zoom_busy || focus_busy) return; 
     558 save=some_flag_for_af_scan; 
     559 some_flag_for_af_scan=0; 
     560#if CAM_AF_SCAN_DURING_VIDEO_RECORD == 2 
     561 parameter_for_af_scan=3; 
     562#endif 
     563 _MakeAFScan(&a, 3); 
     564 some_flag_for_af_scan=save; 
     565 _ExpCtrlTool_StartContiAE(0,0); 
     566} 
     567#endif 

  • branches/juciphox/platform/ixus50_sd400/sub/101a/lib.c

    r417 r427  
    7979    return (char*)0x75EC0; 
    8080} 
    81 int movie_state = 0; 
     81int movie_status = 0; 
    8282 
    8383long vid_get_bitmap_buffer_width() { return 360; } 

  • branches/juciphox/platform/ixus50_sd400/sub/101b/lib.c

    r417 r427  
    7979    return (char*)0x75EC0; // OK! 
    8080} 
    81 int movie_state = 0; 
     81int movie_status = 0; 
    8282 
    8383long vid_get_bitmap_buffer_width() { return 360; } 

  • branches/juciphox/platform/ixus55_sd450/sub/100b/stubs_min.S

    r416 r427  
    2121DEF(playrec_mode, 0x6FA0) // found at unknown_libname_442 within task_SsStartupTask 
    2222DEF(recreview_hold, 0x86838) 
    23 DEF (movie_state,0x7CDBC) 
     23DEF(movie_status,0x7CDBC) 

  • branches/juciphox/platform/ixus55_sd450/sub/100c/stubs_min.S

    r416 r427  
    2121DEF(playrec_mode, 0x6FA0) // found at unknown_libname_442 within task_SsStartupTask 
    2222DEF(recreview_hold, 0x86838) 
    23 DEF (movie_state,0x7CDBC) 
     23DEF(movie_status,0x7CDBC) 

  • branches/juciphox/platform/ixus55_sd450/sub/100d/lib.c

    r416 r427  
    6969    return (char*)0x9B58; 
    7070} 
    71 int movie_state = 0; 
     71int movie_status = 0; 
    7272  
    7373long vid_get_bitmap_buffer_width() { return 360; } 

  • branches/juciphox/platform/ixus65_sd630/sub/100a/lib.c

    r416 r427  
    7777    return (char*)0x10B80; 
    7878} 
    79 int movie_state = 0; 
     79int movie_status = 0; 
    8080 
    8181long vid_get_bitmap_buffer_width() { return 360; } 

  • branches/juciphox/platform/ixus700_sd500/sub/101a/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x65B5) 
    1212DEF(recreview_hold, 0x739F8) 
    13 DEF (movie_state,0x6F684) 
     13DEF(movie_status,0x6F684) 

  • branches/juciphox/platform/ixus700_sd500/sub/101b/stubs_min.S

    r416 r427  
    1010DEF(canon_shoot_menu_active,0x65B5) 
    1111DEF(recreview_hold, 0x739F8) 
    12 DEF (movie_state,0x6F684) 
     12DEF(movie_status,0x6F684) 

  • branches/juciphox/platform/ixus70_sd1000/sub/100c/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x27C9) // (0x27CC - 0x4 + 0x1) found in "taskcreate_DSITask" 
    1212DEF(recreview_hold, 0x25AC) // (0x25B0 - 0x4) found in "AR:Snd:0x%04x" 
    13 DEF (movie_state,0xBB550) 
     13DEF(movie_status,0xBB550) 

  • branches/juciphox/platform/ixus70_sd1000/sub/101b/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x27C9) // (0x27CC - 0x4 + 0x1) found in "taskcreate_DSITask" 
    1212DEF(recreview_hold, 0x25AC) // (0x25B0 - 0x4) found in "AR:Snd:0x%04x" 
    13 DEF (movie_state,0xBB550) 
     13DEF(movie_status,0xBB550) 

  • branches/juciphox/platform/ixus70_sd1000/sub/102a/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x27C9) // (0x27CC - 0x4 + 0x1) found in "taskcreate_DSITask" 
    1212DEF(recreview_hold, 0x25AC) // (0x25B0 - 0x4) found in "AR:Snd:0x%04x" 
    13 DEF (movie_state,0xBB550) 
     13DEF(movie_status,0xBB550) 

  • branches/juciphox/platform/ixus800_sd700/sub/100b/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x7539) 
    1212DEF(recreview_hold, 0x76D78) 
    13 DEF (movie_state,0x6ECA4) 
     13DEF(movie_status,0x6ECA4) 

  • branches/juciphox/platform/ixus800_sd700/sub/101b/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x7539) 
    1212DEF(recreview_hold, 0x76D78) 
    13 DEF (movie_state,0x6ECA4) 
     13DEF(movie_status,0x6ECA4) 

  • branches/juciphox/platform/ixus850_sd800/sub/100e/lib.c

    r388 r427  
    8080void *vid_get_viewport_live_fb() 
    8181{ 
    82     return (void*)0; // 0x106571F0 + 0x7E900 
     82//    return (void*)0; // 0x106571F0 + 0x7E900 
     83    void **fb=(void **)0x5564; 
     84    unsigned char buff = *((unsigned char*)0x5574); 
     85    if (buff == 0) { 
     86        buff = 2; 
     87    } 
     88    else { 
     89        buff--; 
     90    } 
     91    return fb[buff]; 
    8392} 
    8493 

  • branches/juciphox/platform/ixus850_sd800/sub/100e/stubs_min.S

    r416 r427  
    222222 
    223223DEF(recreview_hold, 0x7CF0) // (0x7CF4 - 0x4) found in "AR:Snd:0x%04x", LDR R3, =0x7CF4; 
    224 DEF (movie_state,0x8BBF8) 
     224DEF(movie_status,0x8BBF8) 

  • branches/juciphox/platform/ixus860_sd870/sub/100c/stubs_min.S

    r416 r427  
    1616DEF(canon_shoot_menu_active,0xB65D)   // 0xB65C+1 
    1717DEF(recreview_hold, 0xB474) // 0xB3C8+0xAC 
    18 DEF (movie_state,0x54E0+0x3C) 
     18DEF(movie_status,0x54E0+0x3C) 

  • branches/juciphox/platform/ixus950_sd850/sub/100c/Makefile

    r379 r427  
    11topdir=../../../../ 
    22 
    3 OBJS=boot.o stubs_min.o stubs_auto.o stubs_entry.o lib.o stubs_entry_2.o capt_seq.o movie_rec.o 
    4 STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 
     3OBJS=boot.o stubs_min.o stubs_auto.o stubs_entry.o lib.o stubs_entry_2.o capt_seq.o movie_rec.o mount.o 
     4STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c mount.c 
    55 
    66include $(topdir)/platform/makefile_sub.inc 

  • branches/juciphox/platform/ixus950_sd850/sub/100c/stubs_auto.S

    r416 r427  
    1818STUB(FF81BC98) 
    1919STUB(FF81BE94) 
     20STUB(FF81C958) 
     21STUB(FF81C984) 
     22STUB(FF81E300) 
     23STUB(FF81E3D0) 
    2024STUB(FF826284) 
     25STUB(FF84AC44) 
     26STUB(FF84AC54) 
    2127STUB(FF91969C) 
    2228STUB(FF91FE08) 
    … …  
    3238STUB(FFA4226C) 
    3339STUB(FFA42780) 
     40STUB(FFA71658) 
     41STUB(FFA71748) 
     42STUB(FFA87D60) 
     43STUB(FFAA1338) 
     44STUB(FFAA1410) 
     45STUB(FFAA153C) 
     46STUB(FFAA1CBC) 
     47STUB(FFAA1D0C) 
     48STUB(FFAA1DC8) 
     49STUB(FFAA1F1C) 
     50STUB(FFAA2040) 
     51STUB(FFAA20C8) 
     52STUB(FFAA2294) 
     53STUB(FFAB5944) 
    3454STUB(FFAF185C) 
    3555STUB(FFAF1CA4) 
    … …  
    7898STUB(FFB2396C) 
    7999STUB(FFB2F4F0) 
     100STUB(FFB417FC) 
    80101STUB(FFB46388) 
    81102STUB(FFB92948) 

  • branches/juciphox/platform/ixus950_sd850/sub/100c/stubs_entry_2.S

    r332 r427  
    4949 
    5050NHSTUB(UnsetZoomForMovie, 0xFF83656C) 
     51NHSTUB(WriteSDCard, 0xFFAB536C) 

  • branches/juciphox/platform/ixus950_sd850/sub/100c/stubs_min.S

    r416 r427  
    1717DEF(recreview_hold, 0x25E0)             // after "AR:Snd:0x%04x", LDR R3, =0x25E4; then 
    1818                                        // 0x25E4-4=0x25E0 (quietschi's prescription, SD1000) 
    19 DEF (movie_state,0xA8638) 
     19DEF(movie_status,0xA8638) 

  • branches/juciphox/platform/s2is/sub/100e/stubs_min.S

    r416 r427  
    1212DEF(canon_shoot_menu_active,0x6C91) 
    1313DEF(recreview_hold, 0x60FB0) 
    14 DEF (movie_state,0x5C95C) 
     14DEF(movie_status,0x5C95C) 

  • branches/juciphox/platform/s2is/sub/100f/stubs_min.S

    r416 r427  
    1212DEF(canon_shoot_menu_active,0x6C91) 
    1313DEF(recreview_hold, 0x60FB0) 
    14 DEF (movie_state,0x5C95C) 
     14DEF(movie_status,0x5C95C) 

  • branches/juciphox/platform/s2is/sub/100g/stubs_min.S

    r416 r427  
    1212DEF(canon_shoot_menu_active,0x6CC1) 
    1313DEF(recreview_hold, 0x60FD0) 
    14 DEF (movie_state,0x5C95C) 
     14DEF(movie_status,0x5C95C) 

  • branches/juciphox/platform/s3is/sub/100a/lib.c

    r388 r427  
    2323void *vid_get_viewport_live_fb() 
    2424{ 
    25     return (void*)0; 
     25//    return (void*)0; 
     26    void **fb=(void **)0x54e8; 
     27    unsigned char buff = *((unsigned char*)0x54f8); 
     28    if (buff == 0) { 
     29        buff = 2; 
     30    } 
     31    else { 
     32        buff--; 
     33    } 
     34    return fb[buff]; 
    2635} 
    2736 

  • branches/juciphox/platform/s3is/sub/100a/stubs_min.S

    r416 r427  
    1111DEF(canon_shoot_menu_active,0x7DA5) 
    1212DEF(recreview_hold, 0x69480) 
    13 DEF (movie_state,0x6115C) 
     13DEF(movie_status,0x6115C) 

  • branches/juciphox/platform/s5is/sub/101a/lib.c

    r416 r427  
    6565        return (char*)0x58304; 
    6666} 
    67 int movie_state = 0; 
     67int movie_status = 0; 
    6868 
    6969 

  • branches/juciphox/platform/s5is/sub/101b/lib.c

    r416 r427  
    4040        // Should return null pointer. 
    4141         
    42         return (void*)0x0; 
     42//      return (void*)0x0; 
     43    void **fb=(void **)0x7E900; 
     44    unsigned char buff = *((unsigned char*)0x218C); 
     45    if (buff == 0) { 
     46        buff = 2; 
     47    } 
     48    else { 
     49        buff--; 
     50    } 
     51    return fb[buff]; 
    4352} 
    4453 

  • branches/juciphox/platform/s5is/sub/101b/stubs_min.S

    r416 r427  
    8888// ROM:FF9754B8 008                 LDR     R2, [R1,#0xCC] 
    8989DEF(recreview_hold, 0xBE2C) // 0xBD60 + 0xCC 
    90 DEF (movie_state,0x5868 + 0x38) 
     90DEF(movie_status,0x5868 + 0x38) 
    9191 
    9292 

  • branches/juciphox/platform/tx1/sub/100g/lib.c

    r416 r427  
    6161    return (char*)0x12988; 
    6262} 
    63 int movie_state = 0; 
    6463  
    6564long vid_get_bitmap_buffer_width() { return 480; } 

  • branches/juciphox/platform/tx1/sub/100g/stubs_entry_2.S

    r404 r427  
    3030NHSTUB(PutOutNdFilter, 0xffa639DC) 
    3131NHSTUB(WriteSDCard, 0xFFAC0FF8) 
     32NHSTUB(ExpCtrlTool_StopContiAE,  0xFF9779CC)  
     33NHSTUB(ExpCtrlTool_StartContiAE, 0xFF97799C)  
     34NHSTUB(MakeAFScan,               0xFFB2C7E4)  

  • branches/juciphox/platform/tx1/sub/100g/stubs_min.S

    r388 r427  
    1010DEF(focus_busy, 0x8F1A0) 
    1111DEF(led_table, 0x64DC0) 
     12DEF(movie_status, 0xB3F68) 
     13DEF(some_flag_for_af_scan, 0xD1C8) 

  • branches/juciphox/platform/tx1/sub/101b/lib.c

    r416 r427  
    6363    return (char*)0x12988; 
    6464} 
    65 int movie_state = 0; 
    6665  
    6766long vid_get_bitmap_buffer_width() { return 480; } 

  • branches/juciphox/platform/tx1/sub/101b/stubs_entry_2.S

    r404 r427  
    2626NHSTUB(PostLEDMessage, 0xFFA4290C) 
    2727NHSTUB(WriteSDCard, 0xFFAC1078) 
     28NHSTUB(ExpCtrlTool_StopContiAE,  0xFF9779CC)  
     29NHSTUB(ExpCtrlTool_StartContiAE, 0xFF97799C)  
     30NHSTUB(MakeAFScan,  0xFFB2C864)  

  • branches/juciphox/platform/tx1/sub/101b/stubs_min.S

    r388 r427  
    1010DEF(focus_busy, 0x8F1A0) 
    1111DEF(led_table, 0x64DC0) 
     12DEF(movie_status, 0xB3F68) 
     13DEF(some_flag_for_af_scan, 0xD1C8) 
Note: See TracChangeset for help on using the changeset viewer.