Changeset 1563 in SHVCSoftware for branches

Timestamp:

20 Jun 2016, 17:31:56 (9 years ago)

Author:

seregin

Message:

port rev 4738

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -3188 +3188 @@
   Bool& m_CUTransquantBypassFlagForce         = m_apcLayerCfg[layerIdx]->m_CUTransquantBypassFlagForce;
 #endif
+
+#if U0132_TARGET_BITS_SATURATION
+  Int& m_RCTargetBitrate                      = m_apcLayerCfg[layerIdx]->m_RCTargetBitrate;
+#endif
 #else
 Void TAppEncCfg::xCheckParameter()
@@ -4060 +4064 @@
     xConfirmPara( m_RCCpbSaturationEnabled != 0, "Target bits saturation cannot be processed without Rate control" );
   }
+  if (m_vuiParametersPresentFlag)
+  {
+    xConfirmPara(m_RCTargetBitrate == 0, "A target bit rate is required to be set for VUI/HRD parameters.");
+    if (m_RCCpbSize == 0)
+    {
+      printf ("Warning: CPB size is set equal to zero. Adjusting value to be equal to TargetBitrate!\n");
+      m_RCCpbSize = m_RCTargetBitrate;
+    }
+  }
 #endif
   

branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -1042 +1042 @@
 Int calcScale(Int x)
 {
+  if (x==0)
+  {
+    return 0;
+  }
   UInt iMask = 0xffffffff;
   Int ScaleValue = 32;