Changeset 652 in 3DVCSoftware for branches

Timestamp:

21 Oct 2013, 18:20:56 (11 years ago)

Author:

tech

Message:

Added missing parts of merge.

Location:

branches/HTM-8.2-dev0-Cleanup/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (3 diffs)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibEncoder/TEncCu.cpp (modified) (2 diffs)

branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComSlice.cpp

@@ -832 +832 @@
   {
     pocCRA = getPOC();
+    associatedIRAPType = getNalUnitType();
   }
   else if ( getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA ) // CRA picture found
@@ -1315 +1316 @@
       else 
       {
+        Int pocCycle = 1<<rpcPic->getPicSym()->getSlice(0)->getSPS()->getBitsForPOC();
+        Int curPoc = rpcPic->getPicSym()->getSlice(0)->getPOC() & (pocCycle-1);
+        Int refPoc = pReferencePictureSet->getPOC(i) & (pocCycle-1);
+        if(rpcPic->getIsLongTerm() && curPoc == refPoc)
         {
           isReference = 1;
@@ -1374 +1379 @@
       else 
       {
+        Int pocCycle = 1<<rpcPic->getPicSym()->getSlice(0)->getSPS()->getBitsForPOC();
+        Int curPoc = rpcPic->getPicSym()->getSlice(0)->getPOC() & (pocCycle-1);
+        Int refPoc = pReferencePictureSet->getPOC(i) & (pocCycle-1);
+        if(rpcPic->getIsLongTerm() && curPoc == refPoc && rpcPic->getSlice(0)->isReferenced())
         {
           isAvailable = 1;

branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -960 +960 @@
 #endif
   }
+  return; 
 }
 

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

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