Changeset 1531 in SHVCSoftware for branches

Timestamp:

16 Mar 2016, 18:49:53 (9 years ago)

Author:

seregin

Message:

fix for CGS_3D_ASYMLUT = 0, ticket #102

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (2 diffs)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -54 +54 @@
 
 #define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
+#define CONFORMANCE_BITSTREAM_FIX        1
 
 #define AUXILIARY_PICTURES               1      ///< JCTVC-O0041: auxiliary picture layers
@@ -71 +72 @@
 #define NO_CLRAS_OUTPUT_FLAG             1
 
-#define CONFORMANCE_BITSTREAM_FIX        1
 /// scalability types
 enum ScalabilityType

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

@@ -1692 +1692 @@
                                      ((widthBL  << 16) + (widthEL  >> 1)) / widthEL, 
                                      ((heightBL << 16) + (heightEL >> 1)) / heightEL );
+
+        TComPicYuv* pBaseColRec = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec();
 #if CGS_3D_ASYMLUT 
-        TComPicYuv* pBaseColRec = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec();
         if( pcSlice->getPPS()->getCGSFlag() && m_c3DAsymLUTPPS.isRefLayer( pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc) ) )
         {

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

@@ -1644 +1644 @@
                                                 ((heightBL << 16) + (heightEL >> 1)) / heightEL );
 
-#if CGS_3D_ASYMLUT 
         TComPicYuv* pBaseColRec = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec();
+
+#if CGS_3D_ASYMLUT
         if( pcSlice->getPPS()->getCGSFlag() )
         {