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

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/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (1 diff)
• TComSlice.cpp (modified) (1 diff)
• TypeDef.h (modified) (6 diffs)

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,