looks like issue with frame offset input to rawprepare

Author: maruncz

src/common/imageio_rawspeed.cc

@@ -518,6 +518,7 @@ dt_imageio_retval_t dt_imageio_open_rawspeed(dt_image_t *img, const char *filena
       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)
       {
+        fprintf(stderr,"[rawspeed] frame %lu, %p\n",i, (void*)((char *)buf + (i*frame_size)));
         dt_imageio_flip_buffers(((char *)buf) + (i * frame_size), (char *)r.get(i)->getDataUncropped(0, 0),
                                 r.get(i)->getBpp(), dimUncropped.x, dimUncropped.y, dimUncropped.x, dimUncropped.y,
                                 r.get(i)->pitch, ORIENTATION_NONE);

src/develop/imageop.h

@@ -28,7 +28,6 @@ typedef struct dt_iop_roi_t
 {
   int x, y, width, height;
   float scale;
-  int frame_offset;
 } dt_iop_roi_t;
 
 #include "common/darktable.h"

src/develop/pixelpipe_hb.c

@@ -112,10 +112,10 @@ 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)
+  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));
@@ -150,7 +150,18 @@ static void save_debug_bitmap(dt_dev_pixelpipe_t *pipe, const char *name, void *
   float *ptr = (float *)out;
   if((pipe->dsc.channels == 1) || (pipe->dsc.channels == 3))
   {
-    fwrite(ptr, sizeof(float), roi_out->height * roi_out->width * pipe->dsc.channels * pipe->dsc.frames, file);
+    for(size_t f = 0; f < pipe->dsc.frames; ++f)
+    {
+      float *tmp = ptr + (f * roi_out->width * roi_out->height);
+      for(size_t i = 0; i < roi_out->width; ++i)
+      {
+        for(size_t j = 0; j < roi_out->height; ++j)
+        {
+          const size_t pout = j + (roi_out->height * (i));
+          fwrite(tmp + pout, sizeof(float) * pipe->dsc.channels, 1, file);
+        }
+      }
+    }
   }
   else
   {

src/iop/demosaic.c

@@ -2951,6 +2951,7 @@ void process_pixelshift(dt_dev_pixelpipe_iop_t *piece, const float *const in, fl
   for(int f = 0; f < 4; ++f)
   {
     frames_in[f] = in + (f * roi_in->width * roi_in->height);
+    fprintf(stderr, "frame %i: %p\n", f, frames_in[f]);
   }
 
   if(piece->dsc_out.channels != 4)
@@ -2990,7 +2991,7 @@ void process_pixelshift(dt_dev_pixelpipe_iop_t *piece, const float *const in, fl
 
       for(size_t c=0;c<3;++c)
       {
-        out[pout+c] = (frames_in[0])[pin3];
+        out[pout+c] = (frames_in[2])[pin3];
       }
     }
   }

src/iop/rawprepare.c

@@ -212,14 +212,6 @@ void modify_roi_out(dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, dt_iop
   const float scale = roi_in->scale / piece->iscale;
   roi_out->width -= (int)roundf((float)x * scale);
   roi_out->height -= (int)roundf((float)y * scale);
-
-  if(piece->pipe->type & (DT_DEV_PIXELPIPE_FULL | DT_DEV_PIXELPIPE_EXPORT))
-  {
-    if(piece->pipe->image.buf_dsc.frames > 1)
-    {
-      roi_out->frame_offset = roi_out->width * roi_out->height;
-    }
-  }
 }
 
 void modify_roi_in(dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, const dt_iop_roi_t *const roi_out,
@@ -283,7 +275,7 @@ static void convert_uint_float(const uint16_t *const in, float *const out, const
     dt_omp_firstprivate(csx, csy, d, in, out, roi_in, roi_out)          \
     schedule(static) collapse(2)
 #endif
-  for(int j = 0; j < roi_out->height; j++)
+  for(int j = 0; j < roi_out->height-100; j++)
   {
     for(int i = 0; i < roi_out->width; i++)
     {
@@ -294,6 +286,18 @@ static void convert_uint_float(const uint16_t *const in, float *const out, const
       out[pout] = (in[pin] - d->sub[id]) / d->div[id];
     }
   }
+
+  for(int j = roi_out->height-100; j < roi_out->height; j++)
+  {
+    for(int i = 0; i < roi_out->width; i++)
+    {
+      //const size_t pin = (size_t)(roi_in->width * (j + csy) + csx) + i;
+      const size_t pout = (size_t)j * roi_out->width + i;
+
+
+      out[pout] = 0.0f;
+    }
+  }
 }
 
 static void convert_float_float(const float *const in, float *const out, const dt_iop_roi_t *const roi_in,
@@ -374,6 +378,11 @@ void process(struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, const
       const uint16_t *const frame_in = in + (f * roi_in->width * roi_in->height);
       float *const frame_out = out + (f * roi_out->width * roi_out->height);
       convert_uint_float(frame_in, frame_out, roi_in, roi_out, csx, csy, d);
+      fprintf(stderr, "frame %lu: %p\n", f, frame_in);
+      /*for(size_t i=0;i<roi_out->width * roi_out->height;++i)
+      {
+        frame_out[i] = (float)f / (float)piece->dsc_out.frames;
+      }*/
     }
 
     piece->pipe->dsc.filters = dt_rawspeed_crop_dcraw_filters(self->dev->image_storage.buf_dsc.filters, csx, csy);