Changeset 399 in 3DVCSoftware

Timestamp:

13 May 2013, 03:46:38 (11 years ago)

Author:

samsung-htm

Message:

D0112 integration

Location:

branches/HTM-6.2-dev2-Samsung

Files:

• CommonTestConditionsResults/JCT3V-D0112_DefaultDVRefinement.xls (added)
• source/Lib/TLibCommon/TComDataCU.cpp (modified) (1 diff)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• source/Lib/TLibDecoder/TDecCu.cpp (modified) (1 diff)
• source/Lib/TLibEncoder/TEncCu.cpp (modified) (1 diff)

branches/HTM-6.2-dev2-Samsung/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5554 +5554 @@
     }
   }
+
+#if SEC_DEFAULT_DV_D0112
+  {
+    TComPic* picDepth = NULL;
+    TComMv defaultDV(0, 0);
+
+    picDepth = getSlice()->getRefPicBaseDepth();
+
+    if (picDepth && bDepthRefine)
+    {
+      estimateDVFromDM(uiPartIdx, picDepth, uiPartAddr, &defaultDV, true);
+    }
+
+    pDInfo->m_acMvCand[pDInfo->iN] = defaultDV;
+    pDInfo->m_aVIdxCan[pDInfo->iN] = 0;
+  }
+#endif
+
 #if QC_CU_NBDV_D0181
   return false;

branches/HTM-6.2-dev2-Samsung/source/Lib/TLibCommon/TypeDef.h

@@ -117 +117 @@
                                               // FIX_CHROMA_RESIDUAL_C0129         
 #define QC_CU_NBDV_D0181                  1
+
+#define SEC_DEFAULT_DV_D0112              1
+
 ///// ***** MOTION PARAMETER INHERITANCE  *********
 #define MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137   1   // JCT3V-C0137

branches/HTM-6.2-dev2-Samsung/source/Lib/TLibDecoder/TDecCu.cpp

@@ -344 +344 @@
         {
           DvInfo.iN=1;
+#if !SEC_DEFAULT_DV_D0112
           DvInfo.m_acMvCand[0].setHor(0);
           DvInfo.m_acMvCand[0].setVer(0);
           DvInfo.m_aVIdxCan[0] = 0;
+#endif
           pcCU->setDvInfoSubParts(DvInfo, uiAbsPartIdx, uiDepth);
         }

branches/HTM-6.2-dev2-Samsung/source/Lib/TLibEncoder/TEncCu.cpp

@@ -626 +626 @@
         {
           DvInfo.iN=1;
+#if !SEC_DEFAULT_DV_D0112
           DvInfo.m_acMvCand[0].setHor(0);
           DvInfo.m_acMvCand[0].setVer(0);
           DvInfo.m_aVIdxCan[0] = 0;
+#endif
           rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
           rpcBestCU->setDvInfoSubParts(DvInfo, 0, uiDepth);