Changeset 1509

Timestamp:

12/26/11 13:26:00 (17 months ago)

Author:

tsv

Message:

Separate dng to loadable module

Location:

trunk

Files:

• core/Makefile (modified) (1 diff)
• core/conf.c (modified) (2 diffs)
• core/dng.c (modified) (7 diffs)
• core/dng.h (modified) (1 diff)
• core/gui.c (modified) (2 diffs)
• core/gui_fselect.c (modified) (4 diffs)
• core/module_exportlist.c (modified) (2 diffs)
• core/modules.c (modified) (2 diffs)
• core/modules.h (modified) (1 diff)
• core/modules/Makefile (modified) (3 diffs)
• core/raw.c (modified) (7 diffs)
• core/raw.h (modified) (1 diff)
• lib/armutil/Makefile (modified) (1 diff)

trunk/core/Makefile

@@ -61 +61 @@
      histogram.o gui_batt.o gui_space.o gui_osd.o raw.o \
      gui_usb.o gui_lang.o gui_grid.o modules.o module_load.o\
-     levent.o shot_histogram.o dng.o bitvector.o console.o $(OPT_OBJS)
+     levent.o shot_histogram.o bitvector.o console.o $(OPT_OBJS)
 
 gui.o: FORCE

trunk/core/conf.c

@@ -6 +6 @@
 #include "camera.h"
 #include "raw.h"
-#include "dng.h"
+#include "modules.h"
 #include "gui_draw.h"
 #include "gui_osd.h"
@@ -488 +488 @@
 #if DNG_SUPPORT
  if (conf.dng_raw) {
-  if (!badpixel_list_loaded_b()) load_bad_pixels_list_b("A/CHDK/badpixel.bin");
-  if (!badpixel_list_loaded_b()) conf.dng_raw=0;
+        if ( !module_dng_load(LIBDNG_OWNED_BY_RAW) )
+                return;
+        if (!libdng.badpixel_list_loaded_b()) libdng.load_bad_pixels_list_b("A/CHDK/badpixel.bin");
+        if (!libdng.badpixel_list_loaded_b()) conf.dng_raw=0;
  }
- else unload_bad_pixels_list_b();
+ else if ( libdng.load_bad_pixels_list_b ) {
+        libdng.load_bad_pixels_list_b(0);        //unload badpixel.bin
+        module_dng_unload(LIBDNG_OWNED_BY_RAW);
+ }
 #endif
 }

trunk/core/dng.c

@@ -7 +7 @@
 #include "platform.h"
 #include "conf.h"
-#include "math.h"
 #include "console.h"
 #include "dng.h"
@@ -455 +454 @@
  // Shutter speed tags
  get_property_case(PROPCASE_TV, &short_prop_val, sizeof(short_prop_val));
- cam_shutter[0]      = 1000000 * pow(2,-short_prop_val / 96.0);
+ cam_shutter[0]      = pow_calc( 1000000, 2, 1, -short_prop_val, 96);
  cam_apex_shutter[0] = short_prop_val;
 
  // Date & time tag (note - uses shutter speed from 'short_prop_val' code above)
- if (shutter_open_time) { datetime = shutter_open_time+pow(2,-short_prop_val/96.0); shutter_open_time=0;} // shutter closing time
+ if (shutter_open_time) { datetime = shutter_open_time + pow_calc(1, 2, 1, -short_prop_val, 96); shutter_open_time=0;} // shutter closing time
  else  datetime = time(NULL);
  ttm = localtime(&datetime);
@@ -465 +464 @@
 
  get_property_case(PROPCASE_AV, &short_prop_val, sizeof(short_prop_val));
- cam_aperture[0]      = 10 * pow(2,short_prop_val / 192.0);
+ cam_aperture[0]      = pow_calc( 10, 2, 1, short_prop_val, 192);
  cam_apex_aperture[0] = short_prop_val;
 
@@ -498 +497 @@
  int *buf;
  int i;
- struct stat st;
+ struct STD_stat st;
  struct utimbuf t;
 
