X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fxfer.h;h=84098b511f6563af6a6b575fb32aa26226313eaa;hb=9f917bc27389ebc36568a1f465b42208f7e8e46a;hp=ddbca7f07636e586ea81e2026d32e19edcda1b48;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/xfer.h b/cinelerra-5.1/guicast/xfer.h
index ddbca7f0..84098b51 100644
--- a/cinelerra-5.1/guicast/xfer.h
+++ b/cinelerra-5.1/guicast/xfer.h
@@ -1,4 +1,9 @@
 #include "bccmodels.h"
+#include "bcresources.h"
+#include "condition.h"
+#include "linklist.h"
+#include "mutex.h"
+#include "thread.h"
 #include "clip.h"
 
 static inline float clp(const int n, float v) {
@@ -78,7 +83,7 @@ ZTYP(float);
 
 
 #define xfer_flat_row_out(oty_t) \
-  for( unsigned i=0; i<out_h; ++i ) { \
+  for( unsigned i=y0; i<y1; ++i ) { \
     oty_t *out = (oty_t *)(output_rows[i + out_y] + out_x * out_pixelsize); \
 
 #define xfer_flat_row_in(ity_t) \
@@ -90,7 +95,7 @@ ZTYP(float);
 
 // yuv420p  2x2
 #define xfer_yuv420p_row_out(oty_t) \
-  for( unsigned i=0; i<out_h; ++i ) { \
+  for( unsigned i=y0; i<y1; ++i ) { \
     int out_rofs = i * total_out_w + out_x; \
     oty_t *yop = (oty_t *)(out_yp + out_rofs); \
     out_rofs = i / 2 * total_out_w / 2 + out_x / 2; \
@@ -98,9 +103,35 @@ ZTYP(float);
     oty_t *vop = (oty_t *)(out_vp + out_rofs); \
 
 #define xfer_yuv420p_row_in(ity_t) \
-    int in_rofs = row_table[i] * total_in_w; \
+    int in_r = row_table[i]; \
+    int in_rofs = in_r * total_in_w; \
+    uint8_t *yip_row = in_yp + in_rofs; \
+    in_rofs = in_r / 2 * total_in_w / 2; \
+    uint8_t *uip_row = in_up + in_rofs; \
+    uint8_t *vip_row = in_vp + in_rofs; \
+    for( unsigned j=0; j<out_w; ++j ) { \
+      int in_ofs = column_table[j]; \
+      ity_t *yip = (ity_t *)(yip_row + in_ofs); \
+      in_ofs /= 2; \
+      ity_t *uip = (ity_t *)(uip_row + in_ofs); \
+      ity_t *vip = (ity_t *)(vip_row + in_ofs); \
+
+// yuv420pi  2x2
+#define xfer_yuv420pi_row_out(oty_t) \
+  for( unsigned i=y0; i<y1; ++i ) { \
+    int out_rofs = i * total_out_w + out_x; \
+    oty_t *yop = (oty_t *)(out_yp + out_rofs); \
+    int ot_k = ((i/4)<<1) + (i&1); \
+    out_rofs = ot_k * total_out_w / 2 + out_x / 2; \
+    oty_t *uop = (oty_t *)(out_up + out_rofs); \
+    oty_t *vop = (oty_t *)(out_vp + out_rofs); \
+
+#define xfer_yuv420pi_row_in(ity_t) \
+    int in_r = row_table[i]; \
+    int in_rofs = in_r * total_in_w; \
     uint8_t *yip_row = in_yp + in_rofs; \
-    in_rofs = row_table[i] / 2 * total_in_w / 2; \
+    int in_k = ((in_r/4)<<1) + (in_r&1); \
+    in_rofs = in_k * total_in_w / 2; \
     uint8_t *uip_row = in_up + in_rofs; \
     uint8_t *vip_row = in_vp + in_rofs; \
     for( unsigned j=0; j<out_w; ++j ) { \
@@ -112,7 +143,7 @@ ZTYP(float);
 
 // yuv422p  2x1
 #define xfer_yuv422p_row_out(oty_t) \
-  for( unsigned i=0; i<out_h; ++i ) { \
+  for( unsigned i=y0; i<y1; ++i ) { \
     int out_rofs = i * total_out_w + out_x; \
     oty_t *yop = (oty_t *)(out_yp + out_rofs); \
     out_rofs = i * total_out_w / 2 + out_x / 2; \
@@ -134,7 +165,7 @@ ZTYP(float);
 
 // yuv444p  1x1
 #define xfer_yuv444p_row_out(oty_t) \
-  for( unsigned i=0; i<out_h; ++i ) { \
+  for( unsigned i=y0; i<y1; ++i ) { \
     int out_rofs = i * total_out_w + out_x; \
     oty_t *yop = (oty_t *)((oty_t *)(out_yp + out_rofs)); \
     oty_t *uop = (oty_t *)(out_up + out_rofs); \
@@ -153,7 +184,7 @@ ZTYP(float);
 
 // yuv411p  4x1
 #define xfer_yuv411p_row_out(oty_t) \
-  for( unsigned i=0; i<out_h; ++i ) { \
+  for( unsigned i=y0; i<y1; ++i ) { \
     int out_rofs = i * total_out_w + out_x; \
     oty_t *yop = (oty_t *)(out_yp + out_rofs); \
     out_rofs = i * total_out_w / 4 + out_x / 4; \
@@ -175,7 +206,7 @@ ZTYP(float);
 
 // yuv410p  4x4
 #define xfer_yuv410p_row_out(oty_t) \
-  for( unsigned i=0; i<out_h; ++i ) { \
+  for( unsigned i=y0; i<y1; ++i ) { \
     int out_rofs = i * total_out_w + out_x; \
     oty_t *yop = (oty_t *)(out_yp + out_rofs); \
     out_rofs = i / 4 * total_out_w / 4 + out_x / 4; \
@@ -197,7 +228,7 @@ ZTYP(float);
 
 // rgb_floatp
 #define xfer_rgb_fltp_row_out(oty_t) \
-  for( unsigned i=0; i<out_h; ++i ) { \
+  for( unsigned i=y0; i<y1; ++i ) { \
     int out_rofs = i * total_out_w + out_x; \
     oty_t *rop = (oty_t *)(out_yp + out_rofs); \
     oty_t *gop = (oty_t *)(out_up + out_rofs); \
@@ -262,6 +293,30 @@ public:
   uint32_t bg_r, bg_g, bg_b;
 
   void xfer();
+  void xfer_slices(int slices);
+  typedef void (BC_Xfer::*xfer_fn)(unsigned y0, unsigned y1);
+  xfer_fn xfn;
+
+  class Slicer : public ListItem<Slicer>, public Thread {
+  public:
+    Condition *init, *complete;
+    Slicer(BC_Xfer *xp);
+    ~Slicer();
+    void slice(BC_Xfer *xp, unsigned y0, unsigned y1);
+    void run();
+    BC_Xfer *xp;
+    int done, y0, y1;
+  };
+
+  class SlicerList : public List<Slicer>, public Mutex {
+  public:
+    int count;
+    Slicer *get_slicer(BC_Xfer *xp);
+    void reset();
+    SlicerList();
+    ~SlicerList();
+  };
+  static SlicerList slicers;
 
   static void init();
   static class Tables { public: Tables() { init(); } } tables;