Changeset 70 in SHVCSoftware

Timestamp:

7 Mar 2013, 23:25:14 (12 years ago)

Author:

seregin

Message:

reintegrate SHM-1.1-dev branch

Location:

trunk/source

Files:

• . (modified) (1 prop)
• Lib/TLibCommon/TComPic.cpp (modified) (3 diffs)
• Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)

trunk/source/Lib/TLibCommon/TComPic.cpp

@@ -48 +48 @@
 TComPic::TComPic()
 : m_uiTLayer                              (0)
+#if SVC_EXTENSION
+, m_layerId( 0 )
+#endif
 , m_bUsedByCurr                           (false)
 , m_bIsLongTerm                           (false)
@@ -66 +69 @@
 , m_SEIs                                  (NULL)
 #if SVC_EXTENSION
-, m_layerId( 0 )
 , m_bSpatialEnhLayer( false )
 , m_pcFullPelBaseRec( NULL )
@@ -98 +100 @@
   }
 
-  m_layerId = pcSps->getLayerId();
+  m_layerId = pcSps ? pcSps->getLayerId() : 0;
 
   /* there are no SEI messages associated with this picture initially */

trunk/source/Lib/TLibCommon/TComSlice.cpp

@@ -2220 +2220 @@
     RefPicList eRefPicList = RefPicList( iRefPicList );
 
-    assert( pcSlice->getNumRefIdx( eRefPicList) > 0 );
+    assert( pcSlice->getNumRefIdx( eRefPicList) >= 0 );
     setNumRefIdx( eRefPicList, pcSlice->getNumRefIdx( eRefPicList ) - 1 );
     assert( getNumRefIdx( eRefPicList) <= MAX_NUM_REF);