Changeset 930 in SHVCSoftware

Timestamp:

17 Dec 2014, 01:38:36 (10 years ago)

Author:

seregin

Message:

fix compiler warnings

Location:

branches/SHM-dev/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecGop.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecGop.h (modified) (1 diff)
• Lib/TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -1324 +1324 @@
 
 #if CONFORMANCE_BITSTREAM_MODE
-  FILE *fptr;
-  if( this->getConfModeFlag() )
-  {
-    if( this->getMetadataFileRefresh() )
-    {
-      fptr = fopen( this->getMetadataFileName().c_str(), "w" );
-      fprintf(fptr, " LayerId      POC    MD5\n");
-      fprintf(fptr, "------------------------\n");
-    }
-    else
-    {
-      fptr = fopen( this->getMetadataFileName().c_str(), "a+" );
-    }
-    this->setMetadataFileRefresh(false);
-    UChar recon_digest[3][16];
-    calcMD5(*pic->getPicYuvRec(), recon_digest);
-    fprintf(fptr, "%8d%9d    MD5:%s\n", pic->getLayerId(), pic->getSlice(0)->getPOC(), digestToString(recon_digest, 16));
-    fclose(fptr);
-
-    // Output all picutres "decoded" in that layer that have POC less than the current picture
-    std::vector<TComPic> *layerBuffer = (m_acTDecTop->getLayerDec(pic->getLayerId()))->getConfListPic();
-    // Write all pictures to the file.
-    if( this->getDecodedYuvLayerRefresh(layerIdx) )
-    {
-      if (!m_outputBitDepthY) { m_outputBitDepthY = g_bitDepthY; }
-      if (!m_outputBitDepthC) { m_outputBitDepthC = g_bitDepthC; }
-
-      char tempFileName[256];
-      strcpy(tempFileName, this->getDecodedYuvLayerFileName( layerIdx ).c_str());
-      m_confReconFile[layerIdx].open(tempFileName, true, m_outputBitDepthY, m_outputBitDepthC, g_bitDepthY, g_bitDepthC ); // write mode
-      this->setDecodedYuvLayerRefresh( layerIdx, false );
-    }
-    const Window &conf = pic->getConformanceWindow();
-    const Window &defDisp = m_respectDefDispWindow ? pic->getDefDisplayWindow() : Window();
-    Int xScal =  1, yScal = 1;
-  #if REPN_FORMAT_IN_VPS
-    UInt chromaFormatIdc = pic->getSlice(0)->getChromaFormatIdc();
-    xScal = TComSPS::getWinUnitX( chromaFormatIdc );
-    yScal = TComSPS::getWinUnitY( chromaFormatIdc );
-  #endif
-    std::vector<TComPic>::iterator iterPic;
-    for(iterPic = layerBuffer->begin(); iterPic != layerBuffer->end(); iterPic++)
-    {
-       TComPic checkPic = *iterPic;
-       if( checkPic.getPOC() <= pic->getPOC() )
-       {
-         TComPicYuv* pPicCYuvRec = checkPic.getPicYuvRec();
-         m_confReconFile[layerIdx].write( pPicCYuvRec,
-                                  conf.getWindowLeftOffset()  * xScal + defDisp.getWindowLeftOffset(),
-                                  conf.getWindowRightOffset() * xScal + defDisp.getWindowRightOffset(),
-                                  conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
-                                  conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
-         layerBuffer->erase(iterPic);
-         iterPic = layerBuffer->begin();  // Ensure doesn't go to infinite loop
-         if(layerBuffer->size() == 0)
-         {
-           break;
-         }
-       }
-    }
-  }
-  // Now to remove the pictures that have been output
+      FILE *fptr;
+      if( this->getConfModeFlag() )
+      {
+        if( this->getMetadataFileRefresh() )
+        {
+          fptr = fopen( this->getMetadataFileName().c_str(), "w" );
+          fprintf(fptr, " LayerId      POC    MD5\n");
+          fprintf(fptr, "------------------------\n");
+        }
+        else
+        {
+          fptr = fopen( this->getMetadataFileName().c_str(), "a+" );
+        }
+        this->setMetadataFileRefresh(false);
+        UChar recon_digest[3][16];
+        calcMD5(*pic->getPicYuvRec(), recon_digest);
+        fprintf(fptr, "%8d%9d    MD5:%s\n", pic->getLayerId(), pic->getSlice(0)->getPOC(), digestToString(recon_digest, 16));
+        fclose(fptr);
+
+        // Output all picutres "decoded" in that layer that have POC less than the current picture
+        std::vector<TComPic> *layerBuffer = (m_acTDecTop->getLayerDec(pic->getLayerId()))->getConfListPic();
+        // Write all pictures to the file.
+        if( this->getDecodedYuvLayerRefresh(layerIdx) )
+        {
+          if (!m_outputBitDepthY) { m_outputBitDepthY = g_bitDepthY; }
+          if (!m_outputBitDepthC) { m_outputBitDepthC = g_bitDepthC; }
+
+          char tempFileName[256];
+          strcpy(tempFileName, this->getDecodedYuvLayerFileName( layerIdx ).c_str());
+          m_confReconFile[layerIdx].open(tempFileName, true, m_outputBitDepthY, m_outputBitDepthC, g_bitDepthY, g_bitDepthC ); // write mode
+          this->setDecodedYuvLayerRefresh( layerIdx, false );
+        }
+        const Window &conf = pic->getConformanceWindow();
+        const Window &defDisp = m_respectDefDispWindow ? pic->getDefDisplayWindow() : Window();
+        Int xScal =  1, yScal = 1;
+#if REPN_FORMAT_IN_VPS
+        UInt chromaFormatIdc = pic->getSlice(0)->getChromaFormatIdc();
+        xScal = TComSPS::getWinUnitX( chromaFormatIdc );
+        yScal = TComSPS::getWinUnitY( chromaFormatIdc );
+#endif
+        std::vector<TComPic>::iterator itPic;
+        for(itPic = layerBuffer->begin(); itPic != layerBuffer->end(); itPic++)
+        {
+          TComPic checkPic = *itPic;
+          if( checkPic.getPOC() <= pic->getPOC() )
+          {
+            TComPicYuv* pPicCYuvRec = checkPic.getPicYuvRec();
+            m_confReconFile[layerIdx].write( pPicCYuvRec,
+              conf.getWindowLeftOffset()  * xScal + defDisp.getWindowLeftOffset(),
+              conf.getWindowRightOffset() * xScal + defDisp.getWindowRightOffset(),
+              conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
+              conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
+            layerBuffer->erase(itPic);
+            itPic = layerBuffer->begin();  // Ensure doesn't go to infinite loop
+            if(layerBuffer->size() == 0)
+            {
+              break;
+            }
+          }
+        }
+      }
+      // Now to remove the pictures that have been output
 #endif
 

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

@@ -52 +52 @@
 
 #if CONFORMANCE_BITSTREAM_MODE
-Bool pocCompareFunction( TComPic &pic1, TComPic &pic2 )
-{
-  return (pic1.getPOC() < pic2.getPOC());
+Bool pocCompareFunction( const TComPic &pic1, const TComPic &pic2 )
+{
+  return (const_cast<TComPic&>(pic1).getPOC() < const_cast<TComPic&>(pic2).getPOC());
 }
 #endif

branches/SHM-dev/source/Lib/TLibDecoder/TDecGop.h

@@ -115 +115 @@
   Void  filterPicture  (TComPic*& rpcPic );
 
-  void setDecodedPictureHashSEIEnabled(Int enabled) { m_decodedPictureHashSEIEnabled = enabled; }
+  Void setDecodedPictureHashSEIEnabled(Int enabled) { m_decodedPictureHashSEIEnabled = enabled; }
 #if Q0074_COLOUR_REMAPPING_SEI
-  void setColourRemappingInfoSEIEnabled(Int enabled) { m_colourRemapSEIEnabled = enabled; }
+  Void setColourRemappingInfoSEIEnabled(Int enabled) { m_colourRemapSEIEnabled = enabled; }
 #endif
 #if SVC_EXTENSION

branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -1122 +1122 @@
   for ( i = 0; i < min(m_cSPS.getMaxTLayers(),(UInt) MAX_TLAYER); i++ )
   {
+#if SVC_EXTENSION
+    assert(i < MAX_TLAYER);
+#endif
     m_cSPS.setMaxDecPicBuffering(m_maxDecPicBuffering[i], i);
     m_cSPS.setNumReorderPics(m_numReorderPics[i], i);