Changeset 1064 in 3DVCSoftware for branches/HTM-12.0-dev1/source

Timestamp:

10 Oct 2014, 21:05:07 (11 years ago)

Author:

tech

Message:

• Further fixes
• Updated cfg files

Location:

branches/HTM-12.0-dev1/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (2 diffs)
• App/TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• App/TAppEncoder/TAppEncTop.cpp (modified) (5 diffs)
• Lib/TLibCommon/TComDataCU.cpp (modified) (1 diff)
• Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (6 diffs)

branches/HTM-12.0-dev1/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -429 +429 @@
   
 #if H_MV_HLS10_PTL
-  ("ProfileTierLevelIdx_%d",  m_profileTierLevelIdx, std::vector<Int>(0), MAX_NUM_LAYERS, "Indices to profile level tier")
+  ("ProfileTierLevelIdx_%d",  m_profileTierLevelIdx, std::vector<Int>(0), MAX_NUM_LAYERS, "Indices to profile level tier for ols")
 #else
   ("ProfileLevelTierIdx",   m_profileLevelTierIdx, std::vector<Int>(1,0), "Indices to profile level tier")
@@ -1240 +1240 @@
   {
 #if H_3D
-    cfg_profiles = string("main main 3D-main");
+    cfg_profiles = string("main main 3d-main");
 #else
     cfg_profiles = string("main main multiview-main");    

branches/HTM-12.0-dev1/source/App/TAppEncoder/TAppEncCfg.h

@@ -557 +557 @@
       cElement = strtok( NULL, " " );
     }
+    delete[] cString;
   }
 #endif

branches/HTM-12.0-dev1/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1396 +1396 @@
   // Max sub layers, + presence flag
   Bool subLayersMaxMinus1PresentFlag = false; 
+#if !H_MV_FIX_SUB_LAYERS_MAX_MINUS1
   Int  subLayersMaxMinus1 = -1; 
+#endif
   for (Int curLayerIdInVps = 0; curLayerIdInVps < m_numberOfLayers; curLayerIdInVps++ )
