Changeset 56 in SHVCSoftware for branches

Timestamp:

4 Mar 2013, 23:18:12 (12 years ago)

Author:

seregin

Message:

Intra-BL porting

Location:

branches/HM-10.0-dev-SHM/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)
• App/TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• Lib/TLibCommon/TComDataCU.cpp (modified) (2 diffs)
• Lib/TLibCommon/TComUpsampleFilter.cpp (modified) (8 diffs)
• Lib/TLibCommon/TypeDef.h (modified) (2 diffs)

branches/HM-10.0-dev-SHM/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -94 +94 @@
 TAppEncCfg::~TAppEncCfg()
 {
-#if !SVC_EXTENSION
+#if SVC_EXTENSION
+  free(m_pBitstreamFile);
+#else
+  free(m_pchBitstreamFile);
   if ( m_aidQP )
   {
@@ -101 +104 @@
   free(m_pchInputFile);
 #endif
-  free(m_pBitstreamFile);
 #if !SVC_EXTENSION  
   free(m_pchReconFile);
@@ -653 +655 @@
 #else
   m_pchInputFile = cfg_InputFile.empty() ? NULL : strdup(cfg_InputFile.c_str());
-  m_phBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
+  m_pchBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
   m_pchReconFile = cfg_ReconFile.empty() ? NULL : strdup(cfg_ReconFile.c_str());
   m_pchdQPFile = cfg_dQPFile.empty() ? NULL : strdup(cfg_dQPFile.c_str());

branches/HM-10.0-dev-SHM/source/App/TAppEncoder/TAppEncCfg.h

@@ -60 +60 @@
 #if SVC_EXTENSION
   TAppEncLayerCfg m_acLayerCfg [MAX_LAYERS]; 
-  Int       m_numLayers;                                     ///< number of layers
+  Int       m_numLayers;                                      ///< number of layers
 
   Char*     m_pBitstreamFile;                                 ///< output bitstream file

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComDataCU.cpp

@@ -2712 +2712 @@
   pcCULeftBottom->isDiffMER(xP-1, yP+nPSH, xP, yP) &&
 #if SVC_MVP
-  ( !pcColCU || pcColCU->isIntra( uiAbsPartAddrBase ) || !pcCULeftBottom->hasEqualMotion( uiLeftBottomPartIdx, puhInterDirNeighbours[0], &pcMvFieldNeighbours[0]))
+  ( !pcColCU || pcColCU->isIntra( uiAbsPartAddrBase ) || !pcCULeftBottom->hasEqualMotion( uiLeftBottomPartIdx, puhInterDirNeighbours[0], &pcMvFieldNeighbours[0])) &&
 #endif
   !pcCULeftBottom->isIntra( uiLeftBottomPartIdx ) ;
@@ -2756 +2756 @@
     pcCUAboveLeft->isDiffMER(xP-1, yP-1, xP, yP) &&
 #if SVC_MVP
-    ( !pcColCU || pcColCU->isIntra( uiAbsPartAddrBase ) || !pcCUAboveLeft->hasEqualMotion( uiAboveLeftPartIdx, puhInterDirNeighbours[0], &pcMvFieldNeighbours[0] ))
+    ( !pcColCU || pcColCU->isIntra( uiAbsPartAddrBase ) || !pcCUAboveLeft->hasEqualMotion( uiAboveLeftPartIdx, puhInterDirNeighbours[0], &pcMvFieldNeighbours[0] )) &&
 #endif
     !pcCUAboveLeft->isIntra( uiAboveLeftPartIdx );

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -171 +171 @@
   Int tempBufSizeRight = 0, tempBufSizeBottom = 0;
   
-  if ( pcBasePic->getPicCropRightOffset() )
-  {
-    tempBufSizeRight = pcBasePic->getPicCropRightOffset() * pcBasePic->getHeight();
-  }
-  
-  if( pcBasePic->getPicCropBottomOffset() )
-  {
-    tempBufSizeBottom = pcBasePic->getPicCropBottomOffset() * pcBasePic->getWidth ();
+  if( confBL.getWindowRightOffset())
+  {
+    tempBufSizeRight = confBL.getWindowRightOffset() * pcBasePic->getHeight();
+  }
+  
+  if( confBL.getWindowBottomOffset() )
+  {
+    tempBufSizeBottom = confBL.getWindowBottomOffset() * pcBasePic->getWidth ();
   }
   
@@ -241 +241 @@
     for( i = 0; i < pcBasePic->getHeight(); i++ )
     {
-      memcpy(piDstY, piSrcY, sizeof(Pel) * pcBasePic->getPicCropRightOffset());
+      memcpy(piDstY, piSrcY, sizeof(Pel) * confBL.getWindowRightOffset());
       piSrcY += iBStride;
-      piDstY += pcBasePic->getPicCropRightOffset();
+      piDstY += confBL.getWindowRightOffset();
     }
     
-    if(pcBasePic->getPicCropRightOffset()>>1)
+    if(confBL.getWindowRightOffset()>>1)
     {
       Int iBStrideChroma = (iBStride>>1);
       piSrcU = piSrcBufU + (iBWidth>>1);
-      piDstU = tempBufRight + pcBasePic->getPicCropRightOffset() * pcBasePic->getHeight();
+      piDstU = tempBufRight + confBL.getWindowRightOffset() * pcBasePic->getHeight();
       piSrcV = piSrcBufV + (iBWidth>>1);
-      piDstV = piDstU + (pcBasePic->getPicCropRightOffset()>>1) * (pcBasePic->getHeight()>>1);
+      piDstV = piDstU + (confBL.getWindowRightOffset()>>1) * (pcBasePic->getHeight()>>1);
     
       for( i = 0; i < pcBasePic->getHeight()>>1; i++ )
       {
-        memcpy(piDstU, piSrcU, sizeof(Pel) * (pcBasePic->getPicCropRightOffset()>>1));
+        memcpy(piDstU, piSrcU, sizeof(Pel) * (confBL.getWindowRightOffset()>>1));
         piSrcU += iBStrideChroma;
-        piDstU += (pcBasePic->getPicCropRightOffset()>>1);
+        piDstU += (confBL.getWindowRightOffset()>>1);
         
-        memcpy(piDstV, piSrcV, sizeof(Pel) * (pcBasePic->getPicCropRightOffset()>>1));
+        memcpy(piDstV, piSrcV, sizeof(Pel) * (confBL.getWindowRightOffset()>>1));
         piSrcV += iBStrideChroma;
-        piDstV += (pcBasePic->getPicCropRightOffset()>>1);
+        piDstV += (confBL.getWindowRightOffset()>>1);
       }
     }
@@ -273 +273 @@
     piSrcY = piSrcBufY + iBHeight * iBStride;
     piDstY = tempBufBottom;
-    for( i = 0; i < pcBasePic->getPicCropBottomOffset(); i++ )
+    for( i = 0; i < confBL.getWindowBottomOffset(); i++ )
     {
       memcpy(piDstY, piSrcY, sizeof(Pel) * pcBasePic->getWidth());
@@ -280 +280 @@
     }
     
-    if(pcBasePic->getPicCropBottomOffset()>>1)
+    if(confBL.getWindowBottomOffset()>>1)
     {
       Int iBStrideChroma = (iBStride>>1);
       piSrcU = piSrcBufU + (iBHeight>>1) * iBStrideChroma;
-      piDstU = tempBufBottom + pcBasePic->getPicCropBottomOffset() * pcBasePic->getWidth();
+      piDstU = tempBufBottom + confBL.getWindowBottomOffset() * pcBasePic->getWidth();
       piSrcV = piSrcBufV + (iBHeight>>1) * iBStrideChroma;
-      piDstV = piDstU + (pcBasePic->getPicCropBottomOffset()>>1) * (pcBasePic->getWidth()>>1);
+      piDstV = piDstU + (confBL.getWindowBottomOffset()>>1) * (pcBasePic->getWidth()>>1);
       
-      for( i = 0; i < pcBasePic->getPicCropBottomOffset()>>1; i++ )
+      for( i = 0; i < confBL.getWindowBottomOffset()>>1; i++ )
       {
         memcpy(piDstU, piSrcU, sizeof(Pel) * (pcBasePic->getWidth()>>1));
@@ -514 +514 @@
   {
     // put the correct width back
-    pcBasePic->setWidth(pcBasePic->getWidth()+pcBasePic->getPicCropRightOffset());
+    pcBasePic->setWidth(pcBasePic->getWidth() + confBL.getWindowRightOffset());
   }
   if( tempBufSizeBottom )
   {
-    pcBasePic->setHeight(pcBasePic->getHeight()+pcBasePic->getPicCropBottomOffset());
-  }
-  
-  iBWidth   = pcBasePic->getWidth () - pcBasePic->getPicCropLeftOffset() - pcBasePic->getPicCropRightOffset();
-  iBHeight  = pcBasePic->getHeight() - pcBasePic->getPicCropTopOffset() - pcBasePic->getPicCropBottomOffset();
+    pcBasePic->setHeight(pcBasePic->getHeight() + confBL.getWindowBottomOffset());
+  }
+  
+  iBWidth   = pcBasePic->getWidth () - confBL.getWindowLeftOffset() - confBL.getWindowRightOffset();
+  iBHeight  = pcBasePic->getHeight() - confBL.getWindowTopOffset() - confBL.getWindowBottomOffset();
   
   iBStride  = pcBasePic->getStride();
@@ -533 +533 @@
     for( i = 0; i < pcBasePic->getHeight(); i++ )
     {
-      memcpy(piDstY, piSrcY, sizeof(Pel) * pcBasePic->getPicCropRightOffset());
-      piSrcY += pcBasePic->getPicCropRightOffset();
+      memcpy(piDstY, piSrcY, sizeof(Pel) * confBL.getWindowRightOffset() );
+      piSrcY += confBL.getWindowRightOffset();
       piDstY += iBStride;
     }
     
-    if(pcBasePic->getPicCropRightOffset()>>1)
+    if(confBL.getWindowRightOffset()>>1)
     {
       Int iBStrideChroma = (iBStride>>1);
-      piSrcU = tempBufRight + pcBasePic->getPicCropRightOffset() * pcBasePic->getHeight();
+      piSrcU = tempBufRight + confBL.getWindowRightOffset() * pcBasePic->getHeight();
       piDstU = piSrcBufU + (iBWidth>>1);
-      piSrcV = piSrcU + (pcBasePic->getPicCropRightOffset()>>1) * (pcBasePic->getHeight()>>1);
+      piSrcV = piSrcU + (confBL.getWindowRightOffset()>>1) * (pcBasePic->getHeight()>>1);
       piDstV = piSrcBufV + (iBWidth>>1);
 
       for( i = 0; i < pcBasePic->getHeight()>>1; i++ )
       {
-        memcpy(piDstU, piSrcU, sizeof(Pel) * (pcBasePic->getPicCropRightOffset()>>1));
-        piSrcU += (pcBasePic->getPicCropRightOffset()>>1);
+        memcpy(piDstU, piSrcU, sizeof(Pel) * (confBL.getWindowRightOffset()>>1));
+        piSrcU += (confBL.getWindowRightOffset()>>1);
         piDstU += iBStrideChroma;
         
-        memcpy(piDstV, piSrcV, sizeof(Pel) * (pcBasePic->getPicCropRightOffset()>>1));
-        piSrcV += (pcBasePic->getPicCropRightOffset()>>1);
+        memcpy(piDstV, piSrcV, sizeof(Pel) * (confBL.getWindowRightOffset()>>1));
+        piSrcV += (confBL.getWindowRightOffset()>>1);
         piDstV += iBStrideChroma;
       }
@@ -563 +563 @@
     piDstY = piSrcBufY + iBHeight * iBStride;
     piSrcY = tempBufBottom;
-    for( i = 0; i < pcBasePic->getPicCropBottomOffset(); i++ )
+    for( i = 0; i < confBL.getWindowBottomOffset(); i++ )
     {
       memcpy(piDstY, piSrcY, sizeof(Pel) * pcBasePic->getWidth());
@@ -570 +570 @@
     }
     
-    if(pcBasePic->getPicCropBottomOffset()>>1)
+    if(confBL.getWindowBottomOffset()>>1)
     {
       Int iBStrideChroma = (iBStride>>1);
-      piSrcU = tempBufBottom + pcBasePic->getPicCropBottomOffset() * pcBasePic->getWidth();
+      piSrcU = tempBufBottom + confBL.getWindowBottomOffset() * pcBasePic->getWidth();
       piDstU = piSrcBufU + (iBHeight>>1) * iBStrideChroma;
-      piSrcV = piSrcU + (pcBasePic->getPicCropBottomOffset()>>1) * (pcBasePic->getWidth()>>1);
+      piSrcV = piSrcU + (confBL.getWindowBottomOffset()>>1) * (pcBasePic->getWidth()>>1);
       piDstV = piSrcBufV + (iBHeight>>1) * iBStrideChroma;
             
-      for( i = 0; i < pcBasePic->getPicCropBottomOffset()>>1; i++ )
+      for( i = 0; i < confBL.getWindowBottomOffset()>>1; i++ )
       {
         memcpy(piDstU, piSrcU, sizeof(Pel) * (pcBasePic->getWidth()>>1));

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TypeDef.h

@@ -79 +79 @@
 
 #else
-#define INTRA_BL                         0      ///< inter-layer texture prediction
+#define INTRA_BL                         1      ///< inter-layer texture prediction
 
 #if INTRA_BL
@@ -439 +439 @@
   MODE_INTER,           ///< inter-prediction mode
   MODE_INTRA,           ///< intra-prediction mode
+#if INTRA_BL
+  MODE_INTRA_BL,        ///< inter-layer intra-prediction mode
+#endif
   MODE_NONE = 15
 };