Changeset 654 in 3DVCSoftware

Timestamp:

21 Oct 2013, 21:26:44 (11 years ago)

Author:

tech

Message:

Fixed minor issues, introduced by update.

Location:

branches/HTM-8.2-dev0-Cleanup/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• App/TAppEncoder/TAppEncTop.cpp (modified) (6 diffs)
• Lib/TLibEncoder/TEncCu.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncTop.cpp (modified) (2 diffs)

branches/HTM-8.2-dev0-Cleanup/source/App/TAppDecoder/TAppDecTop.cpp

@@ -739 +739 @@
       {
         // write to file
+#if H_MV
+      if ( m_pchReconFiles[decIdx] )
+#else
         if ( m_pchReconFile )
+#endif
         {
           const Window &conf = pcPic->getConformanceWindow();

branches/HTM-8.2-dev0-Cleanup/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1067 +1067 @@
     Int i;
 #if H_MV
-  if( iNumEncoded > 0 )
-  {
-    TComList<TComPicYuv*>::iterator iterPicYuvRec = m_picYuvRec[layerId]->end();
+    if( iNumEncoded > 0 )
+    {
+      TComList<TComPicYuv*>::iterator iterPicYuvRec = m_picYuvRec[layerId]->end();
 #else
     TComList<TComPicYuv*>::iterator iterPicYuvRec = m_cListPicYuvRec.end();
     list<AccessUnit>::const_iterator iterBitstream = accessUnits.begin();
 #endif
-    
+
     for ( i = 0; i < iNumEncoded; i++ )
     {
       --iterPicYuvRec;
     }
-    
+
     for ( i = 0; i < iNumEncoded/2; i++ )
     {
       TComPicYuv*  pcPicYuvRecTop  = *(iterPicYuvRec++);
       TComPicYuv*  pcPicYuvRecBottom  = *(iterPicYuvRec++);
-      
+
 #if H_MV
       if (m_pchReconFileList[layerId])
@@ -1091 +1091 @@
       }
     }
+  }
+
   if( ! accessUnits.empty() )
   {
@@ -1109 +1111 @@
       const vector<UInt>& statsTop = writeAnnexB(bitstreamFile, auTop);
       rateStatsAccum(auTop, statsTop);
-      
+
       const AccessUnit& auBottom = *(iterBitstream++);
       const vector<UInt>& statsBottom = writeAnnexB(bitstreamFile, auBottom);
@@ -1120 +1122 @@
     Int i;
 #if H_MV
-  if( iNumEncoded > 0 )
-  {
-    TComList<TComPicYuv*>::iterator iterPicYuvRec = m_picYuvRec[layerId]->end();
+    if( iNumEncoded > 0 )
+    {
+      TComList<TComPicYuv*>::iterator iterPicYuvRec = m_picYuvRec[layerId]->end();
 #else
     TComList<TComPicYuv*>::iterator iterPicYuvRec = m_cListPicYuvRec.end();
     list<AccessUnit>::const_iterator iterBitstream = accessUnits.begin();
 #endif
-    
+
     for ( i = 0; i < iNumEncoded; i++ )
     {
       --iterPicYuvRec;
     }
-    
+
     for ( i = 0; i < iNumEncoded; i++ )
     {
@@ -1140 +1142 @@
       {
         m_acTVideoIOYuvReconFileList[layerId]->write( pcPicYuvRec, m_confLeft, m_confRight, m_confTop, m_confBottom );
-      }
+      }    
     }
   }
@@ -1157 +1159 @@
         m_cTVideoIOYuvReconFile.write( pcPicYuvRec, m_confLeft, m_confRight, m_confTop, m_confBottom );
       }
-      
+
       const AccessUnit& au = *(iterBitstream++);
       const vector<UInt>& stats = writeAnnexB(bitstreamFile, au);
-      rateStatsAccum(au, stats);
-#endif
-    }
-  }
-}
+      rateStatsAccum(au, stats);   
+    }
+#endif    
+  }
+}
+  
 /**
  *

branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1004 +1004 @@
 #endif
         // do normal intra modes
-#if H_3D_DIM_ENC
-        if (( rpcBestCU->getSlice()->getIsDepth() && rpcBestCU->getSlice()->isIRAP() ) )
-        {
-#endif
-        
+       
           // speedup for inter frames
           if( rpcBestCU->getSlice()->getSliceType() == I_SLICE || 
@@ -1060 +1056 @@
             }
           }
-#if H_3D_DIM_ENC
-        }
-#endif
         // test PCM
         if(pcPic->getSlice(0)->getSPS()->getUsePCM()

branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncTop.cpp

@@ -1220 +1220 @@
     }
   }
-#if H_MV
-  }
-#endif
   if(POCCurr == 1 && slice->getPic()->isField())
   {
@@ -1230 +1227 @@
   slice->setRPS(getSPS()->getRPSList()->getReferencePictureSet(slice->getRPSidx()));
   slice->getRPS()->setNumberOfPictures(slice->getRPS()->getNumberOfNegativePictures()+slice->getRPS()->getNumberOfPositivePictures());
+#if H_MV
+  }
+#endif
+
 }