Changeset 1118 in 3DVCSoftware for branches/HTM-12.2-dev0/source/Lib/TLibCommon

Timestamp:

8 Nov 2014, 21:07:36 (10 years ago)

Author:

tech

Message:

Merged 12.2-dev1-Hisilicon@1116.

Location:

branches/HTM-12.2-dev0/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (3 diffs)
• TComRom.cpp (modified) (3 diffs)
• TComSlice.cpp (modified) (3 diffs)
• TComSlice.h (modified) (3 diffs)
• TypeDef.h (modified) (5 diffs)

branches/HTM-12.2-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -6266 +6266 @@
     }
     break;
+#if !SINGLE_DEPTH_SIMP_J0115
   case 2: // Above
     if(yP != 0)
@@ -6287 +6288 @@
     }
     break;
+#endif
   default:
       break;
@@ -6905 +6907 @@
 
   iNumSPInOneLine = iPUWidth/iSubPUSize;
+#if !HS_SP_SIMP_J0066
   iNumSPInOneLine = iNumSPInOneLine < 1 ? 1: iNumSPInOneLine;
+#endif
   Int iNumSPInOneColumn = iPUHeight/iSubPUSize;
+#if !HS_SP_SIMP_J0066
   iNumSPInOneColumn = iNumSPInOneColumn < 1 ? 1: iNumSPInOneColumn;
+#else
+  iNumSPInOneLine = (iPUHeight % iSubPUSize != 0 || iPUWidth % iSubPUSize != 0 ) ? 1 : iNumSPInOneLine;
+  iNumSPInOneColumn = (iPUHeight % iSubPUSize != 0  || iPUWidth % iSubPUSize != 0 ) ? 1 : iNumSPInOneColumn;
+#endif
   iNumSP = iNumSPInOneLine * iNumSPInOneColumn;
 

branches/HTM-12.2-dev0/source/Lib/TLibCommon/TComRom.cpp

@@ -362 +362 @@
 const UChar g_dmm1TabIdxBits[6] =
 { //2x2   4x4   8x8 16x16 32x32 64x64
+#if MTK_DMM_SIM_J0035 
+     0,    7,   10,   9,    9,   13 };
+#else
      0,    7,   10,   11,   11,   13 };
+#endif
 
 const UChar g_dmm3IntraTabIdxBits[6] =
@@ -763 +767 @@
     }
 
+#if MTK_DMM_SIM_J0035
+    for( Int iK = 0; iK < uiBlockSize; iK += (uiWidth>=16 ?2:1))
+    {
+      for( Int iL = 0; iL < uiBlockSize; iL += ((uiWidth>=16 && uiOri<4)?2:1) )
+      {
+        cTempWedgelet.setWedgelet( uhStartX + (iK*iStepStartX) , uhStartY + (iK*iStepStartY), uhEndX + (iL*iStepEndX), uhEndY + (iL*iStepEndY), (UChar)uiOri, eWedgeRes, ((iL%2)==0 && (iK%2)==0) );
+        addWedgeletToList( cTempWedgelet, racWedgeList, racWedgeRefList );
+      }
+    }
+#else
     for( Int iK = 0; iK < uiBlockSize; iK++ )
     {
@@ -771 +785 @@
       }
     }
+#endif
   }
 

branches/HTM-12.2-dev0/source/Lib/TLibCommon/TComSlice.cpp

@@ -1972 +1972 @@
     m_ivMvScalingFlag[i] = true; 
     m_bIVPFlag [i]      = false;
+#if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
+    m_singleDepthModeFlag[ i ] = false;
+#endif
 #endif
 #endif
@@ -3081 +3084 @@
       i++;
     }
+#if SHARP_DLT_SIMP_J0029
+    iIdxUp = bFound ?  iIdxDown + 1 : iNumDepthValues-1;
+#else
     // iterate over indices to find upper closest depth
     i = iNumDepthValues-2;
@@ -3097 +3103 @@
     // assert monotony
     assert(iIdxDown<=iIdxUp);
+#endif
 
     // assign closer depth value/idx

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

@@ -970 +970 @@
   Bool        m_bMPIFlag[MAX_NUM_LAYERS   ];
 #endif
+#if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
+  Bool        m_singleDepthModeFlag    [ MAX_NUM_LAYERS ];
+#endif
 #endif
 
@@ -1400 +1403 @@
   Bool    getMPIFlag      ( Int layerIdInVps )           { return m_bMPIFlag[layerIdInVps]; }
   Void    setMPIFlag      ( Int layerIdInVps, Bool bval ){ m_bMPIFlag[layerIdInVps] = bval; }
+#endif
+#if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
+  Void    setSingleDepthModeFlag  ( Int layerIdInVps, Bool val )  { m_singleDepthModeFlag[ layerIdInVps ] = val; }
+  Bool    getSingleDepthModeFlag  ( Int layerIdInVps )            { return m_singleDepthModeFlag[ layerIdInVps ]; }; 
 #endif
 #endif  
@@ -2604 +2611 @@
   TComPic*  getTexturePic       ()                              { return  m_ivPicsCurrPoc[0][ m_viewIndex ]; }
 #endif
+#if !MTK_SINGLE_DEPTH_VPS_FLAG_J0060
 #if H_3D_SINGLE_DEPTH
   Void      setApplySingleDepthMode( Bool b )                                { m_bApplySingleDepthMode = b; }
   Bool      getApplySingleDepthMode()                                        { return m_bApplySingleDepthMode; }
+#endif
 #endif
 #if H_3D_IC

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

@@ -182 +182 @@
                                               // SEC_SIMP_SHIFTED_DV_I0086     Simplification of Shifted DV candidate, JCT3V-I0086
 
+#define MTK_MRG_LIST_SIZE_CLEANUP_J0059   1   // Include VSP for deriving merge candidate list size, JCT3V-J0059
 
 
@@ -235 +236 @@
 
 #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 MTK_J0033                         1
+#define SHARP_DLT_SIMP_J0029              1   // DLT(DepthValue2Idx[]) table derivation cleanup
 
 #define H_3D_INTER_SDC                    1   // INTER SDC, Inter simplified depth coding
@@ -277 +281 @@
 #define H_3D_FAST_DEPTH_INTRA             1   // Fast DMM and RBC Mode Selection
                                               // SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
+#define MTK_DMM_SIM_J0035                 1
 #endif
 
@@ -307 +312 @@
 #if H_3D_SINGLE_DEPTH
 #define SINGLE_DEPTH_MODE_CAND_LIST_SIZE            2 // size of the sample candidate list
+#define SINGLE_DEPTH_SIMP_J0115           1 
 #endif
 
@@ -379 +385 @@
 #if H_3D
 #define PPS_FIX_DEPTH                           1
+#endif
+
+
+#if H_3D_SPIVMP
+#define HS_SP_SIMP_J0066                        1
 #endif