Changeset 45 in 3DVCSoftware


Ignore:
Timestamp:
28 Mar 2012, 10:04:50 (12 years ago)
Author:
poznan-univ
Message:

Linux bug fix

Location:
branches/0.3-poznan-univ/source
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/0.3-poznan-univ/source/App/TAppRenderer/TAppRendererCfg.cpp

    r28 r45  
    183183  m_bUseSetupString = ( m_pchViewConfig != NULL ) && ( m_iRenderMode != 0);
    184184
     185#if POZNAN_NONLINEAR_DEPTH     
     186  TComNonlinearDepthModel cNonlinearDepthModel;
     187  cNonlinearDepthModel.Clear();
     188  cNonlinearDepthModel.Init();
     189#endif
     190
    185191  if ( m_iRenderMode == 10 )
    186192  {
     
    188194      m_pchCameraParameterFile, m_pchBaseViewCameraNumbers, NULL, NULL, m_iLog2SamplingFactor+m_iShiftPrecision
    189195#if POZNAN_NONLINEAR_DEPTH     
    190       ,1.0f
     196      ,&cNonlinearDepthModel
    191197#endif
    192198      );
     
    211217      m_pchCameraParameterFile, m_pchBaseViewCameraNumbers, NULL, piaTempViews, m_iLog2SamplingFactor+m_iShiftPrecision
    212218#if POZNAN_NONLINEAR_DEPTH
    213       , 1.0f
     219      , &cNonlinearDepthModel
    214220#endif
    215221      );
     
    220226      m_pchCameraParameterFile, m_pchBaseViewCameraNumbers, m_pchSynthViewCameraNumbers, NULL, m_iLog2SamplingFactor+m_iShiftPrecision
    221227#if POZNAN_NONLINEAR_DEPTH
    222       ,1.0f
     228      ,&cNonlinearDepthModel
    223229#endif
    224230      );
     
    292298
    293299  xConfirmPara( m_iPreFilterSize      < 0 || m_iPreFilterSize      >  3, "PreFilterSize      must be more than or equal to 0 and less than 4" );
     300#if POZNAN_ENCODE_ONLY_DISOCCLUDED_CU
     301  xConfirmPara( m_iBlendMode          < 0 || m_iBlendMode          >  4, "BlendMode          must be more than or equal to 0 and less than 5"  );
     302#else
    294303  xConfirmPara( m_iBlendMode          < 0 || m_iBlendMode          >  3, "BlendMode          must be more than or equal to 0 and less than 4"  );
     304#endif
    295305  xConfirmPara( m_iBlendZThresPerc    < 0 || m_iBlendZThresPerc    > 100,"BlendZThresPerc    must be more than or equal to 0 and less than 101"  );
    296306  xConfirmPara( m_iBlendHoleMargin    < 0 || m_iBlendHoleMargin    >  20,"BlendHoleMargin    must be more than or equal to 0 and less than 19"  );
  • branches/0.3-poznan-univ/source/App/TAppRenderer/TAppRendererTop.cpp

    r5 r45  
    288288                iLeftBaseViewIdx  = 0;
    289289                iRightBaseViewIdx = iFillViewIdx;
     290               
    290291              }
    291292              else
     
    298299            }
    299300          }
     301#if POZNAN_ENCODE_ONLY_DISOCCLUDED_CU
     302          else if ( m_iBlendMode == 4 )
     303          {
     304            if ( bIsBaseView && (iLeftBaseViewIdx == 0) )
     305            {
     306              bRender = false;
     307            }
     308            else
     309            {
     310              Int iDistLeft  = abs( m_cCameraData.getBaseId2SortedId()[0] - m_cCameraData.getBaseId2SortedId() [iLeftBaseViewIdx ]  );
     311              Int iDistRight = abs( m_cCameraData.getBaseId2SortedId()[0] - m_cCameraData.getBaseId2SortedId() [iRightBaseViewIdx]  );
     312
     313              Int iFillViewIdx = (0!=iLeftBaseViewIdx)? iLeftBaseViewIdx: iRightBaseViewIdx;
     314
     315              if( m_cCameraData.getBaseId2SortedId()[0] < m_cCameraData.getBaseId2SortedId() [iFillViewIdx] )
     316              {
     317                iBlendMode        = 0;
     318                iLeftBaseViewIdx  = 0;
     319                iRightBaseViewIdx = iFillViewIdx;
     320                std::cout << "iBlen: " << iBlendMode << "iLeft: " << iLeftBaseViewIdx << "iRight: " << iRightBaseViewIdx <<std::endl;
     321              }
     322              else
     323              {
     324                iBlendMode        = 0;
     325                iLeftBaseViewIdx  = iFillViewIdx;
     326                iRightBaseViewIdx = 0;
     327                std::cout << "iBlen: " << iBlendMode << "iLeft: " << iLeftBaseViewIdx << "iRight: " << iRightBaseViewIdx <<std::endl;
     328              }
     329
     330            }
     331          }
     332#endif
    300333          else
    301334          {
  • branches/0.3-poznan-univ/source/Lib/TLibCommon/TComMP.cpp

    r41 r45  
    934934
    935935#if POZNAN_DBMP
    936 inline Void TComMP::getDBMPPredData(TComDataCU* pcCU, Int x, Int y,
     936Void TComMP::getDBMPPredData(TComDataCU* pcCU, Int x, Int y,
    937937                                                                                        Int &ref_frame0, Int &ref_frame0_idx, TComMv &mv0, Int ref_frame0_idx_2nd, TComMv mv0_2nd,
    938938                                                                                        Int &ref_frame1, Int &ref_frame1_idx, TComMv &mv1, Int ref_frame1_idx_2nd, TComMv mv1_2nd)
     
    11831183
    11841184#if POZNAN_DBMP_CALC_PRED_DATA
    1185 inline Void TComMP::xCalcDBMPPredData(UInt uiCnt, Int &ref_frame0_idx, TComMv &mv0, Int &ref_frame1_idx, TComMv &mv1)
     1185Void TComMP::xCalcDBMPPredData(UInt uiCnt, Int &ref_frame0_idx, TComMv &mv0, Int &ref_frame1_idx, TComMv &mv1)
    11861186{       
    11871187        if(uiCnt==0) return;
  • branches/0.3-poznan-univ/source/Lib/TLibCommon/TComMP.h

    r41 r45  
    172172#endif
    173173
    174   inline Void getDBMPPredData(TComDataCU* pcCU, Int x, Int y,
     174  Void getDBMPPredData(TComDataCU* pcCU, Int x, Int y,
    175175                                                          Int &ref_frame0, Int &ref_frame0_idx, TComMv &mv0, Int ref_frame0_idx_2nd, TComMv mv0_2nd,
    176176                                                          Int &ref_frame1, Int &ref_frame1_idx, TComMv &mv1, Int ref_frame1_idx_2nd, TComMv mv1_2nd);
     
    185185  Int*                  getTempL1MvY() {return m_piTempL1MvY;}
    186186 
    187   inline Void xCalcDBMPPredData(UInt uiCnt, Int &ref_frame0_idx, TComMv &mv0, Int &ref_frame1_idx, TComMv &mv1);
     187  Void xCalcDBMPPredData(UInt uiCnt, Int &ref_frame0_idx, TComMv &mv0, Int &ref_frame1_idx, TComMv &mv1);
    188188#endif
    189189
Note: See TracChangeset for help on using the changeset viewer.