Changeset 352 in SHVCSoftware

Timestamp:

20 Aug 2013, 18:44:40 (11 years ago)

Author:

seregin

Message:

merge SHM-3.0-dev branch

Location:

trunk/source

Files:

• . (modified) (1 prop)
• Lib/TLibCommon/CommonDef.h (modified) (1 diff)
• Lib/TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

trunk/source/Lib/TLibCommon/CommonDef.h

@@ -57 +57 @@
 
 #if SVC_EXTENSION
-#define NV_VERSION        "3.0"                 ///< Current software version
+#define NV_VERSION        "3.0.1"                 ///< Current software version
 #else
 #define NV_VERSION        "11.0"                ///< Current software version

trunk/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -804 +804 @@
 
 #if REF_IDX_FRAMEWORK
-#if M0457_COL_PICTURE_SIGNALING
+#if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
     if ( pcSlice->getSliceType() == B_SLICE && !(pcSlice->getActiveNumILRRefIdx() > 0 && m_pcEncTop->getNumMotionPredRefLayers() > 0) )
 #else
@@ -847 +847 @@
 #if M0457_COL_PICTURE_SIGNALING
 #if REMOVE_COL_PICTURE_SIGNALING
-      if( pcSlice->getMFMEnabledFlag() && pcSlice->getActiveNumILRRefIdx() > 0 && m_pcEncTop->getNumMotionPredRefLayers() > 0 )
+      if( pcSlice->getMFMEnabledFlag() )
 #else
       if( pcSlice->getMFMEnabledFlag() && !(pcSlice->getActiveNumILRRefIdx() > 0 && m_pcEncTop->getNumMotionPredRefLayers() > 0) )