looks ok, but still issues with frame offset

Author: maruncz

src/develop/imageop.h

@@ -28,6 +28,7 @@ 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/iop/demosaic.c

@@ -2950,8 +2950,7 @@ void process_pixelshift(dt_dev_pixelpipe_iop_t *piece, const float *const in, fl
   float const * frames_in[4];
   for(int f = 0; f < 4; ++f)
   {
-    /// TODO need original size here
-    frames_in[f] = in + (f * piece->buf_in.width * piece->buf_in.height);
+    frames_in[f] = in + (f * roi_in->width * roi_in->height);
   }
 
   if(piece->dsc_out.channels != 4)
@@ -2962,6 +2961,8 @@ void process_pixelshift(dt_dev_pixelpipe_iop_t *piece, const float *const in, fl
   fprintf(stderr, "pixelshift enabled, pipe type: %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, "i: %p\n",in);
+  fprintf(stderr, "o: %p\n",out);
 
   /*__asan_describe_address((void*)in);
   fflush(stdout);
@@ -2989,7 +2990,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[1])[pin3];
+        out[pout+c] = (frames_in[0])[pin3];
       }
     }
   }

src/iop/rawprepare.c

@@ -212,6 +212,14 @@ 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,
@@ -343,13 +351,13 @@ 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,"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);
-  fprintf(stderr,"frame size iout: %d\n", roi_out->width * roi_out->height);
+  /*fprintf(stderr,"frame size in:  %d\n", roi_in->width * roi_in->height);
+  fprintf(stderr,"frame size iout: %d\n", roi_out->width * roi_out->height);*/
   fprintf(stderr,"i: %p\n",ivoid);
-  fprintf(stderr,"o: %p\n",ovoid);*/
+  fprintf(stderr,"o: %p\n",ovoid);
 
   const int csx = compute_proper_crop(piece, roi_in, d->x);
   const int csy = compute_proper_crop(piece, roi_in, d->y);