Changeset 838 in 3DVCSoftware for branches/HTM-10.0rc1-dev0/source/App

Timestamp:

8 Feb 2014, 01:07:38 (11 years ago)

Author:

tech

Message:

Further fixes.

Location:

branches/HTM-10.0rc1-dev0/source/App

Files:

• TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)
• TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncoder/TAppEncCfg.h (modified) (2 diffs)

branches/HTM-10.0rc1-dev0/source/App/TAppDecoder/TAppDecTop.cpp

@@ -279 +279 @@
           bitstreamFile.seekg(location-streamoff(3));
           bytestream.reset();
-#if ENC_DEC_TRACE
 #if H_MV_ENC_DEC_TRAC
           const Bool resetCounter = false; 
@@ -290 +289 @@
             g_disableHLSTrace = true;     // Trancing of second parsing of SH is not carried out
           }          
-#else
-          g_nSymbolCounter = symCount;
-#endif
 #endif
         }

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

@@ -444 +444 @@
   ("QuadtreeTUMaxDepthIntra", m_uiQuadtreeTUMaxDepthIntra, 1u, "Depth of TU tree for intra CUs")
   ("QuadtreeTUMaxDepthInter", m_uiQuadtreeTUMaxDepthInter, 2u, "Depth of TU tree for inter CUs")
+#if H_MV  
   // Coding structure parameters
-#if H_MV  
   ("IntraPeriod,-ip",         m_iIntraPeriod,std::vector<Int>(1,-1), "Intra period in frames, (-1: only first frame), per layer")
 #else
+  // Coding structure paramters
 ("IntraPeriod,-ip",         m_iIntraPeriod,              -1, "Intra period in frames, (-1: only first frame)")
 #endif
@@ -629 +630 @@
 
   ("TransquantBypassEnableFlag", m_TransquantBypassEnableFlag, false, "transquant_bypass_enable_flag indicator in PPS")
-  ("CUTransquantBypassFlagValue", m_CUTransquantBypassFlagValue, false, "Fixed cu_transquant_bypass_flag value, when transquant_bypass_enable_flag is enabled")
+  ("CUTransquantBypassFlagForce", m_CUTransquantBypassFlagForce, false, "Force transquant bypass mode, when transquant_bypass_enable_flag is enabled")
   ("RecalculateQPAccordingToLambda", m_recalculateQPAccordingToLambda, false, "Recalculate QP values according to lambda values. Do not suggest to be enabled in all intra case")
   ("StrongIntraSmoothing,-sis",      m_useStrongIntraSmoothing,           true, "Enable strong intra smoothing for 32x32 blocks")
@@ -2361 +2362 @@
   printf("IBD:%d ", g_bitDepthY > m_inputBitDepthY || g_bitDepthC > m_inputBitDepthC);
   printf("HAD:%d ", m_bUseHADME           );
-  printf("SRD:%d ", m_bUseSBACRD          );
   printf("RDQ:%d ", m_useRDOQ            );
   printf("RDQTS:%d ", m_useRDOQTS        );

branches/HTM-10.0rc1-dev0/source/App/TAppEncoder/TAppEncCfg.h

@@ -286 +286 @@
 
   // coding tools (encoder-only parameters)
-  Bool      m_bUseSBACRD;                                     ///< flag for using RD optimization based on SBAC
   Bool      m_bUseASR;                                        ///< flag for using adaptive motion search range
   Bool      m_bUseHADME;                                      ///< flag for using HAD in sub-pel ME
@@ -385 +384 @@
   UInt       m_depthMADPred;
 #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 completely divided by the NumLCUInUnit
-
-#if KWU_RC_VIEWRC_E0227
-  vector<Int>     m_viewTargetBits;
-  Bool      m_viewWiseRateCtrl;                              ///< Flag for using view-wise rate control
-#endif
-#if KWU_RC_MADPRED_E0227
-  UInt       m_depthMADPred;
-#endif
-#endif
   Int       m_useScalingListId;                               ///< using quantization matrix
   Char*     m_scalingListFile;                                ///< quantization matrix file name