Changeset 1246 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibVideoIO

Timestamp:

14 Jul 2015, 00:26:07 (10 years ago)

Author:

seregin

Message:

port rev 4240

File:

• branches/SHM-dev/source/Lib/TLibVideoIO/TVideoIOYuv.cpp (modified) (20 diffs)

branches/SHM-dev/source/Lib/TLibVideoIO/TVideoIOYuv.cpp

@@ -73 +73 @@
   {
     for (UInt y = 0; y < height; y++, img+=stride)
+    {
       for (UInt x = 0; x < width; x++)
+      {
         img[x] <<= shiftbits;
+      }
+    }
   }
   else if (shiftbits < 0)
@@ -82 +86 @@
     Pel rounding = 1 << (shiftbits-1);
     for (UInt y = 0; y < height; y++, img+=stride)
+    {
       for (UInt x = 0; x < width; x++)
+      {
         img[x] = Clip3(minval, maxval, Pel((img[x] + rounding) >> shiftbits));
+      }
+    }
   }
 }
@@ -178 +186 @@
 {
   if (!numFrames)
+  {
     return;
+  }
 
   //------------------
@@ -188 +198 @@
     ComponentID compID=ComponentID(component);
     frameSize += (width >> getComponentScaleX(compID, format)) * (height >> getComponentScaleY(compID, format));
-    if (m_fileBitdepth[toChannelType(compID)] > 8) wordsize=2;
+    if (m_fileBitdepth[toChannelType(compID)] > 8)
+    {
+      wordsize=2;
+    }
   }
   frameSize *= wordsize;
@@ -197 +210 @@
   /* attempt to seek */
   if (!!m_cHandle.seekg(offset, ios::cur))
+  {
     return; /* success */
+  }
   m_cHandle.clear();
 
   /* fall back to consuming the input */
   Char buf[512];
-  const streamoff offset_mod_bufsize = offset % sizeof(buf);
+  const UInt offset_mod_bufsize = offset % sizeof(buf);
   for (streamoff i = 0; i < offset - offset_mod_bufsize; i += sizeof(buf))
   {
@@ -263 +278 @@
       const Pel value=Pel(1<<(fileBitDepth-1));
       for (UInt y = 0; y < full_height_dest; y++, dst+=stride_dest)
+      {
         for (UInt x = 0; x < full_width_dest; x++)
+        {
           dst[x] = value;
+        }
+      }
     }
 
@@ -305 +324 @@
           {
             for (UInt x = 0; x < width_dest; x++)
+            {
               dst[x] = buf[x<<sx];
+            }
           }
           else
@@ -322 +343 @@
           {
             for (UInt x = 0; x < width_dest; x++)
+            {
               dst[x] = buf[x>>sx];
+            }
           }
           else
           {
             for (UInt x = 0; x < width_dest; x++)
+            {
               dst[x] = Pel(buf[(x>>sx)*2+0]) | (Pel(buf[(x>>sx)*2+1])<<8);
+            }
           }
         }
@@ -334 +359 @@
         const Pel val=dst[width_dest-1];
         for (UInt x = width_dest; x < full_width_dest; x++)
+        {
           dst[x] = val;
+        }
 
         dst += stride_dest;
@@ -342 +369 @@
     // process lower padding
     for (UInt y = height_dest; y < full_height_dest; y++, dst+=stride_dest)
+    {
       for (UInt x = 0; x < full_width_dest; x++)
+      {
         dst[x] = (dst - stride_dest)[x];
+      }
+    }
   }
   delete[] buf;
@@ -393 +424 @@
           UChar val(value);
           for (UInt x = 0; x < width_file; x++)
+          {
             buf[x]=val;
+          }
         }
         else
@@ -520 +553 @@
             UChar val(value);
             for (UInt x = 0; x < width_file; x++)
+            {
               fieldBuffer[x]=val;
+            }
           }
           else
@@ -634 +669 @@
 {
   // check end-of-file
-  if ( isEof() ) return false;
+  if ( isEof() )
+  {
+    return false;
+  }
   TComPicYuv *pPicYuv=pPicYuvTrueOrg;
-  if (format>=NUM_CHROMA_FORMAT) format=pPicYuv->getChromaFormat();
+  if (format>=NUM_CHROMA_FORMAT)
+  {
+    format=pPicYuv->getChromaFormat();
+  }
 
   Bool is16bit = false;
@@ -642 +683 @@
   for(UInt ch=0; ch<MAX_NUM_CHANNEL_TYPE; ch++)
   {
-    if (m_fileBitdepth[ch] > 8) is16bit=true;
+    if (m_fileBitdepth[ch] > 8)
+    {
+      is16bit=true;
+    }
   }
 
@@ -733 +777 @@
   for(UInt ch=0; ch<MAX_NUM_CHANNEL_TYPE; ch++)
   {
-    if (m_fileBitdepth[ch] > 8) is16bit=true;
-    if (m_bitdepthShift[ch] != 0) nonZeroBitDepthShift=true;
+    if (m_fileBitdepth[ch] > 8)
+    {
+      is16bit=true;
+    }
+    if (m_bitdepthShift[ch] != 0)
+    {
+      nonZeroBitDepthShift=true;
+    }
   }
 
   TComPicYuv *dstPicYuv = NULL;
   Bool retval = true;
-  if (format>=NUM_CHROMA_FORMAT) format=pPicYuv->getChromaFormat();
+  if (format>=NUM_CHROMA_FORMAT)
+  {
+    format=pPicYuv->getChromaFormat();
+  }
 
   if (nonZeroBitDepthShift)
@@ -817 +870 @@
   for(UInt ch=0; ch<MAX_NUM_CHANNEL_TYPE; ch++)
   {
-    if (m_fileBitdepth[ch] > 8) is16bit=true;
-    if (m_bitdepthShift[ch] != 0) nonZeroBitDepthShift=true;
+    if (m_fileBitdepth[ch] > 8)
+    {
+      is16bit=true;
+    }
+    if (m_bitdepthShift[ch] != 0)
+    {
+      nonZeroBitDepthShift=true;
+    }
   }
 
@@ -828 +887 @@
     TComPicYuv *pPicYuv = (field == 0) ? pPicYuvTop : pPicYuvBottom;
 
-    if (format>=NUM_CHROMA_FORMAT) format=pPicYuv->getChromaFormat();
+    if (format>=NUM_CHROMA_FORMAT)
+    {
+      format=pPicYuv->getChromaFormat();
+    }
 
     TComPicYuv* &dstPicYuv = (field == 0) ? dstPicYuvTop : dstPicYuvBottom;
@@ -949 +1011 @@
       {
         for(UInt comp=0; comp<numValidComp; comp++)
+        {
           copyPlane(src, ComponentID(bIsForwards?0:comp), dest, ComponentID(comp));
+        }
       }
       break;
@@ -955 +1019 @@
       {
         for(UInt comp=0; comp<numValidComp; comp++)
+        {
           copyPlane(src, ComponentID(comp), dest, ComponentID((numValidComp-comp)%numValidComp));
+        }
       }
       break;
@@ -982 +1048 @@
       {
         for(UInt comp=0; comp<numValidComp; comp++)
+        {
           copyPlane(src, ComponentID(comp), dest, ComponentID(comp));
+        }
       }
       break;