- if (stat(fn, &st) != 0 || st.st_size<=hook_raw_size())  return;
+ if (safe_stat(fn, &st) != 0 || st.st_size<=hook_raw_size())  return;
  buf=malloc(BUF_SIZE);
  if (buf){
@@ -543 +542 @@
     if (gamma[255]) return;
 #if defined(CAMERA_sx30) || defined(CAMERA_sx40hs) || defined(CAMERA_g12) || defined(CAMERA_ixus310_elph500hs)
-    for (i=0; i<12; i++) gamma[i]=255*pow(i/255.0, 0.5);
-    for (i=12; i<64; i++) gamma[i]=255*pow(i/255.0, 0.4);
-    for (i=64; i<=255; i++) gamma[i]=255*pow(i/255.0, 0.25);
+    for (i=0; i<12; i++) gamma[i]=pow_calc_2(255, i, 255, 0.5, 1);
+    for (i=12; i<64; i++) gamma[i]=pow_calc_2(255, i, 255, 0.4, 1);
+    for (i=64; i<=255; i++) gamma[i]=pow_calc_2(255, i, 255, 0.25, 1);
 #else
-    for (i=0; i<=255; i++) gamma[i]=255*pow(i/255.0, 0.5);
+    for (i=0; i<=255; i++) gamma[i]=pow_calc_2(255, i, 255, 0.5, 1);
 #endif
 }
 
 void create_thumbnail() {
-    register unsigned int i, j, x, y;
+    register int i, j, x, y;
     register char *buf = thumbnail_buf;
 
@@ -638 +637 @@
 
 void load_bad_pixels_list_b(char* filename) {
-    struct stat st;
+    struct STD_stat st;
     long filesize;
     void* ptr;
     FILE *fd;
+
+        if ( filename==0 )
+         { unload_bad_pixels_list_b(); return; }
+
     binary_count=-1;
-    if (stat(filename,&st)!=0) return;
+    if (safe_stat(filename,&st)!=0) return;
     filesize=st.st_size;
     if (filesize%(2*sizeof(short)) != 0) return;
@@ -783 +786 @@
 }
 
+//-------------------------------------------------------------------
+void write_dng(int fd, char* rawadr, char* altrawadr, unsigned long uncachedbit) 
+{
+        create_dng_header();
+    write_dng_header(fd);
+
+    reverse_bytes_order2(rawadr, altrawadr, hook_raw_size());
+
+    // Write alternate (inactive) buffer that we reversed the bytes into above (if only one buffer then it will be the active buffer instead)
+    write(fd, (char*)(((unsigned long)altrawadr)|uncachedbit), hook_raw_size());
+
+    if (rawadr == altrawadr)    // If only one RAW buffer then we have to swap the bytes back
+        reverse_bytes_order2(rawadr, altrawadr, hook_raw_size());
+
+    free_dng_header();
+}
+
+/*********** BEGIN OF AUXILARY PART **********************/
+
+#include "module_load.h"
+
+void* MODULE_EXPORT_LIST[] = {
+        /* 0 */ (void*)EXPORTLIST_MAGIC_NUMBER,
+        /* 1 */ (void*)9,
+
+                        create_badpixel_bin,
+                        raw_init_badpixel_bin,
+                        capture_data_for_exif,
+                        load_bad_pixels_list_b,
+                        badpixel_list_loaded_b,
+
+                        convert_dng_to_chdk_raw,
+                        write_dng,
+                };
+
+int _module_loader( void** chdk_export_list )
+{
+  if ( (unsigned int)chdk_export_list[0] != EXPORTLIST_MAGIC_NUMBER )
+     return 1;
+
+  return 0;
+}
+
+
+//---------------------------------------------------------
+// PURPOSE: Finalize module operations (close allocs, etc)
+// RETURN VALUE: 0-ok, 1-fail
+//---------------------------------------------------------
+int _module_unloader()
+{
+
+        unload_bad_pixels_list_b();
+    free_dng_header();
+    return 0;
+}
+
+
+#else
+
+/*********** NO DNG SUPPORTED BY CAMERA - EMPTY MODULE **********/
+
+#include "module_load.h"
+
+int _module_loader( void** chdk_export_list )
+{
+        // error bind - DNG is not supported and module is empty
+        return 1;
+}
+
+
+//---------------------------------------------------------
+// PURPOSE: Finalize module operations (close allocs, etc)
+// RETURN VALUE: 0-ok, 1-fail
+//---------------------------------------------------------
+int _module_unloader()
+{
+  return 0;
+}
+
+
 #endif //DNG_SUPPORT
+
+
+/******************** Module Information structure ******************/
+
+struct ModuleInfo _module_info = {      MODULEINFO_V1_MAGICNUM,
+                                                                        sizeof(struct ModuleInfo),
+
+                                                                        ANY_CHDK_BRANCH, 0,                     // Requirements of CHDK version
+                                                                        PLATFORMID,                                     // Specify platform dependency
+                                                                        MODULEINFO_FLAG_SYSTEM,         // flag
+                                                                        (int32_t)"DNG (dll)",   // Module name
+                                                                        1, 0,                                           // Module version
+                                                                        (int32_t)"Processing of DNG"
+                                                                 };
+
+
+/*************** END OF AUXILARY PART *******************/

trunk/core/dng.h

@@ -4 +4 @@
 #define DNG_H
 
+// This is to minimize export list to different modules
+struct libdng_sym {
+        int  size;                             // simple guard to detect changing list of exported by library symbols
+        void (*create_badpixel_bin)();
+        int  (*raw_init_badpixel_bin)();
+        void (*capture_data_for_exif)(void);
+        void (*load_bad_pixels_list_b)(char* filename);
+        int  (*badpixel_list_loaded_b)(void);
+
+        void (*convert_dng_to_chdk_raw)(char* fn);
+        void (*write_dng)(int fd, char* rawadr, char* altrawadr, unsigned long uncachedbit);
+};
+
+
 #if DNG_SUPPORT
 
+// Defines of exported to chdk symbols
+#ifdef THIS_IS_CHDK_CORE
+
+        // This section is for CHDK core
+        extern struct libdng_sym libdng;
+#else
+        
+        extern void create_badpixel_bin();
 extern int raw_init_badpixel_bin();
 extern void capture_data_for_exif(void);
-extern void create_dng_header();
-extern void free_dng_header(void);
-extern void write_dng_header(int fd);
+        extern void load_bad_pixels_list_b(char* filename);
+        extern int  badpixel_list_loaded_b(void);
 
 extern void convert_dng_to_chdk_raw(char* fn);
+        extern void write_dng(int fd, char* rawadr, char* altrawadr, unsigned long uncachedbit);
 
-extern void load_bad_pixels_list_b(char* filename);
 extern void unload_bad_pixels_list_b(void);
-extern int badpixel_list_loaded_b(void);
-extern void create_badpixel_bin();
 
 #endif
 
+
+#endif //DNG_SUPPORT
+
+
+
 #endif

trunk/core/gui.c

@@ -1000 +1000 @@
 
 void gui_menuproc_badpixel_create(int arg) {
-    create_badpixel_bin();
+        // After this action module will not be unloaded until reboot 
+        // because not clear when it finished
+        if ( module_dng_load(LIBDNG_OWNED_BY_CREATEBADPIXEL) )
+        libdng.create_badpixel_bin();
 }
 #endif
@@ -1616 +1619 @@
     exposition_thresh = screen_size/500;
     voltage_step = (conf.batt_step_25)?25:1;
-    load_bad_pixels_list("A/CHDK/badpixel");
-    load_bad_pixels_list("A/CHDK/badpixel.txt");
+    load_from_file( "A/CHDK/badpixel", make_pixel_list );
+    load_from_file( "A/CHDK/badpixel.txt", make_pixel_list );
 #ifdef OPT_CURVES
         // initialize curves, loading files if required by current mode

trunk/core/gui_fselect.c

@@ -1036 +1036 @@
 }
 //-------------------------------------------------------------------
