Changeset 839 in 3DVCSoftware

Timestamp:

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

Author:

tech

Message:

Further fixes.

Location:

branches/HTM-10.0rc1-dev0/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)
• Lib/TLibCommon/TComTrQuant.h (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecSbac.h (modified) (1 diff)
• Lib/TLibDecoder/TDecSlice.cpp (modified) (2 diffs)
• Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncCfg.h (modified) (2 diffs)
• Lib/TLibEncoder/TEncCu.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncSearch.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/HTM-10.0rc1-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1097 +1097 @@
     }
   }
+#endif
 }
   
@@ -1855 +1856 @@
 }
 #endif
-
 //! \}

branches/HTM-10.0rc1-dev0/source/Lib/TLibCommon/TComTrQuant.h

@@ -151 +151 @@
 #if RDOQ_CHROMA_LAMBDA 
   Void setLambdas ( const Double lambdas[3] ) { for (Int component = 0; component < 3; component++) m_lambdas[component] = lambdas[component]; }
-  Void setLambda(Double dLambdaLuma, Double dLambdaChroma) { m_dLambdaLuma = dLambdaLuma; m_dLambdaChroma = dLambdaChroma; }
   Void selectLambda(TextType eTType) { m_dLambda = (eTType == TEXT_LUMA) ? m_lambdas[0] : ((eTType == TEXT_CHROMA_U) ? m_lambdas[1] : m_lambdas[2]); }
 #else

branches/HTM-10.0rc1-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -55 +55 @@
 
 #ifndef HEVC_EXT
-#define HEVC_EXT                    2
+#define HEVC_EXT                    0
 #endif
 

branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder/TDecSbac.h

@@ -94 +94 @@
   Void  parseSaoTypeIdx           ( UInt&  ruiVal  );
   Void  parseSaoUflc              ( UInt uiLength, UInt& ruiVal     );
+  Void parseSAOBlkParam (SAOBlkParam& saoBlkParam, Bool* sliceEnabled, Bool leftMergeAvail, Bool aboveMergeAvail);
+  Void parseSaoSign(UInt& val);
 private:
   Void  xReadUnarySymbol    ( UInt& ruiSymbol, ContextModel* pcSCModel, Int iOffset );

branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder/TDecSlice.cpp

@@ -336 +336 @@
         if(ry > 0)
         {
+          aboveMergeAvail = rpcPic->getSAOMergeAvailability(iCUAddr, iCUAddr-uiWidthInLCUs);
       }
 
@@ -342 +343 @@
       else 
         {
+        saoblkParam[SAO_Y ].modeIdc = SAO_MODE_OFF;
+        saoblkParam[SAO_Cb].modeIdc = SAO_MODE_OFF;
+        saoblkParam[SAO_Cr].modeIdc = SAO_MODE_OFF;
       }
     }

branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder/TDecTop.cpp

@@ -679 +679 @@
     m_uiSliceIdx     = 0;
   }
+  else
   {
     m_apcSlicePilot->copySliceInfo( pcPic->getPicSym()->getSlice(m_uiSliceIdx-1) );

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