Changeset 493 in SHVCSoftware for branches/SHM-4.0-dev

Timestamp:

16 Nov 2013, 05:02:37 (11 years ago)

Author:

seregin

Message:

fix ILP WP parameters derivation to be from the BL reference layer

Location:

branches/SHM-4.0-dev/source/Lib/TLibEncoder

Files:

• TEncGOP.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (2 diffs)
• TEncSlice.h (modified) (1 diff)
• WeightPredAnalysis.cpp (modified) (1 diff)

branches/SHM-4.0-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1573 +1573 @@
     {
       pcPic->getPicYuvOrg()->copyToPic( pcPic->getPicYuvRec() );
+#if O0194_WEIGHTED_PREDICTION_CGS
+      // Calculate for the base layer to be used in EL as Inter layer reference
+      m_pcSliceEncoder->estimateILWpParam( pcSlice );
+#endif
 #if AVC_SYNTAX
       pcPic->readBLSyntax( m_ppcTEncTop[0]->getBLSyntaxFile(), SYNTAX_BYTES );

branches/SHM-4.0-dev/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -950 +950 @@
   {
     // Calculate for the base layer to be used in EL as Inter layer reference
-    xCalcACDCParamSlice(pcSlice);
-    wpACDCParam * temp_weightACDCParam;
-
-    pcSlice->getWpAcDcParam(temp_weightACDCParam);
-    g_refWeightACDCParam = (void *) temp_weightACDCParam;
+    estimateILWpParam( pcSlice );    
   }
 #endif
@@ -2093 +2089 @@
 }
 #endif
+#if O0194_WEIGHTED_PREDICTION_CGS
+Void TEncSlice::estimateILWpParam( TComSlice* pcSlice )
+{
+  xCalcACDCParamSlice(pcSlice);
+  wpACDCParam * temp_weightACDCParam;
+
+  pcSlice->getWpAcDcParam(temp_weightACDCParam);
+  g_refWeightACDCParam = (void *) temp_weightACDCParam;
+}
+#endif
 //! \}

branches/SHM-4.0-dev/source/Lib/TLibEncoder/TEncSlice.h

@@ -123 +123 @@
   Void    initEncSlice        ( TComPic*  pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd,
                                 Int iGOPid,   TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, TComVPS *vps, Bool isField );
+#if O0194_WEIGHTED_PREDICTION_CGS
+  Void    estimateILWpParam   ( TComSlice* pcSlice );
+#endif
 #else
   Void    initEncSlice        ( TComPic*  pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd,

branches/SHM-4.0-dev/source/Lib/TLibEncoder/WeightPredAnalysis.cpp

@@ -234 +234 @@
       UInt currLayerId = slice->getLayerId();
       UInt refLayerId  = slice->getRefPic(eRefPicList, refIdxTemp)->getLayerId();
-      Bool validILRPic = slice->getRefPic(eRefPicList, refIdxTemp)->isILR( currLayerId ) && !( refLayerId == 0 && slice->getVPS()->getAvcBaseLayerFlag() );
+      Bool validILRPic = slice->getRefPic(eRefPicList, refIdxTemp)->isILR( currLayerId ) && refLayerId == 0;
 
       if( validILRPic )