Changeset 436 in SHVCSoftware for branches

Timestamp:

14 Oct 2013, 19:11:30 (11 years ago)

Author:

seregin

Message:

fix compilation warnings and remove always true condition check

Location:

branches/SHM-3.1-dev/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncSearch.cpp (modified) (1 diff)
• Lib/TLibVideoIO/TVideoIOYuv.h (modified) (1 diff)

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

@@ -559 +559 @@
           UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
           Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
-          m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(),
+          m_acTVideoIOYuvReconFile[layerId].write( pcPicTop->getPicYuvRec(), pcPicBottom->getPicYuvRec(),
             conf.getWindowLeftOffset()  * xScal + defDisp.getWindowLeftOffset(),
             conf.getWindowRightOffset() * xScal + defDisp.getWindowRightOffset(),
             conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
-            conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
+            conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset(), isTff );
 
 #else
@@ -752 +752 @@
           UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
           Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
-          m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(),
+          m_acTVideoIOYuvReconFile[layerId].write( pcPicTop->getPicYuvRec(), pcPicBottom->getPicYuvRec(),
             conf.getWindowLeftOffset()  *xScal + defDisp.getWindowLeftOffset(),
             conf.getWindowRightOffset() *xScal + defDisp.getWindowRightOffset(),
             conf.getWindowTopOffset()   *yScal + defDisp.getWindowTopOffset(),
-            conf.getWindowBottomOffset()*yScal + defDisp.getWindowBottomOffset() );
+            conf.getWindowBottomOffset()*yScal + defDisp.getWindowBottomOffset(), isTff );
 
 #else

branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3223 +3223 @@
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
   Bool disableILP = false;
-  if (pcCU->getPic()->getLayerId() > 0 && m_pcEncCfg->getInterLayerConstrainedTileSetsSEIEnabled() && pcCU->getPic()->getPicSym()->getTileIdxMap(pcCU->getAddr()) >= 0)
+  if (pcCU->getPic()->getLayerId() > 0 && m_pcEncCfg->getInterLayerConstrainedTileSetsSEIEnabled() /*&& pcCU->getPic()->getPicSym()->getTileIdxMap(pcCU->getAddr()) >= 0*/) //always true condition is commented out
   {
     if (pcCU->getPic()->getPicSym()->getTileSetType(pcCU->getAddr()) == 2)

branches/SHM-3.1-dev/source/Lib/TLibVideoIO/TVideoIOYuv.h

@@ -72 +72 @@
   Bool  read  ( TComPicYuv*   pPicYuv, Int aiPad[2] );     ///< read  one YUV frame with padding parameter
   Bool  write( TComPicYuv*    pPicYuv, Int confLeft=0, Int confRight=0, Int confTop=0, Int confBottom=0 );
-  Bool  write( TComPicYuv*    pPicYuv, TComPicYuv*    pPicYuv2, Int confLeft=0, Int confRight=0, Int confTop=0, Int confBottom=0  , bool isTff=false); 
+  Bool  write( TComPicYuv*    pPicYuv, TComPicYuv*    pPicYuv2, Int confLeft=0, Int confRight=0, Int confTop=0, Int confBottom=0, Bool isTff = false ); 
   
   Bool  isEof ();                                           ///< check for end-of-file