Changeset 530 in 3DVCSoftware

Timestamp:

8 Jul 2013, 19:40:03 (11 years ago)

Author:

mitsubishi-htm

Message:

-VSP remaining stuff wrapped up.
-4x4 VSP in effect.

Location:

branches/HTM-DEV-0.3-dev2/source/Lib

Files:

• TLibCommon/TComDataCU.cpp (modified) (3 diffs)
• TLibCommon/TComDataCU.h (modified) (2 diffs)
• TLibCommon/TComPrediction.cpp (modified) (2 diffs)
• TLibCommon/TComPrediction.h (modified) (3 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp

@@ -2645 +2645 @@
                                      Bool* abCandIsInter, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int* vspFlag )
 {
-  if ( pDInfo->bDV == false || ucVspMergePos != H_3D_VSP_POSITION || 0 == m_pcSlice->getViewIndex() || 
-      !m_pcSlice->getVPS()->getViewSynthesisPredFlag( m_pcSlice->getLayerIdInVps() ) || // Not to add the candidate if VSP is turned off
-       m_pcSlice->getIsDepth() ) // VSP is disabled for depth layers
+  if ( ucVspMergePos != H_3D_VSP_POSITION || 0 == m_pcSlice->getViewIndex() || !m_pcSlice->getVPS()->getViewSynthesisPredFlag( m_pcSlice->getLayerIdInVps() ) || m_pcSlice->getIsDepth() )
     return false;
 
@@ -2726 +2724 @@
       , Int* vspFlag
 #endif
-      , Int& numValidMergeCand
-      , Int mrgCandIdx
+      , Int& numValidMergeCand, Int mrgCandIdx
 )
 {
@@ -2831 +2828 @@
 #endif
           //pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
-#if H_3D_CLEANUPS //Notes from QC: for BVSP coded blocks, the reference index shall not be equal to -1 due to the adoption of JCT3V-D0191
+#if H_3D_CLEANUPS
           pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
 #else

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.h

@@ -227 +227 @@
 #if H_3D_VSP
   Bool          xAddVspCand( UChar ucVspMergePos, Int mrgCandIdx, DisInfo* pDInfo, Int& iCount,
-                             Bool* abCandIsInter, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int* vspIdxTrue );
+                             Bool* abCandIsInter, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int* vspFlag );
 #endif
 
@@ -561 +561 @@
                                             , Int* vspFlag
 #endif
-                                            , Int& numValidMergeCand
-                                            , Int mrgCandIdx = -1 );
+                                            , Int& numValidMergeCand, Int mrgCandIdx = -1 );
 #if H_3D_VSP
   Char*         getVSPFlag        ()                        { return m_piVSPFlag;          }

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComPrediction.cpp

@@ -1835 +1835 @@
 
 #if H_3D_VSP_CONSTRAINED
-
 Int TComPrediction::xGetConstrainedSize(Int nPbW, Int nPbH, Bool bLuma)
 {
@@ -1853 +1852 @@
   return iSize;
 }
-
-#endif
-
-
-#endif
-
+#endif // H_3D_VSP_CONSTRAINED
+
+#endif // H_3D_VSP
 
 //! \}

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComPrediction.h

@@ -80 +80 @@
 
 #if H_3D_VSP
-  Int*   m_pDepthBlock; ///< Local variable, to store a depth block, just to prevent allocate memory every time
+  Int*   m_pDepthBlock;         ///< Store a depth block, local variable, to prevent memory allocation every time
 #if H_3D_VSP_CONSTRAINED
   Int  xGetConstrainedSize(Int nPbW, Int nPbH, Bool bLuma = true);
@@ -91 +91 @@
   // motion compensation functions
 #if H_3D_ARP
-  Void xPredInterUniARP         ( TComDataCU* pcCU,                          UInt uiPartAddr,                    Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi=false, TComMvField * pNewMvFiled = NULL );
+  Void xPredInterUniARP         ( TComDataCU* pcCU,                          UInt uiPartAddr,               Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi=false, TComMvField * pNewMvFiled = NULL );
 #endif