-//#if DNG_SUPPORT
 void process_dng_to_raw_files(void){
  struct fitem *ptr;
@@ -1058 +1057 @@
   gui_fselect_read_dir(current_dir);
 }
-//#endif
 
 //-------------------------------------------------------------------
@@ -1140 +1138 @@
             break;
         }
-//#if DNG_SUPPORT
     case MPOPUP_DNG_TO_CRW:
             process_dng_to_raw_files();
             break;
-//#endif
     }
     gui_fselect_redraw = 2;
@@ -1238 +1234 @@
                 if(selected->size == hook_raw_size())
                     i |= MPOPUP_RAW_DEVELOP;
-//#if DNG_SUPPORT
+
+                                if ( module_convert_dng_to_chdk_raw(0) )        // if dng module exist
                 if((fselect_marked_count()>1)||(selected->size > hook_raw_size()))
                     i |= MPOPUP_DNG_TO_CRW;
-//#endif
 
                 if (selected->name[9] == 'B' && selected->name[10] == 'I' && selected->name[11] == 'N') //If item is DCIM folder

trunk/core/module_exportlist.c

@@ -27 +27 @@
 #include "module_load.h"
 #include "raw.h"
+#include "action_stack.h"
+#include "console.h"
 
 
 extern int fselect_sort_nothumb(const void* v1, const void* v2);
 extern short shooting_get_ev_correction1();
