Changeset 498 in SHVCSoftware for trunk

Timestamp:

18 Nov 2013, 19:31:24 (11 years ago)

Author:

seregin

Message:

reintegrate branch SHM-4.0-dev

Location:

trunk

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• source/Lib/TLibCommon/TComUpsampleFilter.cpp (modified) (1 diff)

trunk/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1067 +1067 @@
   {
     UInt maxAuxId = 0;
-    UInt auxDimIdLen = 0;
+    UInt auxDimIdLen = 1;
     for(i = 1; i < vps->getMaxLayers(); i++)
     {

trunk/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -449 +449 @@
 #if  N0214_INTERMEDIATE_BUFFER_16BITS
 #if O0194_JOINT_US_BITSHIFT
-    nShift = 20 - g_bitDepthCLayer[refLayerId];
+    nShift = 20 - g_bitDepthCLayer[currLayerId];
 #else
     nShift = US_FILTER_PREC*2 - shift1;