there is some systematic error, htat i cannot see

Author: maruncz

src/common/imageio_rawspeed.cc

@@ -515,7 +515,7 @@ dt_imageio_retval_t dt_imageio_open_rawspeed(dt_image_t *img, const char *filena
       const size_t bufSize_mipmap = (size_t)img->width * img->height * img->buf_dsc.frames * r.get(0)->getBpp();
       const size_t bufSize_rawspeed = (size_t)r.get(0)->pitch * dimUncropped.y * r.size();
       const size_t frame_size = bufSize_mipmap / r.size();
-      printf("size mipmap: %lu\n size raw: %lu\nsize frame: %lu\n",bufSize_mipmap,bufSize_rawspeed,frame_size);
+      fprintf(stderr,"[rawspeed] size mipmap: %lu, size raw: %lu, size frame: %lu\n",bufSize_mipmap,bufSize_rawspeed,frame_size);
       for(size_t i = 0; i < r.size(); ++i)
       {
         dt_imageio_flip_buffers(((char *)buf) + (i * frame_size), (char *)r.get(i)->getDataUncropped(0, 0),

src/develop/pixelpipe_hb.c

@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-//#define DEBUG_PIXELPIPE
+#define DEBUG_PIXELPIPE
 
 typedef enum dt_pixelpipe_flow_t
 {
@@ -112,6 +112,11 @@ static char *_pipe_type_to_str(int pipe_type)
 #ifdef DEBUG_PIXELPIPE
 static void save_debug_bitmap(dt_dev_pixelpipe_t *pipe, const char *name, void *out, const dt_iop_roi_t *roi_out)
 {
+  /*if(pipe->type != DT_DEV_PIXELPIPE_FULL)
+  {
+    return;
+  }*/
+
   char filename[128];
   snprintf(filename, 128, "save_debug_bitmap_%s_%s.pfm", name, _pipe_type_to_str(pipe->type));
   for(int i = 0; i < 128; ++i)
@@ -1227,6 +1232,7 @@ static int dt_dev_pixelpipe_process_rec(dt_dev_pixelpipe_t *pipe, dt_develop_t *
           const int in_y = MAX(roi_in.y, 0);
           const int cp_width = MAX(0, MIN(roi_out->width, pipe->iwidth - in_x));
           const int cp_height = MIN(roi_out->height, pipe->iheight - in_y);
+          const int frames = pipe->dsc.frames;
 
           if (cp_width > 0)
           {
@@ -1236,7 +1242,7 @@ static int dt_dev_pixelpipe_process_rec(dt_dev_pixelpipe_t *pipe, dt_develop_t *
           shared(pipe, roi_out, roi_in, output) \
           schedule(static)
 #endif
-            for(int j = 0; j < cp_height; j++)
+            for(int j = 0; j < cp_height * frames; j++)
               memcpy(((char *)*output) + (size_t)bpp * j * roi_out->width,
                      ((char *)pipe->input) + (size_t)bpp * (in_x + (in_y + j) * pipe->iwidth),
                      (size_t)bpp * cp_width);

src/iop/demosaic.c

@@ -2963,57 +2963,34 @@ void process_pixelshift(dt_dev_pixelpipe_iop_t *piece, const float *const in, fl
   fprintf(stderr, "roi in %d %d %d %d\n", roi_in->x, roi_in->y, roi_in->width, roi_in->height);
   fprintf(stderr, "roi out %d %d %d %d\n", roi_out->x, roi_out->y, roi_out->width, roi_out->height);
 
-  const size_t ox = roi_in->x;
-  const size_t oy = roi_in->y;
+  /*__asan_describe_address((void*)in);
+  fflush(stdout);
+  fflush(stderr);*/
 
+  //const size_t ox = roi_in->x;
+  //const size_t oy = roi_in->y;
 
   size_t pout = 0;
-  size_t pin = 0;
+  //size_t pin = 0;
+  size_t pin3 = 0;
   for(size_t j = 0; j < roi_out->height; j++)
   {
     for(size_t i = 0; i < roi_out->width; i++)
     {
-      pout = (size_t)4 * ((roi_out->width * j) + i);
-      pin = (roi_in->width * (j + oy)) + ox + i;
+      pout = (size_t)4 * (((size_t)roi_out->width * j) + i);
+      //pin = (roi_in->width * (j + oy)) + ox + i;
+      ///TODO why do i ignore offset of input roi?
+      pin3 = (roi_in->width * j) + i;
 
-      if(pin >= 24000000)
-      {
-        fprintf(stderr,"input overflow\n");
-      }
-
-      if(pin >= 24000000)
-      {
-        fprintf(stderr,"input overflow\n");
-      }
-
-      if(pout >= ((size_t)4*roi_out->height*roi_out->width))
+      if(pout+3 >= ((size_t)4*((size_t)roi_out->height*roi_out->width)))
       {
         fprintf(stderr,"output overflow\n");
       }
 
       for(size_t c=0;c<3;++c)
       {
-        out[pout+c] = (frames_in[0])[pin];
-        //out[pout+c] = (float) pin / ((float) roi_out->height * roi_out->width);
+        out[pout+c] = (frames_in[1])[pin3];
       }
-
-      /*out[pout + 0] = (float) j / (float) roi_out->height;
-      out[pout + 1] = (float) i / (float) roi_out->width;
-      out[pout + 2] = 0.0f;
-      out[pout + 3] = 0.0f;*/
-
-
-
-      //out[pout + 0] = frames_in[0][pin];
-
-      /*out[pout + 1] = (frames_in[0][pin] + frames_in[0][pin]) / 2.0f;
-
-      out[pout + 2] = frames_in[0][pin];*/
-
-      /*out[pout] = 1.0f;
-      out[pout+1] = 0.0f;
-      out[pout+2] = 0.0f;
-      out[pout+3] = 0.0f;*/
     }
   }
   fprintf(stderr,"pout: %lu\n", pout+4);

src/iop/rawprepare.c

@@ -284,7 +284,6 @@ static void convert_uint_float(const uint16_t *const in, float *const out, const
 
       const int id = BL(roi_out, d, j, i);
       out[pout] = (in[pin] - d->sub[id]) / d->div[id];
-      //out[pout] = ((j/10)%2)?1.0f:0.0f;
     }
   }
 }
@@ -344,6 +343,7 @@ void process(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, const
 {
   const dt_iop_rawprepare_data_t *const d = (dt_iop_rawprepare_data_t *)piece->data;
 
+  //fprintf(stderr,"rawprepare %s\n", dt_pixelpipe_name(piece->pipe->type));
   /*fprintf(stderr, "roi in %d %d %d %d\n", roi_in->x, roi_in->y, roi_in->width, roi_in->height);
   fprintf(stderr, "roi out %d %d %d %d\n", roi_out->x, roi_out->y, roi_out->width, roi_out->height);
   fprintf(stderr,"frame size in:  %d\n", roi_in->width * roi_in->height);