+
+extern long shutter_open_time; // defined in platform/generic/capt_seq.c
 
 
@@ -296 +300 @@
                         lang_strhash31,
 
+                        action_stack_create,
+                        action_pop,
+                        action_push,
+                        action_push_delay,
+                        action_stack_standard,
+                        console_clear,
+                        console_add_line,
+                        shooting_set_tv96_direct,
+                        shooting_get_iso_market,
+                        get_focal_length,
+                        get_effective_focal_length,
+                        get_parameter_data,
+                        get_property_case,
+                        &shutter_open_time,
+                        get_raw_pixel,
+                        &state_shooting_progress,
+                        patch_bad_pixel,
+                        
+                        pow_calc,
+                        pow_calc_2,
+
                         0
 };

trunk/core/modules.c

@@ -30 +30 @@
 #endif
 
+// This is to minimize sharing sym to use this lib in other modules
 struct librawop_sym librawop;
 
@@ -243 +244 @@
 }
 
-/************* OTHER MODULES ******/
-
-void module_convert_dng_to_chdk_raw(char* fn)
-{
+
+
+/************* MODULE DNG ******/
+
+#define MODULE_NAME_DNG "_dng.flt"
+
+// This is to keep module in memory while it required by anyone
+static int module_dng_semaphore;
+
+struct libdng_sym libdng;
+
 #if DNG_SUPPORT
-        convert_dng_to_chdk_raw(fn);
-#endif
-}
+static int bind_module_dng( void** export_list )
+{
+          // Unbind
+        if ( !export_list ) {
+                memset(&libdng, 0, sizeof(libdng));
+        return 0;
+        }
+
+        // Bind
+        if ( (unsigned int)export_list[0] != EXPORTLIST_MAGIC_NUMBER )
+             return 1;
+        if ( (unsigned int)export_list[1] < 9 )
+         return 1;
+
+        libdng.size = ((int)export_list[1])-2;
+        libdng.create_badpixel_bin=export_list[2];
+        libdng.raw_init_badpixel_bin=export_list[3];
+        libdng.capture_data_for_exif=export_list[4];
+        libdng.load_bad_pixels_list_b=export_list[5];
+        libdng.badpixel_list_loaded_b=export_list[6];
+
+        libdng.convert_dng_to_chdk_raw=export_list[7];
+        libdng.write_dng=export_list[8];
+        return 0;
+}
+#endif
+
+void module_dng_unload(int owner)
+{
+#if DNG_SUPPORT
+        if (libdng.create_badpixel_bin==0)
+        return;
+
+        module_dng_semaphore&=~owner;
+        if (module_dng_semaphore)
+                return;
+
+        module_unload(MODULE_NAME_DNG);  
+#endif
+}
+
+
+// Return: 0-fail, otherwise - bind list
+struct libdng_sym* module_dng_load(int owner)
+{
+#if DNG_SUPPORT
+  static int module_idx=-1;
+
+  module_dng_semaphore|=owner;
+  if (libdng.create_badpixel_bin)
+     return &libdng;
+
+  module_idx=module_load(MODULE_NAME_DNG, bind_module_dng );
+  if ( module_idx<0 ) {
+         module_unload(MODULE_NAME_DNG);  
+         module_dng_semaphore=0;
+  }
+  else {
+         // This module could be unloaded only manualy (because store badpixel)
+         module_set_flags(module_idx, MODULE_FLAG_DISABLE_AUTOUNLOAD);
+  }
+
+  return (libdng.create_badpixel_bin)?&libdng:0 ;
+#else
+  return 0;
+#endif
+}
+
+// Make convertion or check operation exsitsing
+// Parameter: fn = filename or 0 to just check is operation possible
+// Return: 0-fail, 1-ok
+//--------------------------------------------------------
+int module_convert_dng_to_chdk_raw(char* fn)
+{
+#if DNG_SUPPORT
+        if ( fn==0 )
+                return module_check_is_exist(MODULE_NAME_DNG);
+        if ( !module_dng_load(LIBDNG_OWNED_BY_CONVERT) )
+                return 0;
+        libdng.convert_dng_to_chdk_raw(fn);
+        module_dng_unload(LIBDNG_OWNED_BY_CONVERT);
+        return 1;
+#else
+        return 0;
+#endif
+}

