Changeset 151 in SHVCSoftware for branches

Timestamp:

4 May 2013, 01:05:56 (12 years ago)

Author:

seregin

Message:

compilation error fix

Location:

branches/SHM-2.0-dev/source/Lib

Files:

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

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

@@ -88 +88 @@
 #if REF_IDX_MFM
 #define RAP_MFM_INIT                     1      ///< initilizing MFM when base layer is RAP picture
+#endif
 #define REF_LIST_BUGFIX                  1
-#endif
 
 #else

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

@@ -845 +845 @@
       pcSlice->addRefPicList ( m_cIlpPic, 
                                1, 
-                               ((pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA) && 
+                               ((pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) && 
                                 (pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA)) ? 0: -1);
 #endif

branches/SHM-2.0-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -514 +514 @@
         }
       }
+#endif
 
 #if SVC_UPSAMPLING
@@ -521 +522 @@
       pcEPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 ,
                       m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics);
-#endif
 #endif
       rpcPic = pcEPic;
@@ -542 +542 @@
         }
       }
+#endif
 
 #if SVC_UPSAMPLING
@@ -549 +550 @@
       rpcPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, 
                       m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics);
-#endif
 #endif
     }