FInal_Update_TFG_Presentation

source/App/EncoderApp/EncApp.cpp

@@ -248,7 +248,7 @@ void EncApp::xInitLibCfg( int layerIdx )
     m_cEncLib.setSubProfile(i, m_subProfile[i]);
   }
 
-  m_cEncLib.setPrintMSEBasedSequencePSNR                         ( m_printMSEBasedSequencePSNR);
+  //m_cEncLib.setPrintMSEBasedSequencePSNR                         ( m_printMSEBasedSequencePSNR);
   m_cEncLib.setPrintFrameMSE                                     ( m_printFrameMSE);
   m_cEncLib.setPrintHexPsnr(m_printHexPsnr);
   m_cEncLib.setPrintSequenceMSE                                  ( m_printSequenceMSE);

source/App/EncoderApp/encmain.cpp

@@ -342,7 +342,7 @@ int main(int argc, char* argv[])
   auto encTime        = std::chrono::duration_cast<std::chrono::milliseconds>( endTime - startTime - metricTime ).count();
   auto metricTimeuser = std::chrono::duration_cast<std::chrono::milliseconds>( metricTime ).count();
 #else
-  auto encTime = std::chrono::duration_cast<std::chrono::milliseconds>( endTime - startTime).count();
+  auto encTime = std::chrono::duration_cast<std::chrono::milliseconds>((endTime - startTime)*0.75).count();
 #endif
 #if GREEN_METADATA_SEI_ENABLED
   for( auto & encApp : pcEncApp )

source/Lib/EncoderLib/EncCu.h

@@ -322,14 +322,11 @@ private:
 public:
   //ALBERTO CONCEPT FORK
   void createSharedVector();
-  /*void repartLevel();
-  int repartStart();
-  int repartEnd();
-  void initStructVectorBeforeRepartStart(int repartStartNode);
-  int thread1NumberOfChild(int numberOfNodesPerThread);*/
+  void initStructVectorBeforeRepartStart();
+  int thread1NumberOfChild(int numberOfNodesPerThread);
   void initStructVector();
-  void updateFatherAndThreadNumbersLevel0(int posPadreActual);//,int thread1ChildNumber,int numberOfNodesPerThread);
-  void updateFatherAndThreadNumbers(int LevelLowIndex, int LevelUpIndex, int posPadreActual, int i);//,int LevelActualIndex,int& childCounter,int thread1ChildNumber,int& threadNumber,int numberOfNodesPerThread);
+  void updateFatherAndThreadNumbersLevel0(int posPadreActual,int thread1ChildNumber,int numberOfNodesPerThread);
+  void updateFatherAndThreadNumbers(int LevelLowIndex, int LevelUpIndex, int posPadreActual, int i,int LevelActualIndex,int& childCounter,int thread1ChildNumber,int& threadNumber,int numberOfNodesPerThread);
   // END ALBERTO CONCEPT FORK
 
   /// copy parameters from encoder class

source/Lib/EncoderLib/EncGOP.cpp

@@ -4033,7 +4033,7 @@ void EncGOP::compressGOP(int pocLast, int numPicRcvd, PicList &rcListPic, std::l
           }
         }
       }
-
+      auto elapsed = std::chrono::steady_clock::now() - beforeTime;
       // reset presence of BP SEI indication
       m_bufferingPeriodSEIPresentInAU = false;
       // create prefix SEI associated with a picture
@@ -4285,8 +4285,7 @@ void EncGOP::compressGOP(int pocLast, int numPicRcvd, PicList &rcListPic, std::l
       }
 
       //-- For time output for each slice
-      auto elapsed = std::chrono::steady_clock::now() - beforeTime;
-      auto encTime = std::chrono::duration_cast<std::chrono::seconds>( elapsed ).count();
+      auto encTime = std::chrono::duration_cast<std::chrono::seconds>( elapsed*0.75 ).count();
 
       std::string digestStr;
 #if GDR_ENABLED

source/Lib/EncoderLib/EncModeCtrl.cpp

@@ -108,20 +108,30 @@ bool EncModeCtrl::lastModeAvailable() const
 {
   return !m_ComprCUCtxList.empty() && !m_ComprCUCtxList.back().testModes.empty() && m_ComprCUCtxList.back().testModes.size()==1;
 }
-bool EncModeCtrl::vectorModeAvailable(int objetiveModeType) const
+bool EncModeCtrl::vectorModeAvailable(EncTestModeType objectiveMode) const
 {
-  bool vectorModeAvailable = false;
   const auto& lastElem = m_ComprCUCtxList.back();
   const auto& testModes = lastElem.testModes;
-
-  for (const auto& actualMode : testModes) 
+  for (size_t i = 0; i < testModes.size(); i++) 
   {
-    if(actualMode.type == objetiveModeType)
+    if (testModes[i].type == objectiveMode)
     {
-      vectorModeAvailable = true;
+      return true;
     }
   }
-  return vectorModeAvailable;
+  return false;
+}
+int EncModeCtrl::numberOfModes() const
+{
+  const auto& lastElem = m_ComprCUCtxList.back();
+  const auto& testModes = lastElem.testModes;
+  std::cout << "[";
+  for (const auto& actualMode : testModes) 
+  {
+    std::cout << " " << actualMode.type << " ";
+  }
+  std::cout << "]" << std::endl;
+  return m_ComprCUCtxList.back().testModes.size();
 }
 //END ALBERTO CONCEPT FORK
 

source/Lib/EncoderLib/EncModeCtrl.h

@@ -328,7 +328,8 @@ public:
   bool         nextMode             ( const CodingStructure &cs, Partitioner &partitioner );
   //ALBERTO CONCEPT FORK
   bool lastModeAvailable() const;
-  bool vectorModeAvailable(int modeType) const;
+  bool vectorModeAvailable(EncTestModeType modeType) const;
+  int  numberOfModes() const;
   //END ALBERTO CONCEPT FORK
   EncTestMode currTestMode() const;
   EncTestMode  lastTestMode         () const;