Changeset 654 in 3DVCSoftware for branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder

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/Lib/TLibEncoder

Files:

• TEncCu.cpp (modified) (2 diffs)
• TEncTop.cpp (modified) (2 diffs)

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
+
 }