Changeset 928 in SHVCSoftware for branches/SHM-upgrade/source/Lib/TLibDecoder

Timestamp:

16 Dec 2014, 19:17:49 (10 years ago)

Author:

seregin

Message:

Port rev 924: in order to generate the metadata related to conformance bitstreams, patch was provided by Ramasubramonian, Adarsh Krishnan <aramasub@…>

Location:

branches/SHM-upgrade/source/Lib/TLibDecoder

Files:

• TDecGop.cpp (modified) (3 diffs)
• TDecTop.cpp (modified) (2 diffs)
• TDecTop.h (modified) (2 diffs)

branches/SHM-upgrade/source/Lib/TLibDecoder/TDecGop.cpp

@@ -45 +45 @@
 #if SVC_EXTENSION
 #include "TDecTop.h"
+#if CONFORMANCE_BITSTREAM_MODE
+#include <algorithm>
+#endif
 #endif
 
@@ -50 +53 @@
 
 extern Bool g_md5_mismatch; ///< top level flag to signal when there is a decode problem
+
+#if CONFORMANCE_BITSTREAM_MODE
+Bool pocCompareFunction( TComPic &pic1, TComPic &pic2 )
+{
+  return (pic1.getPOC() < pic2.getPOC());
+}
+#endif
 
 //! \ingroup TLibDecoder
@@ -241 +251 @@
     calcAndPrintHashStatus(*(pcPic->getPicYuvRec()), hash);
   }
+#if CONFORMANCE_BITSTREAM_MODE
+  if( this->getLayerDec(pcPic->getLayerId())->getConfModeFlag() ) 
+  {
+    // Add this reconstructed picture to the parallel buffer.
+    std::vector<TComPic> *thisLayerBuffer = (this->getLayerDec(pcPic->getLayerId()))->getConfListPic();
+    thisLayerBuffer->push_back(*pcPic);
+    std::sort( thisLayerBuffer->begin(), thisLayerBuffer->end(), pocCompareFunction );
+  }
+#endif
 #if Q0074_COLOUR_REMAPPING_SEI
   if (m_colourRemapSEIEnabled)

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

@@ -129 +129 @@
   m_pocDecrementedInDPBFlag = false;
 #endif
+#if CONFORMANCE_BITSTREAM_MODE
+  m_confModeFlag = false;
+#endif
 }
 
@@ -2960 +2963 @@
   {
     // Check if the target decoded layer is the highest layer in the list
+#if !CONFORMANCE_BITSTREAM_MODE
     assert( params->getTargetOutputLayerSetIdx() < vps->getNumLayerSets() );
+#endif
     Int layerSetIdx = vps->getOutputLayerSetIdx( params->getTargetOutputLayerSetIdx() );  // Index to the layer set
+#if !CONFORMANCE_BITSTREAM_MODE
     assert( params->getTargetLayerId() == vps->getNumLayersInIdList( layerSetIdx ) - 1);
+#endif
 
     Bool layerSetMatchFlag = true;

branches/SHM-upgrade/source/Lib/TLibDecoder/TDecTop.h

@@ -170 +170 @@
                                            // When new VPS is activated, this should be re-initialized to -1
 #endif
+#if CONFORMANCE_BITSTREAM_MODE
+  Bool m_confModeFlag;
+  std::vector<TComPic>   m_confListPic;         //  Dynamic buffer for storing pictures for conformance purposes
+#endif
 public:
 #if POC_RESET_RESTRICTIONS
@@ -304 +308 @@
   Void assignSubDpbs(TComVPS *vps);
 #endif
+#if CONFORMANCE_BITSTREAM_MODE
+  std::vector<TComPic>* getConfListPic() {return &m_confListPic; }
+  // std::string const getDecodedYuvLayerFileName(Int layerId) { return m_decodedYuvLayerFileName[layerId]; }
+  Bool const getConfModeFlag() { return m_confModeFlag; }
+  Void setConfModeFlag(Bool x) { m_confModeFlag = x; }
+#endif
 #endif //SVC_EXTENSION