Changeset 139 in 3DVCSoftware for branches/HTM-4.0-Nokia/source/Lib/TLibDecoder

Timestamp:

24 Sep 2012, 14:08:01 (13 years ago)

Author:

nokia

Message:

3DV-HTM v4.0: FCO

Location:

branches/HTM-4.0-Nokia/source/Lib/TLibDecoder

Files:

• TDecTop.cpp (modified) (5 diffs)
• TDecTop.h (modified) (3 diffs)

branches/HTM-4.0-Nokia/source/Lib/TLibDecoder/TDecTop.cpp

@@ -614 +614 @@
 
 #if SKIPFRAME_BUGFIX
-Bool TDecTop::xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay )
-#else
-Bool TDecTop::xDecodeSlice(InputNALUnit &nalu, Int iSkipFrame, Int iPOCLastDisplay )
+Bool TDecTop::xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay
+)
+#else
+Bool TDecTop::xDecodeSlice(InputNALUnit &nalu, Int iSkipFrame, Int iPOCLastDisplay
+                           )
 #endif
 {
@@ -969 +971 @@
     assert( m_tAppDecTop != NULL );
     TComPic * const pcTexturePic = m_isDepth ? m_tAppDecTop->getPicFromView(  m_viewId, pcSlice->getPOC(), false ) : NULL;
+
+#if FLEX_CODING_ORDER
+    if (pcTexturePic != NULL)
+    {
+      assert( !m_isDepth || pcTexturePic != NULL );
+      pcSlice->setTexturePic( pcTexturePic );
+    }
+#else
     assert( !m_isDepth || pcTexturePic != NULL );
     pcSlice->setTexturePic( pcTexturePic );
+#endif
+    
+
+//     //original code 
+//     assert( !m_isDepth || pcTexturePic != NULL );
+//     pcSlice->setTexturePic( pcTexturePic );
+
+
 
     std::vector<TComPic*> apcInterViewRefPics = m_tAppDecTop->getInterViewRefPics( m_viewId, pcSlice->getPOC(), m_isDepth, pcSlice->getSPS() );
@@ -1082 +1100 @@
 }
 
+
+
+
+
 #if VIDYO_VPS_INTEGRATION
 Void TDecTop::xDecodeVPS()
@@ -1147 +1169 @@
 }
 
-Bool TDecTop::decode(InputNALUnit& nalu, Int& iSkipFrame, Int& iPOCLastDisplay)
+Bool TDecTop::decode(InputNALUnit& nalu, Int& iSkipFrame, Int& iPOCLastDisplay
+
+ )
 {
   // Initialize entropy decoder
@@ -1184 +1208 @@
     case NAL_UNIT_CODED_SLICE_CDR:
 #endif
-      return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay);
+      return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay
+        );
       break;
     default:

branches/HTM-4.0-Nokia/source/Lib/TLibDecoder/TDecTop.h

@@ -111 +111 @@
   TComList<TComPic*>      m_cListPic;         //  Dynamic buffer
   ParameterSetManagerDecoder m_parameterSetManagerDecoder;  // storage for parameter sets 
+
+
   TComRPSList             m_RPSList;
   TComSlice*              m_apcSlicePilot;
-  
+
   SEImessages *m_SEIs; ///< "all" SEI messages.  If not NULL, we own the object.
 
@@ -165 +167 @@
   
   Void  init( TAppDecTop* pcTAppDecTop, Bool bFirstInstance );
-  Bool  decode(InputNALUnit& nalu, Int& iSkipFrame, Int& iPOCLastDisplay);
+  Bool  decode(InputNALUnit& nalu, Int& iSkipFrame, Int& iPOCLastDisplay
+  );
   
   Void  deletePicBuffer();
@@ -204 +207 @@
   Void      xActivateParameterSets();
 #if SKIPFRAME_BUGFIX
-  Bool      xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay);
+  Bool      xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay
+    );
 #else
-  Bool      xDecodeSlice(InputNALUnit &nalu, Int iSkipFrame, Int iPOCLastDisplay);
+  Bool      xDecodeSlice(InputNALUnit &nalu, Int iSkipFrame, Int iPOCLastDisplay,
+    );
 #endif
 #if VIDYO_VPS_INTEGRATION