Changeset 183 in 3DVCSoftware


Ignore:
Timestamp:
14 Nov 2012, 18:24:30 (11 years ago)
Author:
rwth
Message:
  • added bug fixes
Location:
branches/HTM-4.1-dev2-RWTH-Fix
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-4.1-dev2-RWTH-Fix/CommonTestConditionsCfgs/baseCfg_2view+depth.cfg

    r181 r183  
    202202VSO                       : 1                                      # use of view synthesis optimization for depth coding
    203203QTLPC                     : 1                                      # use of quadtree limitation + predictive coding of the quadtree for depth coding
    204 
     204SDC                       : 1                                      # use simplified depth coding tree
     205DLT                       : 1                                      # use depth lookup table
    205206
    206207#========== view synthesis optimization (VSO) ==========
  • branches/HTM-4.1-dev2-RWTH-Fix/CommonTestConditionsCfgs/baseCfg_3view+depth.cfg

    r181 r183  
    206206VSO                       : 1                                      # use of view synthesis optimization for depth coding
    207207QTLPC                     : 1                                      # use of quadtree limitation + predictive coding of the quadtree for depth coding
    208 
     208SDC                       : 1                                      # use simplified depth coding tree
     209DLT                       : 1                                      # use depth lookup table
    209210
    210211#========== view synthesis optimization (VSO) ==========
  • branches/HTM-4.1-dev2-RWTH-Fix/cfg/encoder_mvd.cfg

    r181 r183  
    205205VSO                       : 1                                      # use of view synthesis optimization for depth coding
    206206QTLPC                     : 1                                      # use of quadtree limitation + predictive coding of the quadtree for depth coding
    207 
     207SDC                                                                                             :       1                                                                                                                                                        # use simplified depth coding tree
     208DLT                                                                                             :       1                                                                                                                                                        # use depth lookup table
    208209
    209210#========== view synthesis optimization (VSO) ==========
  • branches/HTM-4.1-dev2-RWTH-Fix/source/App/TAppEncoder/TAppEncCfg.cpp

    r181 r183  
    478478#endif
    479479#if RWTH_SDC_DLT_B0036
    480   ("DLT", m_bUseDLT, true, "Enables Depth Lookup Table")
    481   ("SDC", m_bUseSDC, true, "Enabled Simplified Depth Coding")
     480  ("DLT", m_bUseDLT, true, "use depth lookup table for depth map coding")
     481  ("SDC", m_bUseSDC, true, "use simplified depth coding tree")
    482482#endif
    483483  ;
  • branches/HTM-4.1-dev2-RWTH-Fix/source/App/TAppEncoder/TAppEncTop.cpp

    r181 r183  
    14461446  UInt uiMaxDepthValue = g_uiIBDI_MAX;
    14471447 
    1448   Bool abValidDepths[uiMaxDepthValue+1];
     1448  Bool abValidDepths[256];
    14491449 
    14501450  depthVideoFile->open( m_pchDepthInputFileList[iViewIdx], false, m_uiInputBitDepth, m_uiInternalBitDepth );  // read  mode
  • branches/HTM-4.1-dev2-RWTH-Fix/source/Lib/TLibCommon/TComSlice.cpp

    r181 r183  
    15911591  {
    15921592    m_uiNumDepthmapValues = uiMaxDepthValue+1;
    1593     m_uiBitsPerDepthValue = (UInt)ceil(log2f(m_uiNumDepthmapValues));
     1593    m_uiBitsPerDepthValue = (UInt)ceil(Log2(m_uiNumDepthmapValues));
    15941594   
    15951595    m_uiDepthValue2Idx    = (UInt*) xMalloc(UInt, m_uiNumDepthmapValues);
  • branches/HTM-4.1-dev2-RWTH-Fix/source/Lib/TLibCommon/TypeDef.h

    r181 r183  
    128128#endif
    129129
    130 #define RWTH_SDC_DLT_B0036                0   // JCT3V-B0036: Simplified Depth Coding + Depth Lookup Table
     130#define RWTH_SDC_DLT_B0036                1   // JCT3V-B0036: Simplified Depth Coding + Depth Lookup Table
    131131#if RWTH_SDC_DLT_B0036
    132132#define Log2( n ) ( log((double)n) / log(2.0) )
  • branches/HTM-4.1-dev2-RWTH-Fix/source/Lib/TLibDecoder/TDecCu.cpp

    r177 r183  
    10131013  UInt uiMaskStride = 0;
    10141014 
    1015   //if( uiLumaPredMode == DMM_WEDGE_FULL_IDX || uiLumaPredMode == DMM_WEDGE_PREDDIR_IDX )
    1016   if( 0 )
     1015  if( uiLumaPredMode == DMM_WEDGE_FULL_IDX || uiLumaPredMode == DMM_WEDGE_PREDDIR_IDX )
    10171016  {
    10181017    Int uiTabIdx = (uiLumaPredMode == DMM_WEDGE_FULL_IDX)?pcCU->getWedgeFullTabIdx(uiAbsPartIdx):pcCU->getWedgePredDirTabIdx(uiAbsPartIdx);
     
    13561355Void TDecCu::xAnalyzeSegmentsSDC( Pel* pOrig, UInt uiStride, UInt uiSize, Pel* rpSegMeans, UInt uiNumSegments, Bool* pMask, UInt uiMaskStride )
    13571356{
    1358   Int iSumDepth[uiNumSegments];
    1359   memset(iSumDepth, 0, sizeof(Int)*uiNumSegments);
    1360   Int iSumPix[uiNumSegments];
    1361   memset(iSumPix, 0, sizeof(Int)*uiNumSegments);
     1357  Int iSumDepth[2];
     1358  memset(iSumDepth, 0, sizeof(Int)*2);
     1359  Int iSumPix[2];
     1360  memset(iSumPix, 0, sizeof(Int)*2);
    13621361 
    13631362  for (Int y=0; y<uiSize; y++)
  • branches/HTM-4.1-dev2-RWTH-Fix/source/Lib/TLibEncoder/TEncSearch.cpp

    r177 r183  
    16461646  UInt uiMaskStride = 0;
    16471647 
    1648   //if( uiLumaPredMode == DMM_WEDGE_FULL_IDX || uiLumaPredMode == DMM_WEDGE_PREDDIR_IDX )
    1649   if( 0 )
     1648  if( uiLumaPredMode == DMM_WEDGE_FULL_IDX || uiLumaPredMode == DMM_WEDGE_PREDDIR_IDX )
    16501649  {
    16511650    Int uiTabIdx = (uiLumaPredMode == DMM_WEDGE_FULL_IDX)?pcCU->getWedgeFullTabIdx(uiAbsPartIdx):pcCU->getWedgePredDirTabIdx(uiAbsPartIdx);
     
    80718070Void TEncSearch::xAnalyzeSegmentsSDC( Pel* pOrig, UInt uiStride, UInt uiSize, Pel* rpSegMeans, UInt uiNumSegments, Bool* pMask, UInt uiMaskStride )
    80728071{
    8073   Int iSumDepth[uiNumSegments];
    8074   memset(iSumDepth, 0, sizeof(Int)*uiNumSegments);
    8075   Int iSumPix[uiNumSegments];
    8076   memset(iSumPix, 0, sizeof(Int)*uiNumSegments);
     8072  Int iSumDepth[2];
     8073  memset(iSumDepth, 0, sizeof(Int)*2);
     8074  Int iSumPix[2];
     8075  memset(iSumPix, 0, sizeof(Int)*2);
    80778076 
    80788077  for (Int y=0; y<uiSize; y++)
Note: See TracChangeset for help on using the changeset viewer.