Ticket #60: fix60.patch

App/TAppEncoder/TAppEncTop.cpp

@@ -702 +702 @@
   for(Int layer=0; layer<m_numberOfLayers; layer++)
   {
 #if KWU_RC_MADPRED_E0227
+#if FIX60
+    m_acTEncTopList[layer]->init( this, isFieldCoding );
+#else
     m_acTEncTopList[layer]->init( isFieldCoding, this );
+#endif
 #else
     m_acTEncTopList[layer]->init( isFieldCoding );
 #endif

Lib/TLibCommon/TypeDef.h

@@ -53 +53 @@
    make HEVC_EXT=2  -> H_MV=1 H_3D=1   --> full 3D 
 */
 
+#define FIX60                1   //< fix ticket #60
+
 #ifndef HEVC_EXT
 #define HEVC_EXT                    2
 #endif

Lib/TLibEncoder/TEncCu.cpp

@@ -2036 +2036 @@
                 uhDepth );
 
               xCheckDQP( rpcTempCU );
+
+#if FIX60
+              if ( rpcTempCU->getSDCSegmentDCOffset( 0, 0 ) == 0 )
+              {
+                rpcTempCU->getTotalCost() = MAX_DOUBLE;
+              }
+#endif
+
               xCheckBestMode( rpcBestCU, rpcTempCU, uhDepth );
             }
 #else
@@ -2317 +2325 @@
         uhDepth );
 
       xCheckDQP( rpcTempCU );
+
+#if FIX60
+      if ( rpcTempCU->getSDCSegmentDCOffset( 0, 0 ) == 0 )
+      {
+        rpcTempCU->getTotalCost() = MAX_DOUBLE;
+      }
+#endif
+
       xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth);
     }
 #else

Lib/TLibEncoder/TEncRateCtrl.cpp

@@ -940 +940 @@
   Int   LCUIdx    = getLCUCoded();
   Double bpp      = -1.0;
   Int avgBits     = 0;
+
+#if !FIX60
 #if !M0036_RC_IMPROVEMENT
   Double totalMAD = -1.0;
   Double MAD      = -1.0;
 #endif
+#endif
 
   Double totalMAD = -1.0;
   Double MAD      = -1.0;

Lib/TLibEncoder/TEncSlice.cpp

@@ -1073 +1073 @@
           {
 #endif
           bpp = m_pcRateCtrl->getRCPic()->getLCUTargetBpp(pcSlice->getSliceType());
+
+#if FIX60 && KWU_RC_MADPRED_E0227
+          }
+#endif
           if ( rpcPic->getSlice( 0 )->getSliceType() == I_SLICE)
           {
             estLambda = m_pcRateCtrl->getRCPic()->getLCUEstLambdaAndQP(bpp, pcSlice->getSliceQp(), &estQP);