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

Timestamp:

1 Sep 2013, 22:47:26 (11 years ago)

Author:

tech

Message:

Merged DEV-2.0-dev0@604.

Location:

trunk/source/Lib/TLibVideoIO

Files:

• TVideoIOYuv.cpp (modified) (23 diffs)
• TVideoIOYuv.h (modified) (4 diffs)

trunk/source/Lib/TLibVideoIO/TVideoIOYuv.cpp

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -60 +60 @@
  * @param maxval     maximum clipping value
  */
-static void invScalePlane(Pel* img, unsigned int stride, unsigned int width, unsigned int height,
-                       unsigned int shiftbits, Pel minval, Pel maxval)
+static void invScalePlane(Pel* img, UInt stride, UInt width, UInt height,
+                       UInt shiftbits, Pel minval, Pel maxval)
 {
   Pel offset = 1 << (shiftbits-1);
-  for (unsigned int y = 0; y < height; y++)
-  {
-    for (unsigned int x = 0; x < width; x++)
+  for (UInt y = 0; y < height; y++)
+  {
+    for (UInt x = 0; x < width; x++)
     {
       Pel val = (img[x] + offset) >> shiftbits;
@@ -84 +84 @@
  * @param shiftbits  number of bits to shift
  */
-static void scalePlane(Pel* img, unsigned int stride, unsigned int width, unsigned int height,
-                       unsigned int shiftbits)
-{
-  for (unsigned int y = 0; y < height; y++)
-  {
-    for (unsigned int x = 0; x < width; x++)
+static void scalePlane(Pel* img, UInt stride, UInt width, UInt height,
+                       UInt shiftbits)
+{
+  for (UInt y = 0; y < height; y++)
+  {
+    for (UInt x = 0; x < width; x++)
     {
       img[x] <<= shiftbits;
@@ -112 +112 @@
  * @param maxval  maximum clipping value when dividing.
  */
-static void scalePlane(Pel* img, unsigned int stride, unsigned int width, unsigned int height,
-                       int shiftbits, Pel minval, Pel maxval)
+static void scalePlane(Pel* img, UInt stride, UInt width, UInt height,
+                       Int shiftbits, Pel minval, Pel maxval)
 {
   if (shiftbits == 0)
@@ -147 +147 @@
  * \param pchFile          file name string
  * \param bWriteMode       file open mode: true=read, false=write
- * \param fileBitDepth     bit-depth of input/output file data.
- * \param internalBitDepth bit-depth to scale image data to/from when reading/writing.
- */
-Void TVideoIOYuv::open( char* pchFile, Bool bWriteMode, unsigned int fileBitDepth, unsigned int internalBitDepth )
-{
-  m_bitdepthShift = internalBitDepth - fileBitDepth;
-  m_fileBitdepth = fileBitDepth;
+ * \param fileBitDepthY     bit-depth of input/output file data (luma component).
+ * \param fileBitDepthC     bit-depth of input/output file data (chroma components).
+ * \param internalBitDepthY bit-depth to scale image data to/from when reading/writing (luma component).
+ * \param internalBitDepthC bit-depth to scale image data to/from when reading/writing (chroma components).
+ */
+Void TVideoIOYuv::open( Char* pchFile, Bool bWriteMode, Int fileBitDepthY, Int fileBitDepthC, Int internalBitDepthY, Int internalBitDepthC)
+{
+  m_bitDepthShiftY = internalBitDepthY - fileBitDepthY;
+  m_bitDepthShiftC = internalBitDepthC - fileBitDepthC;
+  m_fileBitDepthY = fileBitDepthY;
+  m_fileBitDepthC = fileBitDepthC;
 
   if ( bWriteMode )
@@ -200 +204 @@
  * seekable, by consuming bytes.
  */
-void TVideoIOYuv::skipFrames(unsigned int numFrames, unsigned int width, unsigned int height)
+void TVideoIOYuv::skipFrames(UInt numFrames, UInt width, UInt height)
 {
   if (!numFrames)
     return;
 
-  const unsigned int wordsize = m_fileBitdepth > 8 ? 2 : 1;
+  const UInt wordsize = (m_fileBitDepthY > 8 || m_fileBitDepthC > 8) ? 2 : 1;
   const streamoff framesize = wordsize * width * height * 3 / 2;
   const streamoff offset = framesize * numFrames;
@@ -215 +219 @@
 
   /* fall back to consuming the input */
-  char buf[512];
-  const unsigned offset_mod_bufsize = offset % sizeof(buf);
+  Char buf[512];
+  const UInt offset_mod_bufsize = offset % sizeof(buf);
   for (streamoff i = 0; i < offset - offset_mod_bufsize; i += sizeof(buf))
   {
@@ -239 +243 @@
  * @return true for success, false in case of error
  */
-static bool readPlane(Pel* dst, istream& fd, bool is16bit,
-                      unsigned int stride,
-                      unsigned int width, unsigned int height,
-                      unsigned int pad_x, unsigned int pad_y)
-{
-  int read_len = width * (is16bit ? 2 : 1);
-  unsigned char *buf = new unsigned char[read_len];
-  for (int y = 0; y < height; y++)
-  {
-    fd.read(reinterpret_cast<char*>(buf), read_len);
+static Bool readPlane(Pel* dst, istream& fd, Bool is16bit,
+                      UInt stride,
+                      UInt width, UInt height,
+                      UInt pad_x, UInt pad_y)
+{
+  Int read_len = width * (is16bit ? 2 : 1);
+  UChar *buf = new UChar[read_len];
+  for (Int y = 0; y < height; y++)
+  {
+    fd.read(reinterpret_cast<Char*>(buf), read_len);
     if (fd.eof() || fd.fail() )
     {
@@ -257 +261 @@
     if (!is16bit)
     {
-      for (int x = 0; x < width; x++)
+      for (Int x = 0; x < width; x++)
       {
         dst[x] = buf[x];
@@ -264 +268 @@
     else
     {
-      for (int x = 0; x < width; x++)
+      for (Int x = 0; x < width; x++)
       {
         dst[x] = (buf[2*x+1] << 8) | buf[2*x];
@@ -270 +274 @@
     }
 
-    for (int x = width; x < width + pad_x; x++)
+    for (Int x = width; x < width + pad_x; x++)
     {
       dst[x] = dst[width - 1];
@@ -276 +280 @@
     dst += stride;
   }
-  for (int y = height; y < height + pad_y; y++)
-  {
-    for (int x = 0; x < width + pad_x; x++)
+  for (Int y = height; y < height + pad_y; y++)
+  {
+    for (Int x = 0; x < width + pad_x; x++)
     {
       dst[x] = (dst - stride)[x];
@@ -299 +303 @@
  * @return true for success, false in case of error
  */
-static bool writePlane(ostream& fd, Pel* src, bool is16bit,
-                       unsigned int stride,
-                       unsigned int width, unsigned int height)
-{
-  int write_len = width * (is16bit ? 2 : 1);
-  unsigned char *buf = new unsigned char[write_len];
-  for (int y = 0; y < height; y++)
+static Bool writePlane(ostream& fd, Pel* src, Bool is16bit,
+                       UInt stride,
+                       UInt width, UInt height)
+{
+  Int write_len = width * (is16bit ? 2 : 1);
+  UChar *buf = new UChar[write_len];
+  for (Int y = 0; y < height; y++)
   {
     if (!is16bit) 
     {
-      for (int x = 0; x < width; x++) 
+      for (Int x = 0; x < width; x++)
       {
-        buf[x] = (unsigned char) src[x];
+        buf[x] = (UChar) src[x];
       }
     }
     else 
     {
-      for (int x = 0; x < width; x++) 
+      for (Int x = 0; x < width; x++)
       {
         buf[2*x] = src[x] & 0xff;
@@ -323 +327 @@
     }
 
-    fd.write(reinterpret_cast<char*>(buf), write_len);
+    fd.write(reinterpret_cast<Char*>(buf), write_len);
     if (fd.eof() || fd.fail() )
     {
@@ -348 +352 @@
  * @return true for success, false in case of error
  */
-bool TVideoIOYuv::read ( TComPicYuv*  pPicYuv, Int aiPad[2], Bool bRewind )
+Bool TVideoIOYuv::read ( TComPicYuv*  pPicYuv, Int aiPad[2] )
 {
   // check end-of-file
@@ -356 +360 @@
   
   // compute actual YUV width & height excluding padding size
-  unsigned int pad_h = aiPad[0];
-  unsigned int pad_v = aiPad[1];
-  unsigned int width_full = pPicYuv->getWidth();
-  unsigned int height_full = pPicYuv->getHeight();
-  unsigned int width  = width_full - pad_h;
-  unsigned int height = height_full - pad_v;
-  bool is16bit = m_fileBitdepth > 8;
-
-  int desired_bitdepth = m_fileBitdepth + m_bitdepthShift;
-  Pel minval = 0;
-  Pel maxval = (1 << desired_bitdepth) - 1;
+  UInt pad_h = aiPad[0];
+  UInt pad_v = aiPad[1];
+  UInt width_full = pPicYuv->getWidth();
+  UInt height_full = pPicYuv->getHeight();
+  UInt width  = width_full - pad_h;
+  UInt height = height_full - pad_v;
+  Bool is16bit = m_fileBitDepthY > 8 || m_fileBitDepthC > 8;
+
+  Int desired_bitdepthY = m_fileBitDepthY + m_bitDepthShiftY;
+  Int desired_bitdepthC = m_fileBitDepthC + m_bitDepthShiftC;
+  Pel minvalY = 0;
+  Pel minvalC = 0;
+  Pel maxvalY = (1 << desired_bitdepthY) - 1;
+  Pel maxvalC = (1 << desired_bitdepthC) - 1;
 #if CLIP_TO_709_RANGE
-  if (m_bitdepthShift < 0 && desired_bitdepth >= 8)
+  if (m_bitdepthShiftY < 0 && desired_bitdepthY >= 8)
   {
     /* ITU-R BT.709 compliant clipping for converting say 10b to 8b */
-    minval = 1 << (desired_bitdepth - 8);
-    maxval = (0xff << (desired_bitdepth - 8)) -1;
+    minvalY = 1 << (desired_bitdepthY - 8);
+    maxvalY = (0xff << (desired_bitdepthY - 8)) -1;
+  }
+  if (m_bitdepthShiftC < 0 && desired_bitdepthC >= 8)
+  {
+    /* ITU-R BT.709 compliant clipping for converting say 10b to 8b */
+    minvalC = 1 << (desired_bitdepthC - 8);
+    maxvalC = (0xff << (desired_bitdepthC - 8)) -1;
   }
 #endif
@@ -378 +391 @@
   if (! readPlane(pPicYuv->getLumaAddr(), m_cHandle, is16bit, iStride, width, height, pad_h, pad_v))
     return false;
-  scalePlane(pPicYuv->getLumaAddr(), iStride, width_full, height_full, m_bitdepthShift, minval, maxval);
+  scalePlane(pPicYuv->getLumaAddr(), iStride, width_full, height_full, m_bitDepthShiftY, minvalY, maxvalY);
 
   iStride >>= 1;
@@ -390 +403 @@
   if (! readPlane(pPicYuv->getCbAddr(), m_cHandle, is16bit, iStride, width, height, pad_h, pad_v))
     return false;
-  scalePlane(pPicYuv->getCbAddr(), iStride, width_full, height_full, m_bitdepthShift, minval, maxval);
+  scalePlane(pPicYuv->getCbAddr(), iStride, width_full, height_full, m_bitDepthShiftC, minvalC, maxvalC);
 
   if (! readPlane(pPicYuv->getCrAddr(), m_cHandle, is16bit, iStride, width, height, pad_h, pad_v))
     return false;
-  scalePlane(pPicYuv->getCrAddr(), iStride, width_full, height_full, m_bitdepthShift, minval, maxval);
-
-  if( bRewind )
-  {
-    Int iFrameSize = ( is16bit ? 2 : 1 ) * 6 * width * height;
-    m_cHandle.seekg( -iFrameSize, std::ios_base::cur );
-  }
+  scalePlane(pPicYuv->getCrAddr(), iStride, width_full, height_full, m_bitDepthShiftC, minvalC, maxvalC);
 
   return true;
@@ -413 +420 @@
  * @return true for success, false in case of error
  */
-Bool TVideoIOYuv::write( TComPicYuv* pPicYuv, Int cropLeft, Int cropRight, Int cropTop, Int cropBottom )
+Bool TVideoIOYuv::write( TComPicYuv* pPicYuv, Int confLeft, Int confRight, Int confTop, Int confBottom )
 {
   // compute actual YUV frame size excluding padding size
   Int   iStride = pPicYuv->getStride();
-  UInt  width  = pPicYuv->getWidth()  - cropLeft - cropRight;
-  UInt  height = pPicYuv->getHeight() - cropTop  - cropBottom;
-  bool is16bit = m_fileBitdepth > 8;
+  UInt  width  = pPicYuv->getWidth()  - confLeft - confRight;
+  UInt  height = pPicYuv->getHeight() - confTop  - confBottom;
+  Bool is16bit = m_fileBitDepthY > 8 || m_fileBitDepthC > 8;
   TComPicYuv *dstPicYuv = NULL;
-  bool retval = true;
-
-  if (m_bitdepthShift != 0)
+  Bool retval = true;
+
+  if (m_bitDepthShiftY != 0 || m_bitDepthShiftC != 0)
   {
     dstPicYuv = new TComPicYuv;
@@ -429 +436 @@
     pPicYuv->copyToPic(dstPicYuv);
 
-    Pel minval = 0;
-    Pel maxval = (1 << m_fileBitdepth) - 1;
+    Pel minvalY = 0;
+    Pel minvalC = 0;
+    Pel maxvalY = (1 << m_fileBitDepthY) - 1;
+    Pel maxvalC = (1 << m_fileBitDepthC) - 1;
 #if CLIP_TO_709_RANGE
-    if (-m_bitdepthShift < 0 && m_fileBitdepth >= 8)
+    if (-m_bitDepthShiftY < 0 && m_fileBitDepthY >= 8)
     {
       /* ITU-R BT.709 compliant clipping for converting say 10b to 8b */
-      minval = 1 << (m_fileBitdepth - 8);
-      maxval = (0xff << (m_fileBitdepth - 8)) -1;
+      minvalY = 1 << (m_fileBitDepthY - 8);
+      maxvalY = (0xff << (m_fileBitDepthY - 8)) -1;
+    }
+    if (-m_bitDepthShiftC < 0 && m_fileBitDepthC >= 8)
+    {
+      /* ITU-R BT.709 compliant clipping for converting say 10b to 8b */
+      minvalC = 1 << (m_fileBitDepthC - 8);
+      maxvalC = (0xff << (m_fileBitDepthC - 8)) -1;
     }
 #endif
-    scalePlane(dstPicYuv->getLumaAddr(), dstPicYuv->getStride(), dstPicYuv->getWidth(), dstPicYuv->getHeight(), -m_bitdepthShift, minval, maxval);
-    scalePlane(dstPicYuv->getCbAddr(), dstPicYuv->getCStride(), dstPicYuv->getWidth()>>1, dstPicYuv->getHeight()>>1, -m_bitdepthShift, minval, maxval);
-    scalePlane(dstPicYuv->getCrAddr(), dstPicYuv->getCStride(), dstPicYuv->getWidth()>>1, dstPicYuv->getHeight()>>1, -m_bitdepthShift, minval, maxval);
+    scalePlane(dstPicYuv->getLumaAddr(), dstPicYuv->getStride(), dstPicYuv->getWidth(), dstPicYuv->getHeight(), -m_bitDepthShiftY, minvalY, maxvalY);
+    scalePlane(dstPicYuv->getCbAddr(), dstPicYuv->getCStride(), dstPicYuv->getWidth()>>1, dstPicYuv->getHeight()>>1, -m_bitDepthShiftC, minvalC, maxvalC);
+    scalePlane(dstPicYuv->getCrAddr(), dstPicYuv->getCStride(), dstPicYuv->getWidth()>>1, dstPicYuv->getHeight()>>1, -m_bitDepthShiftC, minvalC, maxvalC);
   }
   else
@@ -448 +463 @@
   }
   // location of upper left pel in a plane
-  Int planeOffset = 0; //cropLeft + cropTop * iStride;
+  Int planeOffset = confLeft + confTop * iStride;
   
   if (! writePlane(m_cHandle, dstPicYuv->getLumaAddr() + planeOffset, is16bit, iStride, width, height))
@@ -459 +474 @@
   height >>= 1;
   iStride >>= 1;
-  cropLeft >>= 1;
-  cropRight >>= 1;
-
-  planeOffset = 0; // cropLeft + cropTop * iStride;
+  confLeft >>= 1;
+  confRight >>= 1;
+  confTop >>= 1;
+  confBottom >>= 1;
+
+  planeOffset = confLeft + confTop * iStride;
 
   if (! writePlane(m_cHandle, dstPicYuv->getCbAddr() + planeOffset, is16bit, iStride, width, height))
@@ -476 +493 @@
   
 exit:
-  if (m_bitdepthShift != 0)
+  if (m_bitDepthShiftY != 0 || m_bitDepthShiftC != 0)
   {
     dstPicYuv->destroy();

trunk/source/Lib/TLibVideoIO/TVideoIOYuv.h

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -42 +42 @@
 #include <fstream>
 #include <iostream>
-#include "../TLibCommon/CommonDef.h"
-#include "../TLibCommon/TComPicYuv.h"
+#include "TLibCommon/CommonDef.h"
+#include "TLibCommon/TComPicYuv.h"
 
 using namespace std;
@@ -56 +56 @@
 private:
   fstream   m_cHandle;                                      ///< file handle
-  unsigned int m_fileBitdepth; ///< bitdepth of input/output video file
-  int m_bitdepthShift;  ///< number of bits to increase or decrease image by before/after write/read
+  Int m_fileBitDepthY; ///< bitdepth of input/output video file luma component
+  Int m_fileBitDepthC; ///< bitdepth of input/output video file chroma component
+  Int m_bitDepthShiftY;  ///< number of bits to increase or decrease luma by before/after write/read
+  Int m_bitDepthShiftC;  ///< number of bits to increase or decrease chroma by before/after write/read
   
 public:
@@ -63 +65 @@
   virtual ~TVideoIOYuv()  {}
   
-  Void  open  ( char* pchFile, Bool bWriteMode, unsigned int fileBitDepth, unsigned int internalBitDepth ); ///< open or create file
+  Void  open  ( Char* pchFile, Bool bWriteMode, Int fileBitDepthY, Int fileBitDepthC, Int internalBitDepthY, Int internalBitDepthC ); ///< open or create file
   Void  close ();                                           ///< close file
 
-  void skipFrames(unsigned int numFrames, unsigned int width, unsigned int height);
+  void skipFrames(UInt numFrames, UInt width, UInt height);
   
-  bool  read  ( TComPicYuv*   pPicYuv, Int aiPad[2], Bool bRewind = false );     ///< read  one YUV frame with padding parameter
-  Bool  write( TComPicYuv*    pPicYuv, Int cropLeft=0, Int cropRight=0, Int cropTop=0, Int cropBottom=0 );
+  Bool  read  ( TComPicYuv*   pPicYuv, Int aiPad[2] );     ///< read  one YUV frame with padding parameter
+  Bool  write( TComPicYuv*    pPicYuv, Int confLeft=0, Int confRight=0, Int confTop=0, Int confBottom=0 );
   
-  bool  isEof ();                                           ///< check for end-of-file
-  bool  isFail();                                           ///< check for failure
+  Bool  isEof ();                                           ///< check for end-of-file
+  Bool  isFail();                                           ///< check for failure
   
 };