-  {
-    Int curSubLayersMaxMinus1 = -1; 
+  {    
+    Int curSubLayersMaxMinus1 = 0; 
     for( Int i = 0; i < getGOPSize(); i++ ) 
     {
@@ -1407 +1409 @@
 
     vps.setSubLayersVpsMaxMinus1( curLayerIdInVps, curSubLayersMaxMinus1 ); 
+#if !H_MV_FIX_SUB_LAYERS_MAX_MINUS1
     if ( subLayersMaxMinus1 == -1 )
     {
@@ -1415 +1418 @@
       subLayersMaxMinus1PresentFlag = subLayersMaxMinus1PresentFlag || ( curSubLayersMaxMinus1 != subLayersMaxMinus1 ); 
     }
+#else
+    subLayersMaxMinus1PresentFlag = subLayersMaxMinus1PresentFlag || ( curSubLayersMaxMinus1 != vps.getMaxSubLayersMinus1() );
+#endif
   }
 
@@ -1423 +1429 @@
   Bool maxTidRefPresentFlag = false; 
   for ( Int refLayerIdInVps = 0; refLayerIdInVps < m_numberOfLayers; refLayerIdInVps++)
-    {
+  {
     for ( Int curLayerIdInVps = 1; curLayerIdInVps < m_numberOfLayers; curLayerIdInVps++)
-      {
+    {
       Int maxTid = -1; 
+#if H_MV_FIX_LOOP_GOPSIZE
+      for( Int i = 0; i < ( getGOPSize() + 1); i++ ) 
+      {        
+        GOPEntry geCur =  m_GOPListMvc[curLayerIdInVps][( i < getGOPSize()  ? i : MAX_GOP )];
+        GOPEntry geRef =  m_GOPListMvc[refLayerIdInVps][( i < getGOPSize()  ? i : MAX_GOP )];
+#else
       for( Int i = 0; i < getGOPSize(); i++ ) 
       {        
         GOPEntry geCur =  m_GOPListMvc[curLayerIdInVps][i];
-        GOPEntry geRef =  m_GOPListMvc[refLayerIdInVps][i];
-        
+        GOPEntry geRef =  m_GOPListMvc[refLayerIdInVps][i];     
+#endif
         for (Int j = 0; j < geCur.m_numActiveRefLayerPics; j++)
         {        
           if ( m_directRefLayers[ curLayerIdInVps ][ geCur.m_interLayerPredLayerIdc[ j ]] == refLayerIdInVps )
           {
+#if H_MV_FIX_LOOP_GOPSIZE
+            Bool refAlwaysIntra = ( i == getGOPSize() ) && ( m_iIntraPeriod[ curLayerIdInVps ] % m_iIntraPeriod[ refLayerIdInVps ] == 0 );
+            Bool refLayerZero   = ( i == getGOPSize() ) && ( refLayerIdInVps == 0 );
+            maxTid = std::max( maxTid, ( refAlwaysIntra || refLayerZero ) ? 0 : geRef.m_temporalId ); 
+#else
             maxTid = std::max( maxTid, geRef.m_temporalId ); 
+#endif
           }
         }
@@ -1609 +1627 @@
   assert( ptl != NULL );
 
-
   ptl->setProfileIdc( profile );
   ptl->setTierFlag  ( tier    );
   ptl->setLevelIdc  ( level   );
   ptl->setProfileCompatibilityFlag( profile, true );
+#if H_MV_HLS10_PTL_INBL_FIX
+  ptl->setInbldFlag( inbldFlag );
+#endif
 
   switch ( profile )

branches/HTM-12.0-dev1/source/Lib/TLibCommon/TComDataCU.cpp

@@ -6164 +6164 @@
   TComMv cMv; 
 #if MTK_I0093
-  Int iDisp     = getSlice()->getDepthToDisparityB( 0 )[ 1 << ( getSlice()->getSPS()->getBitDepthY() - 1 ) ];
+#if H_3D_FIX_64BIT_SHIFT
+  Int iDisp     = getSlice()->getDepthToDisparityB( 0 )[ (Int64) (1 << ( getSlice()->getSPS()->getBitDepthY() - 1 )) ];
+#else
+  Int iDisp     = getSlice()->getDepthToDisparityB( 0 )[  1 << ( getSlice()->getSPS()->getBitDepthY() - 1 ) ];
+#endif
 #else
   Int iDisp     = getSlice()->getDepthToDisparityB( 0 )[ 128 ];

branches/HTM-12.0-dev1/source/Lib/TLibCommon/TComSlice.cpp

@@ -2309 +2309 @@
   for ( i = 0; i < iNumViews ; i++ )
   {
+#if H_3D_FIX_UNINIT
+    m_bCamParPresent[i] = false; 
+#endif
     m_bCamParInSliceHeader[i] = false; 
     m_aaaiCodedScale[i] = new Int*[ 2 ];

branches/HTM-12.0-dev1/source/Lib/TLibCommon/TypeDef.h

@@ -55 +55 @@
 
 #ifndef HEVC_EXT
-#define HEVC_EXT                    1
+#define HEVC_EXT                    2
 #endif
 
@@ -228 +228 @@
 #endif
 
+#define H_3D_FIX_UNINIT                   1   // Fix uninitialized flag
 #define H_3D_INTER_SDC                    1   // INTER SDC, Inter simplified depth coding
                                               // LGE_INTER_SDC_E0156 Enable inter SDC for depth coding
@@ -281 +282 @@
 #define SEC_HLS_CLEANUP_I0100             1
 
+#define H_3D_FIX_64BIT_SHIFT              1
 #endif // H_3D
 
@@ -405 +407 @@
 #define H_MV_HLS10_AUX                       1 // Auxiliary pictures
 #define H_MV_HLS10_GEN_FIX                   1
+#define H_MV_FIX_LOOP_GOPSIZE                1
+#define H_MV_FIX_SUB_LAYERS_MAX_MINUS1       1
 
 #define H_MV_HLS10_GEN_VSP_CONF_WIN          1  // VPS conformance window
@@ -415 +419 @@
 #define H_MV_HLS10_PTL                       1  // profile tier level
 #define H_MV_HLS10_PTL_FIX                   1  // profile tier level fix
+#define H_MV_HLS10_PTL_INBL_FIX              1  // profile tier level fix 
 #define H_MV_HLS10_PTL_INFER_FIX             1  // fix inference ptl
 #define H_MV_HLS10_MULTILAYERSPS             1  // multilayer SPS extension 
@@ -1013 +1018 @@
 #if H_MV_HLS10_PTL
     MULTIVIEWMAIN = 6,
-    MAIN3D = 5,
 #if H_3D
     MAIN3D = 8,