Changeset 769 in 3DVCSoftware for branches/HTM-9.2-dev0/source/Lib/TLibEncoder

Timestamp:

13 Jan 2014, 08:05:57 (11 years ago)

Author:

tech

Message:

Further fixes.

Location:

branches/HTM-9.2-dev0/source/Lib/TLibEncoder

Files:

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

branches/HTM-9.2-dev0/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1796 +1796 @@
 #endif
 #else
+#if H_3D
   rpcTempCU->m_bAvailableFlagA1 = 0;
   rpcTempCU->m_bAvailableFlagB1 = 0;
@@ -1803 +1804 @@
   rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
   rpcTempCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours, numValidMergeCand );
+#else
+  rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours, numValidMergeCand );
+#endif
 #endif
 

branches/HTM-9.2-dev0/source/Lib/TLibEncoder/TEncTop.cpp

@@ -817 +817 @@
     pcVUI->setOverscanInfoPresentFlag(getOverscanInfoPresentFlag());
     pcVUI->setOverscanAppropriateFlag(getOverscanAppropriateFlag());
+#if H_MV
     pcVUI->setVideoSignalTypePresentFlag(getVideoSignalTypePresentFlag() && getLayerId() == 0 );
+#else
+   pcVUI->setVideoSignalTypePresentFlag(getVideoSignalTypePresentFlag());
+#endif
     pcVUI->setVideoFormat(getVideoFormat());
     pcVUI->setVideoFullRangeFlag(getVideoFullRangeFlag());