Ignore:
Timestamp:
15 Feb 2012, 18:58:36 (12 years ago)
Author:
hschwarz
Message:

HHI+Sony modifications

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/0.2-HHI/source/App/TAppEncoder/TAppEncCfg.cpp

    r5 r20  
    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
     
    783801  g_uiBitIncrement = m_uiInternalBitDepth - g_uiBitDepth;
    784802#endif
     803#endif
     804#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
     805  g_dDeltaDCsQuantOffset = Double(g_uiBitIncrement) -  2.0;
    785806#endif
    786807
Note: See TracChangeset for help on using the changeset viewer.