Changeset 1849

Timestamp:

05/11/12 08:28:19 (13 months ago)

Author:

msl

Message:

RAW merge function

• author: naddel
• link: ​http://forum.chdk-treff.de/viewtopic.php?p=25739#p25739

+ Remove redundant code in raw_merge_add_file and raw_merge_end.
+ Release memory if raw_merge_end fails.
+ Don't average or sum if only one file.

File:

• trunk/core/raw_merge.c (modified) (5 diffs)

trunk/core/raw_merge.c

@@ -230 +230 @@
       fbrawout=fopen(TEMP_FILE_NAME_1,"w+b");
       if (fbrawout){
-        fread(rawrow, 1, camera_sensor.raw_rowlen, fcraw);
-        if (raw_count) 
-          fread(row, 1, camera_sensor.raw_rowpix*sizeof(unsigned short), fbrawin); 
-        else
-          for (i=0;i<camera_sensor.raw_rowpix;i++)
-            row[i]=0;
-
         for (nrow=0,j=0;nrow<camera_sensor.raw_rows;nrow++,j++){
+          if (raw_count)
+            fread(row, 1, camera_sensor.raw_rowpix*sizeof(unsigned short), fbrawin);
+          else
+            for (i=0;i<camera_sensor.raw_rowpix;i++)
+              row[i]=0;
+          fread(rawrow, 1, camera_sensor.raw_rowlen, fcraw);
 
 #if CAM_MODULE_SENSOR_BITS_PER_PIXEL==10
@@ -266 +265 @@
 
           fwrite(row, 1, camera_sensor.raw_rowpix*sizeof(unsigned short), fbrawout);
-          if (raw_count)
-            fread(row, 1, camera_sensor.raw_rowpix*sizeof(unsigned short), fbrawin);
-          else
-            for (i=0;i<camera_sensor.raw_rowpix;i++)
-              row[i]=0;
-          fread(rawrow, 1, camera_sensor.raw_rowlen, fcraw);
           if (j>=camera_sensor.raw_rows/10) {
             j-=camera_sensor.raw_rows/10;
@@ -296 +289 @@
   FILE *fbraw, *fcraw;
   static struct utimbuf t;
-  if (!raw_count)
+  if (!raw_count) {
+    free(rawrow);
+    free(row);
     return;
-
+  } 
   i=strlen(namebuf)-3;
   if (strncmp(namebuf+i,"CR",2)==0)
@@ -310 +305 @@
     fcraw=fopen(namebuf,"w+b");
     if (fcraw) {
-      fread(row, 1, camera_sensor.raw_rowpix*sizeof(unsigned short), fbraw);
       for (nrow=0,j=0;nrow<camera_sensor.raw_rows;nrow++,j++) {
-        for (i=0;i<camera_sensor.raw_rowpix;i++) {
-          if (raw_action==RAW_OPERATION_AVERAGE)
-            row[i]/=raw_count;
-          else {
-            if (row[i]>camera_sensor.black_level*(raw_count-1))
-              row[i]-=camera_sensor.black_level*(raw_count-1);
-            else
-              row[i]=0;
-            if (row[i]>camera_sensor.white_level)
-              row[i]=camera_sensor.white_level;
-          }
+        fread(row, 1, camera_sensor.raw_rowpix*sizeof(unsigned short), fbraw);
+
+        if (raw_count>1) {
+          for (i=0;i<camera_sensor.raw_rowpix;i++) {
+            if (raw_action==RAW_OPERATION_AVERAGE)
+              row[i]/=raw_count;
+            else {
+              if (row[i]>camera_sensor.black_level*(raw_count-1))
+                row[i]-=camera_sensor.black_level*(raw_count-1);
+              else
+                row[i]=0;
+              if (row[i]>camera_sensor.white_level)
+                row[i]=camera_sensor.white_level;
+            }
+          }  
         }
 #if CAM_MODULE_SENSOR_BITS_PER_PIXEL==10
@@ -351 +349 @@
 
         fwrite(rawrow, 1, camera_sensor.raw_rowlen, fcraw);
-        fread(row, 1, camera_sensor.raw_rowpix*sizeof(unsigned short), fbraw);
         if (j>=camera_sensor.raw_rows/5) {
           j-=camera_sensor.raw_rows/5;