Changeset 747 in 3DVCSoftware for branches/HTM-9.0r1-F0122/source/Lib/TLibCommon

Timestamp:

17 Dec 2013, 21:57:52 (11 years ago)

Author:

qualcomm

Message:

MV-HEVC+D support based on JCT3V-F0122

Location:

branches/HTM-9.0r1-F0122/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (16 diffs)
• TComDataCU.h (modified) (1 diff)
• TComPic.cpp (modified) (2 diffs)
• TComPic.h (modified) (1 diff)
• TComSlice.cpp (modified) (2 diffs)
• TComSlice.h (modified) (2 diffs)
• TypeDef.h (modified) (5 diffs)

branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TComDataCU.cpp ¶

@@ -4057 +4057 @@
 
   numValidMergeCand = getSlice()->getMaxNumMergeCand();
-#if H_3D
+#if H_3DV
   //////////////////////////////////
   //////// DERIVE LOCATIONS ////////
@@ -4724 +4724 @@
   iCount += numA1B1B0;
 #else
-#if H_3D
+#if H_3DV
   ////////////////////////////
   //////// LEFT (A1) /////////
@@ -4815 +4815 @@
     return;
   }
-#if H_3D
+#if H_3DV
   ////////////////////////////
   //////// ABOVE (B1) ////////
@@ -4925 +4925 @@
   }
 
-#if H_3D
+#if H_3DV
   //////////////////////////////////
   //////// ABOVE RIGHT (B0) ////////
@@ -5128 +5128 @@
   iCount += numA0B2;
 #else
-#if H_3D
+#if H_3DV
   ///////////////////////////////////
   //////// LEFT BOTTOM (A0) ////////
@@ -5185 +5185 @@
     return;
   }
-#if H_3D
+#if H_3DV
   ///////////////////////////////////
   //////// LEFT ABOVE (B2) ////////
@@ -5297 +5297 @@
   numValidMergeCand = iCount;
 #else
-#if H_3D
+#if H_3DV
   /////////////////////////////////
   //////// Collocate (COL) ////////
@@ -5532 +5532 @@
   }
   numValidMergeCand = getSlice()->getMaxNumMergeCand();
-#if H_3D
+#if H_3DV
   //////////////////////////////////
   //////// DERIVE LOCATIONS ////////
@@ -5735 +5735 @@
 #endif
 
-#if H_3D
+#if H_3DV
   ////////////////////////////
   //////// LEFT (A1) /////////
@@ -5826 +5826 @@
     return;
   }
-#if H_3D
+#if H_3DV
   ////////////////////////////
   //////// ABOVE (B1) ////////
@@ -5936 +5936 @@
   }
 
-#if H_3D
+#if H_3DV
   //////////////////////////////////
   //////// ABOVE RIGHT (B0) ////////
@@ -6090 +6090 @@
   }
 #endif
-#if H_3D
+#if H_3DV
   ///////////////////////////////////
   //////// LEFT BOTTOM (A0) ////////
@@ -6147 +6147 @@
     return;
   }
-#if H_3D
+#if H_3DV
   ///////////////////////////////////
   //////// LEFT ABOVE (B2) ////////
@@ -6239 +6239 @@
   }
 #endif
-#if H_3D
+#if H_3DV
   /////////////////////////////////
   //////// Collocate (COL) ////////
@@ -7164 +7164 @@
                                         + ( iPartWidth/m_pcPic->getMinCUWidth()  )/2];
 }
-#if H_3D
+#if H_3DV
 Void TComDataCU::compressMV(Int scale)
 #else
@@ -7170 +7170 @@
 #endif
 {
-#if H_3D
+#if H_3DV
   Int scaleFactor = (4 / scale ) * AMVP_DECIMATION_FACTOR / m_unitSize;
 #else

branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TComDataCU.h ¶

@@ -660 +660 @@
   Void          getMvPredAbove        ( TComMv&     rcMvPred )   { rcMvPred = m_cMvFieldB.getMv(); }
   Void          getMvPredAboveRight   ( TComMv&     rcMvPred )   { rcMvPred = m_cMvFieldC.getMv(); }
-#if H_3D
+#if H_3DV
   Void          compressMV            ( Int scale );
 #else            

branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TComPic.cpp ¶

@@ -156 +156 @@
   deleteSEIs(m_SEIs);
 }