trunk/core/modules.h

@@ -38 +38 @@
 
 
+// MODULE "DNG"
+//--------------------------
+#include "dng.h"
 
-//--------------------------
-void module_convert_dng_to_chdk_raw(char* fn);
+// values of semaphore
+#define LIBDNG_OWNED_BY_RAW                     0x1
+#define LIBDNG_OWNED_BY_CONVERT                 0x2
+#define LIBDNG_OWNED_BY_CREATEBADPIXEL  0x4
+
+struct libdng_sym* module_dng_load(int owner);          // 0fail, addr-ok
+void module_dng_unload(int owner);
+
+int module_convert_dng_to_chdk_raw(char* fn);           // Return: 0-fail, 1-ok
+
 
 

trunk/core/modules/Makefile

@@ -18 +18 @@
 
 OBJS=../gui_calendar.o ../gui_bench.o ../gui_4wins.o ../gui_mastermind.o ../gui_reversi.o \
-         ../gui_sokoban.o ../gui_read.o ../gui_debug.o  ../gui_tetris.o ../gui_snake.o
+         ../gui_sokoban.o ../gui_read.o ../gui_debug.o  ../gui_tetris.o ../gui_snake.o ../dng.o
 
 
@@ -27 +27 @@
 
 all: exportlist ../flt.h \
-                benchm.flt calend.flt 4wins.flt mastmind.flt reversi.flt sokoban.flt _rawop10.flt _rawop12.flt \
+                _dng.flt benchm.flt calend.flt 4wins.flt mastmind.flt reversi.flt sokoban.flt _rawop10.flt _rawop12.flt \
                 txtread.flt memview.flt modinsp.flt tetris.flt snake.flt modmenu.flt $(OPT_FLT)
 
@@ -109 +109 @@
         $(CC) $(CFLAGS) -o $@ -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group $(LDFLAGS) $(LDOPTS)
 
+_dng.elf: ../dng.o $(topdir)/lib/armutil/reversebytes.o
+        @echo \-\> $@
+        $(CC) $(CFLAGS) -o $@ -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group $(LDFLAGS) $(LDOPTS)
+
 _rawop10.elf: raw_merge10.o
         @echo \-\> $@

trunk/core/raw.c

@@ -4 +4 @@
 #include "raw.h"
 #include "console.h"
-#include "dng.h"
-#ifdef OPT_CURVES
-    #include "modules.h"
-#endif
+#include "math.h"
+#include "modules.h"
 #include "shot_histogram.h"
 
@@ -52 +50 @@
     static int br_counter; 
 #if DNG_SUPPORT
-    if (conf.dng_raw) capture_data_for_exif();
+    if (conf.dng_raw) {                             
+                if ( module_dng_load(LIBDNG_OWNED_BY_RAW) )
+                        libdng.capture_data_for_exif();
+        }
 #endif    
     if (state_kbd_script_run && shot_histogram_isenabled()) build_shot_histogram();
@@ -62 +63 @@
 #if DNG_SUPPORT
     // count/save badpixels if requested
