Changeset 1077 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

10 Mar 2015, 17:32:41 (10 years ago)

Author:

seregin

Message:

update the older Visual Studio project files and some fixes to avoid implicit cast warnings, patch was provided by Karsten Sühring <karsten.suehring@…>

Location:

branches/SHM-dev/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (4 diffs)
• Lib/TLibCommon/TComSlice.cpp (modified) (2 diffs)
• Lib/TLibEncoder/SEIwrite.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncGOP.cpp (modified) (4 diffs)
• Lib/TLibVideoIO/TVideoIOYuv.cpp (modified) (1 diff)

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -1491 +1491 @@
     if( it != listOfPocsInEachLayer[layerId].end() )  // picture found.
     {
-      Int picPosition = std::distance( listOfPocsInEachLayer[layerId].begin(), it );
+      Int picPosition = (Int)std::distance( listOfPocsInEachLayer[layerId].begin(), it );
       Int j;
       for(j = 0, iterPic = m_acTDecTop[layerId].getListPic()->begin(); j < listOfPocsPositionInEachLayer[layerId][picPosition]; j++) // Picture to be output
@@ -1648 +1648 @@
       if( it != listOfPocsInEachLayer[i].end() )
       {
-        Int picPosition = std::distance( listOfPocsInEachLayer[i].begin(), it );
+        Int picPosition = (Int)std::distance( listOfPocsInEachLayer[i].begin(), it );
         Int j;
         for(j = 0, iterPic = m_acTDecTop[i].getListPic()->begin(); j < listOfPocsPositionInEachLayer[i][picPosition]; j++) // Picture to be output
@@ -1803 +1803 @@
   Int targetLsIdx = vps->getOutputLayerSetIdx( getCommonDecoderParams()->getTargetOutputLayerSetIdx() );
   // Update status
-  dpbStatus.m_numAUsNotDisplayed = listOfPocs.size();   // Number of AUs not displayed
+  dpbStatus.m_numAUsNotDisplayed = (Int)listOfPocs.size();   // Number of AUs not displayed
   dpbStatus.m_numLayers = vps->getNumLayersInIdList( targetLsIdx );
 #if FIX_ALIGN_BUMPING
@@ -1823 +1823 @@
 #endif
   {
-    dpbStatus.m_numPicsNotDisplayedInLayer[i] = listOfPocsInEachLayer[i].size();
+    dpbStatus.m_numPicsNotDisplayedInLayer[i] = (Int)listOfPocsInEachLayer[i].size();
 #if RESOLUTION_BASED_DPB
     dpbStatus.m_numPicsInSubDpb[vps->getSubDpbAssigned(targetLsIdx,i)] += dpbStatus.m_numPicsInLayer[i];

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -3329 +3329 @@
       }
     }
-    m_numLayerInIdList.push_back(m_layerSetLayerIdList[i].size());
+    m_numLayerInIdList.push_back((Int)m_layerSetLayerIdList[i].size());
   }
 }
@@ -3591 +3591 @@
   if( it != m_layerSetLayerIdList[olsIdx].end() )
   {
-    layerIdc = std::distance( m_layerSetLayerIdList[olsIdx].begin(), it );
+    layerIdc = (Int)std::distance( m_layerSetLayerIdList[olsIdx].begin(), it );
   }
 

branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp

@@ -1165 +1165 @@
 #if NESTING_SEI_EXTENSIBILITY
   assert( sei.m_nestedSEIs.size() <= MAX_SEIS_IN_BSP_NESTING );
-  WRITE_UVLC( sei.m_nestedSEIs.size(), "num_seis_in_bsp_minus1" );
+  WRITE_UVLC( (UInt)sei.m_nestedSEIs.size(), "num_seis_in_bsp_minus1" );
 #endif
   // write nested SEI messages

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -3047 +3047 @@
           if (m_pcCfg->getCabacZeroWordPaddingEnabled())
           {
-            std::vector<Char> zeroBytesPadding(numberOfAdditionalCabacZeroBytes, Char(0));
-            for(Int64 i=0; i<numberOfAdditionalCabacZeroWords; i++)
+            std::vector<Char> zeroBytesPadding((size_t)numberOfAdditionalCabacZeroBytes, Char(0));
+            for(size_t i=0; i<numberOfAdditionalCabacZeroWords; i++)
             {
               zeroBytesPadding[i*3+2]=3;  // 00 00 03
             }
-            accessUnit.back()->m_nalUnitData.write(&(zeroBytesPadding[0]), numberOfAdditionalCabacZeroBytes);
+            accessUnit.back()->m_nalUnitData.write(&(zeroBytesPadding[0]), (size_t)numberOfAdditionalCabacZeroBytes);
             printf("Adding %lld bytes of padding\n", numberOfAdditionalCabacZeroWords*3);
           }
@@ -4448 +4448 @@
       {                
         strTmp = m_pcCfg->getOverlaySEILanguage()[i];
-        nBytes = m_pcCfg->getOverlaySEILanguage()[i].size();        
+        nBytes = (Int)m_pcCfg->getOverlaySEILanguage()[i].size();        
         assert( nBytes>0 );
         sei->m_overlayLanguage[i] = new UChar[nBytes];
@@ -4457 +4457 @@
       //overlay name
       strTmp = m_pcCfg->getOverlaySEIName()[i];
-      nBytes = m_pcCfg->getOverlaySEIName()[i].size();        
+      nBytes = (Int)m_pcCfg->getOverlaySEIName()[i].size();        
       assert( nBytes>0 );
       sei->m_overlayName[i] = new UChar[nBytes];      
@@ -4472 +4472 @@
         {
           strTmp = m_pcCfg->getOverlaySEIElementName()[i][j];
-          nBytes = m_pcCfg->getOverlaySEIElementName()[i][j].size();        
+          nBytes = (Int)m_pcCfg->getOverlaySEIElementName()[i][j].size();        
           assert( nBytes>0 );
           sei->m_overlayElementName[i][j] = new UChar[nBytes];

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

@@ -202 +202 @@
   /* fall back to consuming the input */
   Char buf[512];
-  const UInt offset_mod_bufsize = offset % sizeof(buf);
+  const streamoff offset_mod_bufsize = offset % sizeof(buf);
   for (streamoff i = 0; i < offset - offset_mod_bufsize; i += sizeof(buf))
   {