Changeset 1122 in 3DVCSoftware

Timestamp:

8 Nov 2014, 21:54:17 (10 years ago)

Author:

tech

Message:

Alignment of J0060 and J0107 (ALIGN_J0060_J0107)

Location:

branches/HTM-12.2-dev0/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecEntropy.cpp (modified) (3 diffs)
• TLibEncoder/TEncCu.cpp (modified) (1 diff)
• TLibEncoder/TEncEntropy.cpp (modified) (3 diffs)

branches/HTM-12.2-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -237 +237 @@
 #define H_3D_SINGLE_DEPTH                 1   // Single depth mode proposed in JCT3V-I0095
 #define MTK_SINGLE_DEPTH_VPS_FLAG_J0060   1   // Add VPS control flags and remove slice header control flag for single depth, JCT3V-J0060
+#define ALIGN_J0060_J0107                 1   // Aligment of changed tool parameters
 
 #define MTK_J0033                         1

branches/HTM-12.2-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -55 +55 @@
 Void TDecEntropy::decodeSingleDepthMode( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
+  if( !pcCU->getSlice()->getIntraSingleFlag() )
+  {
+    return;
+  }  
+#if ALIGN_J0060_J0107
+#else
   if ( !pcCU->getSlice()->getIsDepth() )
   {
@@ -60 +66 @@
   }
 #if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
-//  if(!pcCU->getSlice()->getVPS()->getSingleDepthModeFlag(pcCU->getSlice()->getLayerIdInVps()))
+  if(!pcCU->getSlice()->getVPS()->getSingleDepthModeFlag(pcCU->getSlice()->getLayerIdInVps()))
   {
      return;
@@ -70 +76 @@
   }
 #endif
+#endif
+
   m_pcEntropyDecoderIf->parseSingleDepthMode( pcCU, uiAbsPartIdx, uiDepth );
 }

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

@@ -740 +740 @@
     rpcTempCU->initEstData( uiDepth, iMinQP, isAddLowestQP  );
 #if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
-//    if(rpcBestCU->getSlice()->getVPS()->getSingleDepthModeFlag(rpcBestCU->getSlice()->getLayerIdInVps()))
+#if ALIGN_J0060_J0107
+    if( rpcBestCU->getSlice()->getIntraSingleFlag() )
+#else
+    if(rpcBestCU->getSlice()->getVPS()->getSingleDepthModeFlag(rpcBestCU->getSlice()->getLayerIdInVps()))
+#endif
 #else
     if(rpcBestCU->getSlice()->getApplySingleDepthMode())

branches/HTM-12.2-dev0/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -130 +130 @@
 Void TEncEntropy::encodeSingleDepthMode( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
 {
+#if ALIGN_J0060_J0107
+  if(!pcCU->getSlice()->getIntraSingleFlag() )
+  {
+    return;
+  }
+#else
   if ( !pcCU->getSlice()->getIsDepth() )
   {
@@ -135 +141 @@
   }
 #if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
-//  if(!pcCU->getSlice()->getVPS()->getSingleDepthModeFlag(pcCU->getSlice()->getLayerIdInVps()))
+  if(!pcCU->getSlice()->getVPS()->getSingleDepthModeFlag(pcCU->getSlice()->getLayerIdInVps()))
   {
      return;
@@ -144 +150 @@
      return;
   }
+#endif
 #endif
   if( bRD )