-  Void xPredInterUni            ( TComDataCU* pcCU,                          UInt uiPartAddr,                    Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi=false          );
-  Void xPredInterBi             ( TComDataCU* pcCU,                          UInt uiPartAddr,                    Int iWidth, Int iHeight,                         TComYuv*& rpcYuvPred );
+  Void xPredInterUni            ( TComDataCU* pcCU,                          UInt uiPartAddr,               Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi=false          );
+  Void xPredInterBi             ( TComDataCU* pcCU,                          UInt uiPartAddr,               Int iWidth, Int iHeight,                         TComYuv*& rpcYuvPred );
 #if H_3D_VSP
-  Void xPredInterUniVSP         ( TComDataCU* pcCU,                          UInt uiPartAddr,                    Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi=false          );
-  Void xPredInterBiVSP          ( TComDataCU* pcCU,                          UInt uiPartAddr,                    Int iWidth, Int iHeight,                         TComYuv*& rpcYuvPred );
+  Void xPredInterUniVSP         ( TComDataCU* pcCU,                          UInt uiPartAddr,               Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi=false          );
+  Void xPredInterBiVSP          ( TComDataCU* pcCU,                          UInt uiPartAddr,               Int iWidth, Int iHeight,                         TComYuv*& rpcYuvPred );
 #endif
 
@@ -119 +119 @@
 
 #if H_3D_VSP
-  Void xPredInterLumaBlkFromDM  ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, TComMv* dv, UInt partAddr, Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth
-                                , TComYuv *&dstPic
-                                , Bool bi );
-  Void xPredInterChromaBlkFromDM( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, TComMv* dv, UInt partAddr, Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth
-                                , TComYuv *&dstPic
-                                , Bool bi );
+  Void xPredInterLumaBlkFromDM  ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, TComMv* dv, UInt partAddr, Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth, TComYuv *&dstPic, Bool bi );
+  Void xPredInterChromaBlkFromDM( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, TComMv* dv, UInt partAddr, Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth, TComYuv *&dstPic, Bool bi );
 #endif
 

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h

@@ -99 +99 @@
 #define H_3D_NBDV_REF                     1   // Depth oriented neighboring block disparity derivation
                                               // MTK_D0156
-                                              // MERL_VSP_NBDV_RefVId_Fix_D0166
-                                              // MERL_C0152
-#endif
-#define H_3D_VSP                          1   // View syntheis prediction, C0152, D0166, D0092, 
+                                              // MERL_D0166: Reference view selection in NBDV & Bi-VSP
+                                              // MERL_C0152: Basic VSP
+#endif
+#define H_3D_VSP                          1   // View synthesis prediction
+                                              // MERL_C0152: Basic VSP
+                                              // MERL_D0166: Reference view selection in NBDV & Bi-VSP
                                               // MTK_D0105, LG_D0139: No VSP for depth
-                                              // MTK_D0156,
-                                              // MERL_C0152: Basic VSP
                                               // QC_D0191: Clean up
                                               // LG_D0092: Multiple VSP candidate allowed
-                                              // MTK_D0105: No VSP for depth. Single depth fetching for DoNBDV and VSP
-                                              //
-                                              //
 
 #if H_3D_VSP
 #define H_3D_VSP_POSITION                 3   // The only supported position
-#define H_3D_VSP_BLOCKSIZE                1   // Supported values: 1, 2, and 4
+#define H_3D_VSP_BLOCKSIZE                4   // Supported values: 1, 2, and 4
 #if H_3D_VSP_BLOCKSIZE == 1
 #define H_3D_VSP_CONSTRAINED              1   // Constrained VSP @ 1x1

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -828 +828 @@
     }
 
-    // A bug fix provided by Gerhard to deal with IBP configuration. NEED futher study
 #if H_MV
     if( pcSlice->getIdrPicFlag() )