Changeset 575 in 3DVCSoftware for branches/HTM-DEV-2.0-dev2-LG


Ignore:
Timestamp:
16 Aug 2013, 03:46:37 (11 years ago)
Author:
lg
Message:
  • minor fix of coding style
Location:
branches/HTM-DEV-2.0-dev2-LG/source/Lib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-DEV-2.0-dev2-LG/source/Lib/TLibCommon/TComDataCU.cpp

    r571 r575  
    291291    m_pbInterSDCFlag     = (Bool*  )xMalloc(Bool,   uiNumPartition);
    292292    for( Int i = 0; i < 4; i++ )
     293    {
    293294      m_apSegmentInterDCOffset[i] = (Int*)xMalloc(Int, uiNumPartition);
     295    }
    294296#endif
    295297  }

  • branches/HTM-DEV-2.0-dev2-LG/source/Lib/TLibDecoder/TDecCu.cpp

    r571 r575  
    490490#if LGE_INTER_SDC_E0156
    491491      if( m_ppcCU[uiDepth]->getInterSDCFlag( 0 ) )
     492      {
    492493        xReconInterSDC( m_ppcCU[uiDepth], uiAbsPartIdx, uiDepth );
     494      }
    493495      else
     496      {
    494497#endif
    495498      xReconInter( m_ppcCU[uiDepth], uiDepth );
     499#if LGE_INTER_SDC_E0156
     500      }
     501#endif
    496502      break;
    497503    case MODE_INTRA:

  • branches/HTM-DEV-2.0-dev2-LG/source/Lib/TLibDecoder/TDecEntropy.cpp

    r571 r575  
    674674
    675675  if( !pcCU->getSlice()->getVPS()->getInterSDCFlag( pcCU->getSlice()->getLayerIdInVps() ) )
    676     return;
     676  {
     677    return;
     678  }
    677679
    678680  if( !pcCU->getSlice()->getIsDepth() || pcCU->isIntra( uiAbsPartIdx ) || pcCU->isSkipped( uiAbsPartIdx ) )
    679     return;
     681  {
     682    return;
     683  }
    680684
    681685  m_pcEntropyDecoderIf->parseInterSDCFlag( pcCU, uiAbsPartIdx, uiDepth );
    … …  
    685689{
    686690  if( !pcCU->getSlice()->getVPS()->getInterSDCFlag( pcCU->getSlice()->getLayerIdInVps() ) )
    687     return;
     691  {
     692    return;
     693  }
    688694
    689695  if( !pcCU->getSlice()->getIsDepth() || pcCU->isIntra( uiAbsPartIdx ) || !pcCU->getInterSDCFlag( uiAbsPartIdx ) )
    690     return;
     696  {
     697    return;
     698  }
    691699
    692700  UInt uiNumSegments = ( pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_2Nx2N ) ? 1 : ( pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_NxN ? 4 : 2 );
    … …  
    694702  // decode residual data for each segment
    695703  for( UInt uiSeg = 0; uiSeg < uiNumSegments; uiSeg++ )
     704  {
    696705    m_pcEntropyDecoderIf->parseInterSDCResidualData( pcCU, uiAbsPartIdx, uiDepth, uiSeg );
     706  }
    697707}
    698708#endif

  • branches/HTM-DEV-2.0-dev2-LG/source/Lib/TLibDecoder/TDecSbac.cpp

    r571 r575  
    22672267  }
    22682268  else
     2269  {
    22692270    pcCU->setInterSDCFlagSubParts( false, uiAbsPartIdx, 0, uiDepth);
     2271  }
    22702272}
    22712273

  • branches/HTM-DEV-2.0-dev2-LG/source/Lib/TLibEncoder/TEncCu.cpp

    r571 r575  
    18641864#if LGE_INTER_SDC_E0156
    18651865        if( rpcTempCU->getSlice()->getVPS()->getInterSDCFlag( rpcTempCU->getSlice()->getLayerIdInVps() ) )
     1866        {
    18661867          bestIsSkip = !rpcBestCU->getSDCFlag( 0 ) && ( rpcBestCU->getQtRootCbf(0) == 0 );
     1868        }
    18671869        else
     1870        {
    18681871#endif
    18691872        bestIsSkip = rpcBestCU->getQtRootCbf(0) == 0;
     1873#if LGE_INTER_SDC_E0156
     1874        }
     1875#endif
    18701876      }
    18711877    }

  • branches/HTM-DEV-2.0-dev2-LG/source/Lib/TLibEncoder/TEncEntropy.cpp

    r571 r575  
    828828{
    829829  if( !pcCU->getSlice()->getVPS()->getInterSDCFlag( pcCU->getSlice()->getLayerIdInVps() ) )
    830     return;
     830  {
     831    return;
     832  }
    831833
    832834  if( !pcCU->getSlice()->getIsDepth() || pcCU->isIntra( uiAbsPartIdx ) || pcCU->isSkipped( uiAbsPartIdx ) )
    833     return;
    834 
    835   if( bRD )
    836     uiAbsPartIdx = 0;
     835  {
     836    return;
     837  }
     838
     839  if( bRD )
     840  {
     841    uiAbsPartIdx = 0;
     842  }
    837843
    838844  m_pcEntropyCoderIf->codeInterSDCFlag( pcCU, uiAbsPartIdx );
    … …  
    842848{
    843849  if( !pcCU->getSlice()->getVPS()->getInterSDCFlag( pcCU->getSlice()->getLayerIdInVps() ) )
    844     return;
     850  {
     851    return;
     852  }
    845853
    846854  if( !pcCU->getSlice()->getIsDepth() || pcCU->isIntra( uiAbsPartIdx ) || !pcCU->getInterSDCFlag( uiAbsPartIdx ) )
    847     return;
    848 
    849   if( bRD )
    850     uiAbsPartIdx = 0;
     855  {
     856    return;
     857  }
     858
     859  if( bRD )
     860  {
     861    uiAbsPartIdx = 0;
     862  }
    851863
    852864  // number of segments depends on prediction mode for INTRA
    … …  
    855867  // encode residual data for each segment
    856868  for( UInt uiSeg = 0; uiSeg < uiNumSegments; uiSeg++ )
     869  {
    857870    m_pcEntropyCoderIf->codeInterSDCResidualData( pcCU, uiAbsPartIdx, uiSeg );
     871  }
    858872}
    859873#endif

  • branches/HTM-DEV-2.0-dev2-LG/source/Lib/TLibEncoder/TEncSearch.cpp

    r571 r575  
    55325532#if H_3D_VSO //M 14
    55335533    if ( m_pcRdCost->getUseLambdaScaleVSO() )   
     5534    {
    55345535      rdCost = m_pcRdCost->calcRdCostVSO( uiBits, ruiDist );   
     5536    }
    55355537    else
    55365538#endif
Note: See TracChangeset for help on using the changeset viewer.