[ingex-commits] ingex/studio/capture bmd_sdi.cpp, 1.2, 1.3 dvs_sdi.cpp, 1.31, 1.32

[John F. <jo...@us...>]

Update of /cvsroot/ingex/ingex/studio/capture
In directory vz-cvs-4.sog:/tmp/cvs-serv30673

Modified Files:
	bmd_sdi.cpp dvs_sdi.cpp 
Log Message:
Updates re. YUVlib


Index: bmd_sdi.cpp
===================================================================
RCS file: /cvsroot/ingex/ingex/studio/capture/bmd_sdi.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bmd_sdi.cpp	24 Jan 2012 15:18:42 -0000	1.2
--- bmd_sdi.cpp	10 Feb 2012 15:20:53 -0000	1.3
***************
*** 175,178 ****
--- 175,179 ----
  uint8_t *hd2sd_interm2[MAX_CHANNELS];
  uint8_t *hd2sd_workspace[MAX_CHANNELS];
+ size_t hd2sd_workspace_size;
  
  //pthread_mutex_t m_log = PTHREAD_MUTEX_INITIALIZER;      // logging mutex to prevent intermixing logs
***************
*** 944,948 ****
                                interlace,
                                use_yuvlib_filter, use_yuvlib_filter,
!                               hd2sd_workspace[chan]);
      #else
      // More efficient if we first scale by a factor of 2 horizontally
--- 945,949 ----
                                interlace,
                                use_yuvlib_filter, use_yuvlib_filter,
!                               hd2sd_workspace[chan], hd2sd_workspace_size);
      #else
      // More efficient if we first scale by a factor of 2 horizontally
***************
*** 954,958 ****
                                interlace,
                                use_yuvlib_filter, use_yuvlib_filter,
!                               hd2sd_workspace[m_Index]);
  
                      scale_pic(&yuv_int_frame, &yuv_sd_frame,
--- 955,959 ----
                                interlace,
                                use_yuvlib_filter, use_yuvlib_filter,
!                               hd2sd_workspace[m_Index], hd2sd_workspace_size);
  
                      scale_pic(&yuv_int_frame, &yuv_sd_frame,
***************
*** 960,964 ****
                                interlace,
                                use_yuvlib_filter, use_yuvlib_filter,
!                               hd2sd_workspace[m_Index]);
      #endif
                  }
--- 961,965 ----
                                interlace,
                                use_yuvlib_filter, use_yuvlib_filter,
!                               hd2sd_workspace[m_Index], hd2sd_workspace_size);
      #endif
                  }
***************
*** 2376,2380 ****
              }
  
!             hd2sd_workspace[chan] = (uint8_t *)malloc(2*width*4);
              if (!hd2sd_workspace[chan])
              {
--- 2377,2382 ----
              }
  
!             hd2sd_workspace_size = 2 * width * 4;
!             hd2sd_workspace[chan] = (uint8_t *)malloc(hd2sd_workspace_size);
              if (!hd2sd_workspace[chan])
              {

Index: dvs_sdi.cpp
===================================================================
RCS file: /cvsroot/ingex/ingex/studio/capture/dvs_sdi.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** dvs_sdi.cpp	24 Jan 2012 15:15:58 -0000	1.31
--- dvs_sdi.cpp	10 Feb 2012 15:20:53 -0000	1.32
***************
*** 156,159 ****
--- 156,160 ----
  uint8_t *hd2sd_interm2[MAX_CHANNELS];
  uint8_t *hd2sd_workspace[MAX_CHANNELS];
+ size_t hd2sd_workspace_size;
  
  int last_ltc_bits[MAX_CHANNELS];
***************
*** 1637,1641 ****
                            interlace,
                            use_yuvlib_filter, use_yuvlib_filter,
!                           hd2sd_workspace[chan]);
  #else
  // More efficient if we first scale by a factor of 2 horizontally
--- 1638,1642 ----
                            interlace,
                            use_yuvlib_filter, use_yuvlib_filter,
!                           hd2sd_workspace[chan], hd2sd_workspace_size);
  #else
  // More efficient if we first scale by a factor of 2 horizontally
***************
*** 1647,1651 ****
                            interlace,
                            use_yuvlib_filter, use_yuvlib_filter,
!                           hd2sd_workspace[chan]);
  
                  scale_pic(&yuv_int_frame, &yuv_sd_frame,
--- 1648,1652 ----
                            interlace,
                            use_yuvlib_filter, use_yuvlib_filter,
!                           hd2sd_workspace[chan], hd2sd_workspace_size);
  
                  scale_pic(&yuv_int_frame, &yuv_sd_frame,
***************
*** 1653,1657 ****
                            interlace,
                            use_yuvlib_filter, use_yuvlib_filter,
!                           hd2sd_workspace[chan]);
  #endif
              }
--- 1654,1658 ----
                            interlace,
                            use_yuvlib_filter, use_yuvlib_filter,
!                           hd2sd_workspace[chan], hd2sd_workspace_size);
  #endif
              }
***************
*** 3632,3636 ****
              }
  
!             hd2sd_workspace[chan] = (uint8_t *)malloc(2*width*4);
              if (!hd2sd_workspace[chan])
              {
--- 3633,3638 ----
              }
  
!             hd2sd_workspace_size = 2 * width * 4;
!             hd2sd_workspace[chan] = (uint8_t *)malloc(hd2sd_workspace_size);
              if (!hd2sd_workspace[chan])
              {