Changeset 1275 in SHVCSoftware

Timestamp:

16 Jul 2015, 00:29:30 (9 years ago)

Author:

seregin

Message:

update trace strings and parameter set pointers

Location:

branches/SHM-dev/source/Lib

Files:

• TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• TLibDecoder/TDecTop.cpp (modified) (3 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1140 +1140 @@
     }
     parseVPSExtension(pcVPS);
-    READ_FLAG( uiCode, "vps_entension2_flag" );
+    READ_FLAG( uiCode, "vps_extension2_flag" );
     if(uiCode)
     {
@@ -2230 +2230 @@
   }
   else
-  {
+  {  
+#if SVC_EXTENSION
+    READ_FLAG(    uiCode, PTL_TRACE_TEXT("inbld_flag"                      ));
+#else
     READ_FLAG(    uiCode, PTL_TRACE_TEXT("reserved_zero_bit"               ));
+#endif
   }
 #undef PTL_TRACE_TEXT
@@ -3042 +3046 @@
   READ_UVLC( uiCode,           "direct_dep_type_len_minus2"); vps->setDirectDepTypeLen(uiCode+2);
 
-  READ_FLAG(uiCode, "default_direct_dependency_type_flag"); 
+  READ_FLAG(uiCode, "direct_dependency_all_layers_flag"); 
   vps->setDefaultDirectDependecyTypeFlag(uiCode == 1? true : false);
 
   if( vps->getDefaultDirectDependencyTypeFlag() )
   {
-    READ_CODE( vps->getDirectDepTypeLen(), uiCode, "default_direct_dependency_type" ); 
+    READ_CODE( vps->getDirectDepTypeLen(), uiCode, "direct_dependency_all_layers_type" ); 
     vps->setDefaultDirectDependecyType(uiCode);
   }

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -958 +958 @@
       resetPocRestrictionCheckParameters();
 
-      markAllPicsAsNoCurrAu(m_apcSlicePilot->getVPS());
+      markAllPicsAsNoCurrAu(vps);
 
       for( UInt i = 0; i < MAX_LAYERS; i++ )
       {
-        m_ppcTDecTop[m_apcSlicePilot->getVPS()->getLayerIdInNuh(i)]->m_pocDecrementedInDPBFlag = false;
+        m_ppcTDecTop[vps->getLayerIdInNuh(i)]->m_pocDecrementedInDPBFlag = false;
       }
     }
@@ -1056 +1056 @@
 
     //Do the reset stuff here
-    Int maxPocLsb = 1 << m_apcSlicePilot->getSPS()->getBitsForPOC();
+    Int maxPocLsb = 1 << sps->getBitsForPOC();
     Int pocLsbVal;
     if( m_apcSlicePilot->getPocResetIdc() == 3 )
@@ -1143 +1143 @@
     iPOCLastDisplay -= deltaPocVal;
   }
-  Int maxPocLsb = 1 << m_apcSlicePilot->getSPS()->getBitsForPOC();
+  Int maxPocLsb = 1 << sps->getBitsForPOC();
   Int slicePicOrderCntLsb = m_apcSlicePilot->getPicOrderCntLsb();
 

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

@@ -2100 +2100 @@
       if( vps->getNecessaryLayerFlag(i, j) && (vps->getNumProfileTierLevel() - 1) > 0 )
       {
-        WRITE_CODE( vps->getProfileLevelTierIdx(i, j), numBitsForPtlIdx, "profile_level_tier_idx[i]" );
+        WRITE_CODE( vps->getProfileLevelTierIdx(i, j), numBitsForPtlIdx, "profile_tier_level_idx[i]" );
       }
     }
@@ -2172 +2172 @@
   WRITE_UVLC( vps->getDirectDepTypeLen()-2,                           "direct_dep_type_len_minus2");
 
-  WRITE_FLAG(vps->getDefaultDirectDependencyTypeFlag(), "default_direct_dependency_flag");
+  WRITE_FLAG(vps->getDefaultDirectDependencyTypeFlag(), "direct_dependency_all_layers_flag");
 
   if( vps->getDefaultDirectDependencyTypeFlag() )
   {
-    WRITE_CODE( vps->getDefaultDirectDependencyType(), vps->getDirectDepTypeLen(), "default_direct_dependency_type" );
+    WRITE_CODE( vps->getDefaultDirectDependencyType(), vps->getDirectDepTypeLen(), "direct_dependency_all_layers_type" );
   }
   else