Changeset 6 in SHVCSoftware for trunk/source/Lib/TLibEncoder

Timestamp:

8 Nov 2012, 20:54:05 (13 years ago)

Author:

seregin

Message:

Correct IntraBL cost and fix for couple of compiler warnings.

Location:

trunk/source/Lib/TLibEncoder

Files:

• TEncEntropy.cpp (modified) (1 diff)
• TEncSearch.cpp (modified) (4 diffs)
• TEncTop.cpp (modified) (1 diff)

trunk/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -237 +237 @@
   }
 
+#if INTRA_BL
+  if( pcCU->isIntraBL( uiAbsPartIdx ) )
+  {
+    return;
+  }
+#endif
+
   m_pcEntropyCoderIf->codePredMode( pcCU, uiAbsPartIdx );
 }

trunk/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -894 +894 @@
                             Bool         bChroma )
 {
-#if INTRA_BL
-  if ( pcCU->isIntraBL( 0 ))
-  {
-    return;
-  }
-#endif
-
   if( bLuma )
   {
@@ -917 +910 @@
 #if INTRA_BL
       m_pcEntropyCoder->encodeIntraBLFlag ( pcCU, 0, true );
-#endif
-      
+      if( pcCU->isIntraBL( 0 ) )
+      {
+        return;
+      }
+#endif      
       m_pcEntropyCoder  ->encodePartSize( pcCU, 0, pcCU->getDepth(0), true );
 
@@ -956 +952 @@
     }
   }
+#if INTRA_BL
+  if( pcCU->isIntraBL( 0 ) )
+  {
+    return;
+  }
+#endif
   if( bChroma )
   {
@@ -6153 +6155 @@
     }
     m_pcEntropyCoder->encodeSkipFlag ( pcCU, 0, true );
+#if INTRA_BL
+    if(m_pcEncCfg->getLayerId())
+    {
+      m_pcEntropyCoder->encodeIntraBLFlag(pcCU, 0, true);
+      assert( pcCU->isIntraBL( 0 ) == false );
+    }
+#endif
     m_pcEntropyCoder->encodePredMode( pcCU, 0, true );
     m_pcEntropyCoder->encodePartSize( pcCU, 0, pcCU->getDepth(0), true );

trunk/source/Lib/TLibEncoder/TEncTop.cpp

@@ -389 +389 @@
         m_cIlpPic[j] = new  TComPic;
         //m_cIlpPic[j]->createWithOutYuv(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, &m_cSPS, true);
+#if SVC_UPSAMPLING
         m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, &m_cSPS, true);
+#else
+        m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, true);
+#endif
 #if REF_IDX_ME_AROUND_ZEROMV
         m_cIlpPic[j]->setIsILR(true);