Changeset 1092 in SHVCSoftware for branches

Timestamp:

1 Jul 2015, 23:34:53 (9 years ago)

Author:

seregin

Message:

fix ticket #81

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TComSlice.h (modified) (3 diffs)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -118 +118 @@
 , m_enableTMVPFlag                ( true )
 #if SVC_EXTENSION
+, m_firstSliceInPic               ( false )
 #if R0226_SLICE_TMVP
 , m_availableForTMVPRefFlag       ( true )

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

@@ -2269 +2269 @@
 #endif
   UInt        m_colFromL0Flag;  // collocated picture from List0 flag
-  
+
   Bool        m_noOutputPriorPicsFlag;
   Bool        m_noRaslOutputFlag;
@@ -2313 +2313 @@
 
 #if SVC_EXTENSION
+  Bool        m_firstSliceInPic;
 #if R0226_SLICE_TMVP
-  Bool       m_availableForTMVPRefFlag;
+  Bool        m_availableForTMVPRefFlag;
 #endif
   UInt        m_layerId;
@@ -2614 +2615 @@
 
 #if SVC_EXTENSION
+  Void      setFirstSliceInPic               ( Bool val )        { m_firstSliceInPic = val;                    }
+  Bool      getFirstSliceInPic               ()                  { return m_firstSliceInPic;                   }
 #if R0226_SLICE_TMVP
   Void      setAvailableForTMVPRefFlag     ( Bool   b )    { m_availableForTMVPRefFlag = b; }

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

@@ -1175 +1175 @@
   UInt firstSliceSegmentInPic;
   READ_FLAG( firstSliceSegmentInPic, "first_slice_segment_in_pic_flag" );
+
+#if SVC_EXTENSION
+  pcSlice->setFirstSliceInPic( firstSliceSegmentInPic );
+#endif
+
   if( pcSlice->getRapPicFlag())
   {

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

@@ -889 +889 @@
   // exit when a new picture is found
 #if SVC_EXTENSION
-  bNewPOC = (m_apcSlicePilot->getPOC()!= m_prevPOC);
+  bNewPOC = m_apcSlicePilot->getPOC() != m_prevPOC || ( m_apcSlicePilot->getFirstSliceInPic() && m_parseIdc == -1 );
 
 #if NO_OUTPUT_OF_PRIOR_PICS