Changeset 590 in 3DVCSoftware for branches/HTM-DEV-2.0-dev1-Samsung/source

Timestamp:

26 Aug 2013, 01:51:42 (11 years ago)

Author:

samsung-htm

Message:

Integration of JCT3V-E0142

Location:

branches/HTM-DEV-2.0-dev1-Samsung/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (6 diffs)
• TypeDef.h (modified) (3 diffs)

branches/HTM-DEV-2.0-dev1-Samsung/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5171 +5171 @@
 
     ///*** Derive bottom right neighbour position ***
+#if !SEC_SIMPLIFIED_NBDV_E0142
     Int iLCUIdxRBNb  = -1;    
     Int iPartIdxRBNb = -1;
     xDeriveRightBottomNbIdx(iLCUIdxRBNb, iPartIdxRBNb );
+#endif
 
     ///*** Search temporal candidate pictures for disparity vector ***
@@ -5192 +5194 @@
       }
 
+#if !SEC_SIMPLIFIED_NBDV_E0142
       // Check BR and Center       
       for(Int curPosition = 0; curPosition < 2; curPosition++) 
       {
+#endif
         Bool bCheck = false; 
+#if !SEC_SIMPLIFIED_NBDV_E0142
         if ( curPosition == 0 && iLCUIdxRBNb >= 0 )
 #if MTK_NBDV_TN_FIX_E0172
@@ -5204 +5209 @@
 
         if (curPosition == 1 )
+#endif
 #if MTK_NBDV_TN_FIX_E0172
           bCheck = xGetColDisMV( curCandPic, eCurRefPicList, curCandPicRefIdx, uiLCUIdx,   uiPartIdxCenter,  cColMv, iTargetViewIdx, iTStartViewIdx );
@@ -5227 +5233 @@
           return true;
         }
+#if !SEC_SIMPLIFIED_NBDV_E0142
       } 
+#endif
     }
   } 
@@ -5258 +5266 @@
   }
 
+#if !SEC_SIMPLIFIED_NBDV_E0142
   //// ******* Get disparity from above right block ******* /////
   pcTmpCU = getPUAboveRight(uiIdx, uiPartIdxRT, true);
@@ -5298 +5307 @@
       return true;
   }
+#endif
 
   //// ******* Search MCP blocks ******* /////

branches/HTM-DEV-2.0-dev1-Samsung/source/Lib/TLibCommon/TypeDef.h

@@ -113 +113 @@
 #if H_3D_NBDV_REF
 #define NTT_DoNBDV_VECTOR_CLIP_E0141      1   // disparity vector clipping in DoNBDV, JCT3V-E0141 and JCT3V-E0209
+#define SEC_SIMPLIFIED_NBDV_E0142         1   // Simplified NBDV, JCT3V-E0142 and JCT3V-E0190
 #endif
 #endif
@@ -169 +170 @@
 ////   ****** Neighbouring block-based Disparity Vector  *********
 #if H_3D_NBDV
+#if SEC_SIMPLIFIED_NBDV_E0142
+#define DVFROM_LEFT                       0
+#define DVFROM_ABOVE                      1
+#define IDV_CANDS                         2
+#else
 #define DVFROM_LEFTBELOW                  0
 #define DVFROM_LEFT                       1
@@ -175 +181 @@
 #define DVFROM_ABOVELEFT                  4
 #define IDV_CANDS                         5
+#endif
 #endif
 ////   **** Inter-view motion prediction for merge        *********