Changeset 1392 in 3DVCSoftware

Timestamp:

17 Nov 2015, 20:34:03 (9 years ago)

Author:

tech

Message:

• Cleanups.
• Fix of memory leak.
• Fix for ticket 114.

Location:

branches/HTM-16.0-dev1/source/Lib

Files:

• TLibCommon/TComDataCU.cpp (modified) (1 diff)
• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)
• TLibEncoder/TEncTop.cpp (modified) (1 diff)
• TLibRenderer/TRenModSetupStrParser.h (modified) (2 diffs)

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

@@ -5101 +5101 @@
 
   //// ******* Get disparity from left block ******* /////
-#if NH_3D_FIX_TICKET_91
-    pcTmpCU = getPULeft(uiIdx, uiPartIdxLB);
-#else
-  pcTmpCU = getPULeft(uiIdx, uiPartIdxLB, true, false);
-#endif
+  pcTmpCU = getPULeft(uiIdx, uiPartIdxLB);
   bCheckMcpDv = true; 
   if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, pDInfo, bCheckMcpDv, &cIDVInfo, DVFROM_LEFT

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

@@ -1923 +1923 @@
   for ( Int i = 0; i < MAX_VPS_OUTPUTLAYER_SETS; i++)
   {
-#if !NH_3D_FIX_TICKET_107
-    m_layerSetIdxForOlsMinus1[i]  = -1; 
-#endif
     for ( Int j = 0; j < MAX_VPS_NUH_LAYER_ID_PLUS1; j++)
     {

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

@@ -65 +65 @@
 #if NH_MV
 // Recent bug fixes
-#define NH_3D_FIX_TICKET_107                     1 // Clean up. 
-#define NH_3D_FIX_TICKET_91                      1 // NBDV availability in case of tiles.
+#define NH_3D_FIX_TICKET_114                     1  //Mismatch between text and software on DPB size syntax
+#define NH_3D_FIX_LEAK                           1
 // Things that needs to be fixed also in the Specification ...
 #define NH_MV_FIX_NO_REF_PICS_CHECK               1 // !!SPEC!!

branches/HTM-16.0-dev1/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2135 +2135 @@
     for( Int j = 0; j  <=  vps->getMaxSubLayersInLayerSetMinus1( currLsIdx ); j++ )
     {  
+#if NH_3D_FIX_TICKET_114
+      if( j > 0  &&  dpbSize.getSubLayerFlagInfoPresentFlag( i )  )  
+#else
       if( j > 0  &&  dpbSize.getSubLayerDpbInfoPresentFlag( i, j )  )  
+#endif
       {
         READ_FLAG( uiCode, "sub_layer_dpb_info_present_flag" ); dpbSize.setSubLayerDpbInfoPresentFlag( i, j, uiCode == 1 );

branches/HTM-16.0-dev1/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1428 +1428 @@
     for( Int j = 0; j  <=  vps->getMaxSubLayersInLayerSetMinus1( currLsIdx ); j++ )
     {  
+#if NH_3D_FIX_TICKET_114
+      if( j > 0  &&  dpbSize->getSubLayerFlagInfoPresentFlag( i )  )  
+#else
       if( j > 0  &&  dpbSize->getSubLayerDpbInfoPresentFlag( i, j )  )  
+#endif
       {
         WRITE_FLAG( dpbSize->getSubLayerDpbInfoPresentFlag( i, j ) ? 1 : 0 , "sub_layer_dpb_info_present_flag" );

branches/HTM-16.0-dev1/source/Lib/TLibEncoder/TEncTop.cpp

@@ -91 +91 @@
 TEncTop::~TEncTop()
 {
+#if NH_3D_FIX_LEAK
+#if NH_3D_IC
+  if ( m_aICEnableCandidate != NULL )
+  {
+    delete[] m_aICEnableCandidate;
+  }
+
+  if ( m_aICEnableNum != NULL )
+  {
+    delete[] m_aICEnableNum;
+  }
+#endif
+
+#endif
 #if ENC_DEC_TRACE
   if (g_hTrace != stdout)

branches/HTM-16.0-dev1/source/Lib/TLibRenderer/TRenModSetupStrParser.h

@@ -40 +40 @@
 #include "../TAppCommon/TAppComCamPara.h"
 #if NH_3D_VSO
-
-
-
 #include <list>
 #include <vector>
@@ -54 +51 @@
 #include <cstdio>
 #include <cstring>
-
 
 using namespace std;