Changeset 839 in 3DVCSoftware for branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder

Timestamp:

8 Feb 2014, 01:30:30 (11 years ago)

Author:

tech

Message:

Further fixes.

Location:

branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder

Files:

• TEncCfg.h (modified) (2 diffs)
• TEncCu.cpp (modified) (1 diff)
• TEncSearch.cpp (modified) (1 diff)
• TEncTop.cpp (modified) (1 diff)

branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncCfg.h

@@ -300 +300 @@
 #if KWU_RC_VIEWRC_E0227
   Bool      m_bViewWiseRateCtrl;
-#endif
-#else
-  Bool      m_enableRateCtrl;                                ///< Flag for using rate control algorithm
-  Int       m_targetBitrate;                                 ///< target bitrate
-  Int       m_numLCUInUnit;                                  ///< Total number of LCUs in a frame should be divided by the NumLCUInUnit
-
-#if KWU_RC_MADPRED_E0227
-  UInt       m_depthMADPred;
-#endif
-#if KWU_RC_VIEWRC_E0227
-  Bool      m_bViewWiseRateCtrl;
-#endif
 #endif
   Bool      m_TransquantBypassEnableFlag;                     ///< transquant_bypass_enable_flag setting in PPS.
@@ -830 +818 @@
   Void      setUseViewWiseRateCtrl    (Bool b)          { m_bViewWiseRateCtrl    = b;        }
 #endif
-#else
-  Bool      getUseRateCtrl    ()                { return m_enableRateCtrl;    }
-  Void      setUseRateCtrl    (Bool flag)       { m_enableRateCtrl = flag;    }
-  Int       getTargetBitrate  ()                { return m_targetBitrate;     }
-  Void      setTargetBitrate  (Int target)      { m_targetBitrate  = target;  }
-  Int       getNumLCUInUnit   ()                { return m_numLCUInUnit;      }
-  Void      setNumLCUInUnit   (Int numLCUs)     { m_numLCUInUnit   = numLCUs; }
-
-#if KWU_RC_MADPRED_E0227
-  UInt      getUseDepthMADPred    ()                { return m_depthMADPred;        }
-  Void      setUseDepthMADPred    (UInt b)          { m_depthMADPred    = b;        }
-#endif
-#if KWU_RC_VIEWRC_E0227
-  Bool      getUseViewWiseRateCtrl    ()                { return m_bViewWiseRateCtrl;        }
-  Void      setUseViewWiseRateCtrl    (Bool b)          { m_bViewWiseRateCtrl    = b;        }
-#endif
-#endif
   Bool      getTransquantBypassEnableFlag()           { return m_TransquantBypassEnableFlag; }
   Void      setTransquantBypassEnableFlag(Bool flag)  { m_TransquantBypassEnableFlag = flag; }

branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncCu.cpp

@@ -2238 +2238 @@
   else
 #endif
+
   rpcTempCU->getTotalCost()  = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
 #if H_3D_INTER_SDC

branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3950 +3950 @@
         pcCU->getCUMvField(REF_PIC_LIST_0)->setAllMvField( cMvFieldNeighbours[0 + 2*uiMergeCand], ePartSize, uiAbsPartIdx, 0, iPUIdx );
         pcCU->getCUMvField(REF_PIC_LIST_1)->setAllMvField( cMvFieldNeighbours[1 + 2*uiMergeCand], ePartSize, uiAbsPartIdx, 0, iPUIdx );
-      }
+
 #if NTT_STORE_SPDV_VSP_G0148
-}
+      }
 #endif
 #if H_3D_VSP && !NTT_STORE_SPDV_VSP_G0148

branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncTop.cpp

@@ -601 +601 @@
   m_uiNumAllPicCoded += iNumEncoded;
 }
-
+#endif
 // ====================================================================================================================
 // Protected member functions