-    if(raw_init_badpixel_bin()) {
+    if( libdng.raw_init_badpixel_bin && 
+                libdng.raw_init_badpixel_bin()) {
         return 0;
     }
@@ -145 +147 @@
             if (conf.dng_raw)
             {
-                create_dng_header();
-                write_dng_header(fd);
-                reverse_bytes_order2(rawadr, altrawadr, hook_raw_size());
-                // Write alternate (inactive) buffer that we reversed the bytes into above (if only one buffer then it will be the active buffer instead)
-                write(fd, (char*)(((unsigned long)altrawadr)|CAM_UNCACHED_BIT), hook_raw_size());
+                                if ( module_dng_load(LIBDNG_OWNED_BY_RAW) ) {
+                                        libdng.write_dng(fd, rawadr, altrawadr, CAM_UNCACHED_BIT );
+}
             }
             else 
@@ -158 +158 @@
             close(fd);
             utime(fn, &t);
-
-            if (conf.dng_raw)
-            {
-                if (rawadr == altrawadr)    // If only one RAW buffer then we have to swap the bytes back
-                    reverse_bytes_order2(rawadr, altrawadr, hook_raw_size());
-                free_dng_header();
-            }
 #else
             // Write active RAW buffer
@@ -286 +279 @@
 }
 
-void make_pixel_list(char * ptr) {
+#define PIXELS_BUF_SIZE 8192
+int make_pixel_list(char * ptr, int size) {
     int x,y;
     struct point *pixel;
     char *endptr;
+        
+        if ( size <=0 ) return 0;
+        if ( size >PIXELS_BUF_SIZE ) ptr[PIXELS_BUF_SIZE]=0;
+
     while(*ptr) {
         while (*ptr==' ' || *ptr=='\t') ++ptr;    // whitespaces
@@ -315 +313 @@
         if (*ptr) ++ptr;
     }
-}
-
-#define PIXELS_BUF_SIZE 8192
-void load_bad_pixels_list(const char* filename) {
-    char *buf;
-    int fd;
-
-    if (filename) {
-        buf = umalloc(PIXELS_BUF_SIZE);
-        if (!buf) return;
-
-        fd = open(filename, O_RDONLY, 0777);
-        if (fd>=0) {
-            int rcnt = read(fd, buf, PIXELS_BUF_SIZE);
-            if (rcnt > 0) {
-                if (rcnt == PIXELS_BUF_SIZE) 
-                buf[PIXELS_BUF_SIZE-1] = 0;
+        return 0;
+}
+
+int pow_calc( int mult, int x, int x_div, int y, int y_div)
+{
+        return pow_calc_2( mult, x, x_div, y, y_div);
+}
+
+int pow_calc_2( int mult, int x, int x_div, double y, int y_div)
+{
+        double x1 = x;
+        if ( x_div != 1 ) { x1=x1/x_div;}
+        if ( y_div != 1 ) { y=y/y_div;}
+
+        if ( mult==1 )
+                return pow( x1, y );
                 else
-                buf[rcnt] = 0;
-            }
-            close(fd);
-        }
-        make_pixel_list(buf);    
-        ufree(buf);
-    }
-
-}
+                return mult     * pow( x1, y );
+}

trunk/core/raw.h

@@ -23 +23 @@
 extern void raw_postprocess();
 extern void raw_prepare_develop(const char* filename);
-extern void load_bad_pixels_list(const char* filename);
+extern int make_pixel_list(char * ptr, int size);
 extern unsigned short get_raw_pixel(unsigned int x,unsigned  int y);
 extern char* get_raw_image_addr(void);
 extern void patch_bad_pixel(unsigned int x,unsigned  int y);
 
+
+// = mult * pow ( x/xdiv, y/ydiv)
+extern int pow_calc( int mult, int x, int x_div, int y, int y_div);
+extern int pow_calc_2( int mult, int x, int x_div, double y, int y_div);
+
 //-------------------------------------------------------------------
 #endif

trunk/lib/armutil/Makefile

@@ -3 +3 @@
 include $(topdir)makefile.inc
 
-OBJS = reversebytes.o callfunc.o reboot.o
+OBJS = callfunc.o reboot.o
 
-all: libarmutil.a
+OBJS_ALL = $(OBJS)
+OBJS_ALL += reversebytes.o 
+
+all: libarmutil.a reversebytes.o 
 
 libarmutil.a: $(OBJS)
 
 clean:
-        rm -f $(OBJS) libarmutil.a
+        rm -f $(OBJS_ALL) libarmutil.a
 
 distclean: clean
-        rm -f $(OBJS:.o=.d)
+        rm -f $(OBJS_ALL:.o=.d)
 
 include $(topdir)bottom.inc