-#if H_3D
+#if H_3DV
 Void TComPic::compressMotion(Int scale)
 #else
@@ -166 +166 @@
   {
     TComDataCU* pcCU = pPicSym->getCU(uiCUAddr);
-#if H_3D
+#if H_3DV
     pcCU->compressMV(scale); 
 #else

branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TComPic.h ¶

@@ -184 +184 @@
   Void          setNumReorderPics(Int i, UInt tlayer) { m_numReorderPics[tlayer] = i;    }
   Int           getNumReorderPics(UInt tlayer)        { return m_numReorderPics[tlayer]; }
-#if H_3D
+#if H_3DV
   Void          compressMotion(Int scale); 
 #else   

branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TComSlice.cpp ¶

@@ -1811 +1811 @@
     }
 #endif
-#if H_3D
+#if H_3DV
     m_ivMvScalingFlag = true; 
 #endif
@@ -3029 +3029 @@
 { 
   Bool setupLUT = false; 
+#if H_3DV
   Int layerIdInVPS = getVPS()->getLayerIdInNuh( m_layerId ); 
-
+#endif
 #if H_3D_VSP
   setupLUT = setupLUT || getVPS()->getViewSynthesisPredFlag( layerIdInVPS); 

branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TComSlice.h ¶

@@ -616 +616 @@
   Int*        m_iIdx2DepthValue          [MAX_NUM_LAYERS   ];
 #endif
-#if H_3D
+#if H_3DV
   Bool        m_ivMvScalingFlag; 
 #endif
@@ -858 +858 @@
 #endif
 
+#if H_3DV
   Bool    getIvMvScalingFlag   (  )                       { return m_ivMvScalingFlag; }
   Void    setIvMvScalingFlag   ( Bool b )                 { m_ivMvScalingFlag = b;    }  
+#endif
 #if H_3D_INTER_SDC
   Bool    getInterSDCFlag      ( Int layerIdInVps )           { return m_bInterSDCFlag[layerIdInVps]; }

branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TypeDef.h ¶

@@ -74 +74 @@
 
 #if H_3D
+#define H_3DV                             1   // QC_F0122 MV-HEVC with depth support
+                                              // This macro equal to 1 indicates 3D-HEVC
+                                              // This macro equal to 0 indicates MV-HEVC plus depth coding
+                                              // CY:  H_3D is now mainly used to control the common framework, common high-level syntax (HLS) and 
+                                              //      common encoder optimization for both 3D-HEVC and MV-HEVC. 
+                                              //      H_3DV controls all the other 3D-HEVC features, including coding tools and different HLS.
+
 #define H_3D_QTLPC                        1   // OL_QTLIMIT_PREDCODING_B0068 //JCT3V-B0068
                                               // HHI_QTLPC_RAU_OFF_C0160     // JCT3V-C0160 change 2: quadtree limitation and predictive coding switched off in random access units 
@@ -82 +89 @@
                                               // SAIT_VSO_EST_A0033, JCT3V-A0033 modification 3
                                               // LGE_WVSO_A0119
+#if H_3DV
 #define H_3D_NBDV                         1   // Neighboring block disparity derivation 
                                               // QC_JCT3V-A0097 
@@ -180 +188 @@
 #define KWU_RC_MADPRED_E0227              0  ///< JCT3V-E0227, inter-view MAD prediction
 
+#endif // H_3DV
+#else
+#define H_3DV                             0  // QC_F0122 MV-HEVC with depth support, this value shall always be 0 here
 #endif // H_3D
 
@@ -248 +259 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 
-#if H_3D
+#if H_3DV
 
 #define FIX_MISSING_MACRO_R690                  1 // Missing macro in integration to revision 690
@@ -772 +783 @@
     MAIN10 = 2,
     MAINSTILLPICTURE = 3,
-#if H_MV
+#if H_MV || !H_3DV
     MAINSTEREO = 4,
     MAINMULTIVIEW = 5,
-#if H_3D
+#if H_3D && H_3DV
     MAIN3D = 6, 
 #endif