Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibVideoIO

Timestamp:

20 Feb 2013, 22:07:43 (12 years ago)

Author:

tech

Message:

Reintegrated branch 5.1-dev0 rev. 295.

Location:

trunk/source/Lib/TLibVideoIO

Files:

• TVideoIOYuv.cpp (modified) (4 diffs)
• TVideoIOYuv.h (modified) (1 diff)

trunk/source/Lib/TLibVideoIO/TVideoIOYuv.cpp

@@ -413 +413 @@
  * @return true for success, false in case of error
  */
-#if PIC_CROPPING
 Bool TVideoIOYuv::write( TComPicYuv* pPicYuv, Int cropLeft, Int cropRight, Int cropTop, Int cropBottom )
-#else
-bool TVideoIOYuv::write( TComPicYuv* pPicYuv, Int aiPad[2] )
-#endif
 {
   // compute actual YUV frame size excluding padding size
   Int   iStride = pPicYuv->getStride();
-#if PIC_CROPPING
   UInt  width  = pPicYuv->getWidth()  - cropLeft - cropRight;
   UInt  height = pPicYuv->getHeight() - cropTop  - cropBottom;
-#else
-  unsigned int width  = pPicYuv->getWidth() - aiPad[0];
-  unsigned int height = pPicYuv->getHeight() - aiPad[1];
-#endif
   bool is16bit = m_fileBitdepth > 8;
   TComPicYuv *dstPicYuv = NULL;
@@ -456 +447 @@
     dstPicYuv = pPicYuv;
   }
-#if PIC_CROPPING
   // location of upper left pel in a plane
   Int planeOffset = 0; //cropLeft + cropTop * iStride;
   
   if (! writePlane(m_cHandle, dstPicYuv->getLumaAddr() + planeOffset, is16bit, iStride, width, height))
-#else
-  if (! writePlane(m_cHandle, dstPicYuv->getLumaAddr(), is16bit, iStride, width, height))
-#endif
   {
     retval=false; 
@@ -472 +459 @@
   height >>= 1;
   iStride >>= 1;
-#if PIC_CROPPING
   cropLeft >>= 1;
   cropRight >>= 1;
@@ -479 +465 @@
 
   if (! writePlane(m_cHandle, dstPicYuv->getCbAddr() + planeOffset, is16bit, iStride, width, height))
-#else
-  if (! writePlane(m_cHandle, dstPicYuv->getCbAddr(), is16bit, iStride, width, height))
-#endif
   {
     retval=false; 
     goto exit;
   }
-#if PIC_CROPPING
   if (! writePlane(m_cHandle, dstPicYuv->getCrAddr() + planeOffset, is16bit, iStride, width, height))
-#else
-  if (! writePlane(m_cHandle, dstPicYuv->getCrAddr(), is16bit, iStride, width, height))
-#endif
   {
     retval=false; 

trunk/source/Lib/TLibVideoIO/TVideoIOYuv.h

@@ -69 +69 @@
   
   bool  read  ( TComPicYuv*   pPicYuv, Int aiPad[2], Bool bRewind = false );     ///< read  one YUV frame with padding parameter
-#if PIC_CROPPING
   Bool  write( TComPicYuv*    pPicYuv, Int cropLeft=0, Int cropRight=0, Int cropTop=0, Int cropBottom=0 );
-#else
-  bool  write ( TComPicYuv*   pPicYuv, Int aiPad[2] );     ///< write one YUV frame with padding parameter
-#endif
   
   bool  isEof ();                                           ///< check for end-of-file