Changeset 21 in 3DVCSoftware for trunk/source/App


Ignore:
Timestamp:
15 Feb 2012, 19:05:04 (12 years ago)
Author:
hschwarz
Message:

updated with HHI branch (0.2-HHI)

Location:
trunk/source/App
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/App/TAppCommon/TAppComCamPara.cpp

    r5 r21  
    984984  xGetCameraShifts( 0, iMinAbsVOIId, m_uiFirstFrameId, dCamPosShift, dPicPosShift );
    985985  Double  dCamPosShiftVOI01     = dCamPosShift / Double( iMinVOI );
    986   Double  dAbsCamPosShiftVOI01  = ( dCamPosShiftVOI01 < 0.0 ? -dCamPosShiftVOI01 : dCamPosShiftVOI01 );
    987986
    988987  //--- determine maximum absolute camera position shift, precision, and base scale ---
     
    997996    }
    998997  }
     998  Int     iPrecision  = 0; 
     999#if 0 // enabling this lines might be reasonable, but produces different results for the 2 view and 3 view test cases
    9991000  Double  dEpsilon    = 1e-15;
     1001  Double  dAbsCamPosShiftVOI01  = ( dCamPosShiftVOI01 < 0.0 ? -dCamPosShiftVOI01 : dCamPosShiftVOI01 );
    10001002  Double  dShiftRatio = dMaxAbsCamPosShift / dAbsCamPosShiftVOI01 - dEpsilon;
    1001   Int     iPrecision  = 0;  for( ; (Double)( 1 << iPrecision ) < dShiftRatio; iPrecision++ );
     1003  for( ; (Double)( 1 << iPrecision ) < dShiftRatio; iPrecision++ );
     1004#endif
    10021005  Int     iPrecShift  = iPrecision + PDM_INTER_CALC_SHIFT + PDM_VIRT_DEPTH_PRECISION - 2;
    10031006  AOF(    iPrecShift  < PDM_INTERNAL_CALC_BIT_DEPTH );
  • trunk/source/App/TAppDecoder/TAppDecTop.cpp

    r5 r21  
    352352  m_acTDecTopList[0]->setPictureDigestEnabled(m_pictureDigestEnabled);
    353353  m_acTDecTopList[0]->setCamParsCollector( &m_cCamParsCollector );
     354#if SONY_COLPIC_AVAILABILITY
     355  m_acTDecTopList[0]->setViewOrderIdx(0);
     356#endif
    354357}
    355358
  • trunk/source/App/TAppDecoder/TAppDecTop.h

    r5 r21  
    105105  TComSPSAccess*    getSPSAccess  () { return &m_cSPSAccess;   }
    106106  TComAUPicAccess*  getAUPicAccess() { return &m_cAUPicAccess; }
     107  TDecTop*          getDecTop0    () { return m_acTDecTopList[0]; }
    107108#endif
    108109
  • trunk/source/App/TAppEncoder/TAppEncCfg.cpp

    r17 r21  
    268268    // GT: For development, will be removed later
    269269  ("VSOMode",                         m_uiVSOMode               , (UInt)   4    , "VSO Mode")
     270#if HHI_VSO_LS_TABLE
     271  ("LambdaScaleVSO",                  m_dLambdaScaleVSO         , (Double) 1  , "Lambda Scaling for VSO")
     272#else
    270273  ("LambdaScaleVSO",                  m_dLambdaScaleVSO         , (Double) 0.5  , "Lambda Scaling for VSO")
     274#endif
    271275    ("ForceLambdaScaleVSO",             m_bForceLambdaScaleVSO    , false         , "Force using Lambda Scale VSO also in non-VSO-Mode")
    272276#if HHI_VSO_DIST_INT
     
    479483    }
    480484  }
     485
     486#if HHI_VSO_LS_TABLE
     487  // Q&D
     488  Double adLambdaScaleTable[] =
     489  {  0.031250, 0.031639, 0.032029, 0.032418, 0.032808, 0.033197, 0.033586, 0.033976, 0.034365, 0.034755,
     490     0.035144, 0.035533, 0.035923, 0.036312, 0.036702, 0.037091, 0.037480, 0.037870, 0.038259, 0.038648,
     491     0.039038, 0.039427, 0.039817, 0.040206, 0.040595, 0.040985, 0.041374, 0.041764, 0.042153, 0.042542,
     492     0.042932, 0.043321, 0.043711, 0.044100, 0.044194, 0.053033, 0.061872, 0.070711, 0.079550, 0.088388,
     493     0.117851, 0.147314, 0.176777, 0.235702, 0.294628, 0.353553, 0.471405, 0.589256, 0.707107, 0.707100,
     494     0.753550, 0.800000 
     495  };
     496  AOT( (m_aiQP[1] < 0) || (m_aiQP[1] > 51));
     497  m_dLambdaScaleVSO *= adLambdaScaleTable[m_aiQP[1]];
     498#endif
    481499#endif
    482500
     
    629647  xConfirmPara    ( m_iCodedCamParPrecision < 0 || m_iCodedCamParPrecision > 5,       "CodedCamParsPrecision must be in range of 0..5" );
    630648#if DEPTH_MAP_GENERATION
    631   xConfirmPara    ( m_uiPredDepthMapGeneration > 3,                                   "PredDepthMapGen must be less than or equal to 3" );
     649  xConfirmPara    ( m_uiPredDepthMapGeneration > 2,                                   "PredDepthMapGen must be less than or equal to 2" );
    632650  xConfirmPara    ( m_uiPredDepthMapGeneration >= 2 && !m_bUsingDepthMaps,            "PredDepthMapGen >= 2 requires CodeDepthMaps = 1" );
    633651#endif
  • trunk/source/App/TAppEncoder/TAppEncTop.cpp

    r5 r21  
    583583  //GT: setup and init Bools for Eos and Continue Reading
    584584  Bool  bAllEos = false;
    585   Bool  bAllContinueReadingPics;
     585  Bool  bAllContinueReadingPics = false;
    586586  std::vector<Bool>  bEos ;
    587587  std::vector<Bool>  bContinueReadingPics ;
    588588
    589589  Bool  bAllDepthEos = false;
    590   Bool  bAllContinueReadingDepthPics;
     590  Bool  bAllContinueReadingDepthPics = false;
    591591  std::vector<Bool>  bDepthEos ;
    592592  std::vector<Bool>  bContinueReadingDepthPics ;
Note: See TracChangeset for help on using the changeset viewer.