Changeset 1247 in 3DVCSoftware


Ignore:
Timestamp:
2 Jun 2015, 15:08:23 (9 years ago)
Author:
tech
Message:

Fixes:

  • Windows compiler warning
  • Naming DLT related syntax elements.
Location:
branches/HTM-14.1-update-dev1-RWTH/source/Lib
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TComRom.cpp

    r1223 r1247  
    253253    }
    254254  }
    255 
    256255#if NH_3D_DMM
    257256  if( !g_dmmWedgeLists.empty() )
    … …  
    526525{ //2x2   4x4   8x8 16x16 32x32 64x64
    527526     0,    7,   10,   9,    9,   13 };
    528 
    529527Bool g_wedgePattern[32*32];
    530528extern std::vector< std::vector<TComWedgelet> >   g_dmmWedgeLists;
    … …  
    539537const Bool g_bEncDecTraceEnable  = true;
    540538const Bool g_bEncDecTraceDisable = false;
    541 Bool   g_HLSTraceEnable = false;
     539Bool   g_HLSTraceEnable = true;
    542540Bool   g_bJustDoIt = false;
    543541UInt64 g_nSymbolCounter = 0;
    … …  
    740738std::vector< std::vector<TComWedgelet>  > g_dmmWedgeLists;
    741739std::vector< std::vector<TComWedgeNode> > g_dmmWedgeNodeLists;
    742 
    743740Void initWedgeLists( Bool initNodeList )
    744741{
    … …  
    751748    createWedgeList( uiWedgeBlockSize, uiWedgeBlockSize, acWedgeList, acWedgeRefList, g_dmmWedgeResolution[ui] );
    752749    g_dmmWedgeLists.push_back( acWedgeList );
    753 
    754750    if( initNodeList )
    755751    {
    … …  
    811807  }
    812808}
    813 
    814809Void createWedgeList( UInt uiWidth, UInt uiHeight, std::vector<TComWedgelet> &racWedgeList, std::vector<TComWedgeRef> &racWedgeRefList, WedgeResolution eWedgeRes )
    815810{
    … …  
    852847  }
    853848}
    854 
    855849Void addWedgeletToList( TComWedgelet cWedgelet, std::vector<TComWedgelet> &racWedgeList, std::vector<TComWedgeRef> &racWedgeRefList )
    856850{

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TComRom.h

    r1223 r1247  
    9191extern const UChar  g_aucIntraModeNumFast_NotUseMPM[MAX_CU_DEPTH];
    9292extern const UChar  g_chroma422IntraAngleMappingTable[NUM_INTRA_MODE];
    93 
    9493// ====================================================================================================================
    9594// Depth coding modes
    … …  
    101100extern       std::vector< std::vector<TComWedgelet> >        g_dmmWedgeLists;
    102101extern       std::vector< std::vector<TComWedgeNode> >       g_dmmWedgeNodeLists;
    103 
    104102Void initWedgeLists( Bool initNodeList = false );
    105103Void createWedgeList( UInt uiWidth, UInt uiHeight, std::vector<TComWedgelet> &racWedgeList, std::vector<TComWedgeRef> &racWedgeRefList, WedgeResolution eWedgeRes );
    106104Void addWedgeletToList( TComWedgelet cWedgelet, std::vector<TComWedgelet> &racWedgeList, std::vector<TComWedgeRef> &racWedgeRefList );
    107 
    108105WedgeList*     getWedgeListScaled    ( UInt blkSize );
    109106WedgeNodeList* getWedgeNodeListScaled( UInt blkSize );
    110 
    111107__inline Void mapDmmToIntraDir( UInt& intraMode ) { if( isDmmMode( intraMode ) ) intraMode = DC_IDX; }
    112108__inline Void mapDmmToIntraDir(  Int& intraMode ) { if( isDmmMode( intraMode ) ) intraMode = DC_IDX; }

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TypeDef.h

    r1243 r1247  
    6565/////////////////////////////////////////////////////////////////////////////////////////
    6666#if NH_MV
    67 #define H_MV_ENC_DEC_TRAC                 0  //< CU/PU level tracking
     67#define H_MV_ENC_DEC_TRAC                 1  //< CU/PU level tracking
    6868
    6969#if NH_3D

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1243 r1247  
    501501  TComDLT* pcDLT = pcPPS->getDLT();
    502502
    503   READ_FLAG(uiCode, "dlt_present_flag");
     503  READ_FLAG(uiCode, "dlts_present_flag");
    504504  pcDLT->setDltPresentFlag( (uiCode == 1) ? true : false );
    505505
    … …  
    509509    pcDLT->setNumDepthViews( uiCode+1 );
    510510   
    511     READ_CODE(4, uiCode, "pps_bit_depth_for_depth_views_minus8");
     511    READ_CODE(4, uiCode, "pps_bit_depth_for_depth_layers_minus8");
    512512    pcDLT->setDepthViewBitDepth( (uiCode+8) );
    513513   
    … …  
    526526        UInt uiCodeLength         = 0;
    527527       
    528         READ_FLAG(uiCode, "inter_view_dlt_pred_enable_flag[ i ]");
     528        READ_FLAG(uiCode, "dlt_pred_flag[i]");
    529529       
    530530        if( uiCode )
    … …  
    536536        if ( pcDLT->getInterViewDltPredEnableFlag( layerId ) == false )
    537537        {
    538           READ_FLAG(uiCode, "dlt_bit_map_rep_flag[ layerId ]");
     538          READ_FLAG(uiCode, "dlt_val_flags_present_flag[i]");
    539539          bDltBitMapRepFlag = (uiCode == 1) ? true : false;
    540540        }
    … …  
    552552          for (UInt d=0; d<256; d++)
    553553          {
    554             READ_FLAG(uiCode, "dlt_bit_map_flag[ layerId ][ j ]");
     554            READ_FLAG(uiCode, "dlt_value_flag[i][j]");
    555555            if (uiCode == 1)
    556556            {
    … …  
    563563        else
    564564        {
    565           READ_CODE(8, uiNumDepthValues, "num_depth_values_in_dlt[i]");   // num_entry
     565          READ_CODE(8, uiNumDepthValues, "num_val_delta_dlt");   // num_entry
    566566         
    567567          {
    … …  
    570570            if (uiNumDepthValues > 1)
    571571            {
    572               READ_CODE(8, uiCode, "max_diff[ layerId ]");
     572              READ_CODE(8, uiCode, "max_diff");
    573573              uiMaxDiff = uiCode;
    574574            }
    … …  
    581581            {
    582582              uiCodeLength = (UInt) gCeilLog2(uiMaxDiff + 1);
    583               READ_CODE(uiCodeLength, uiCode, "min_diff_minus1[ layerId ]");
     583              READ_CODE(uiCodeLength, uiCode, "min_diff_minus1");
    584584              uiMinDiff = uiCode + 1;
    585585            }
    … …  
    589589            }
    590590           
    591             READ_CODE(8, uiCode, "dlt_depth_value0[layerId]");   // entry0
     591            READ_CODE(8, uiCode, "delta_dlt_val0");   // entry0
    592592            aiIdx2DepthValue[0] = uiCode;
    593593           
    … …  
    604604              for (UInt d=1; d<uiNumDepthValues; d++)
    605605              {
    606                 READ_CODE(uiCodeLength, uiCode, "dlt_depth_value_diff_minus_min[ layerId ][ j ]");
     606                READ_CODE(uiCodeLength, uiCode, "delta_val_diff_minus_min[k]");
    607607                aiIdx2DepthValue[d] = aiIdx2DepthValue[d-1] + uiMinDiff + uiCode;
    608608              }
    … …  
    648648    {
    649649      READ_CODE(16, uiCode, "sar_width");                             pcVUI->setSarWidth(uiCode);
    650       READ_CODE(16, uiCode, "sar_height");                            pcVUI->setSarHeight(uiCode);
     650      READ_CODE(16, uiCode, "sar_height");                              pcVUI->setSarHeight(uiCode);
    651651    }
    652652  }

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1243 r1247  
    373373{
    374374#if NH_3D_DLT
    375   WRITE_FLAG( pcPPS->getDLT()->getDltPresentFlag() ? 1 : 0, "dlt_present_flag" );
     375  WRITE_FLAG( pcPPS->getDLT()->getDltPresentFlag() ? 1 : 0, "dlts_present_flag" );
    376376
    377377  if ( pcPPS->getDLT()->getDltPresentFlag() )
    378378  {
    379379    WRITE_CODE(pcPPS->getDLT()->getNumDepthViews() - 1, 6, "pps_depth_layers_minus1");
    380     WRITE_CODE((pcPPS->getDLT()->getDepthViewBitDepth() - 8), 4, "pps_bit_depth_for_depth_views_minus8");
     380    WRITE_CODE((pcPPS->getDLT()->getDepthViewBitDepth() - 8), 4, "pps_bit_depth_for_depth_layers_minus8");
    381381   
    382382    for( Int i = 0; i <= pcPPS->getDLT()->getNumDepthViews(); i++ )
    … …  
    384384      Int layerId = pcPPS->getDLT()->getDepthIdxToLayerId(i);
    385385     
    386       WRITE_FLAG( pcPPS->getDLT()->getUseDLTFlag( layerId ) ? 1 : 0, "dlt_flag[layerId]" );
     386      WRITE_FLAG( pcPPS->getDLT()->getUseDLTFlag( layerId ) ? 1 : 0, "dlt_flag[i]" );
    387387     
    388388      if ( pcPPS->getDLT()->getUseDLTFlag( layerId ) )
    … …  
    392392       
    393393        // ----------------------------- Actual coding -----------------------------
    394         WRITE_FLAG( pcPPS->getDLT()->getInterViewDltPredEnableFlag( layerId ) ? 1 : 0, "inter_view_dlt_pred_enable_flag[ layerId ]");
     394        WRITE_FLAG( pcPPS->getDLT()->getInterViewDltPredEnableFlag( layerId ) ? 1 : 0, "dlt_pred_flag[i]");
    395395        if ( pcPPS->getDLT()->getInterViewDltPredEnableFlag( layerId ) == false )
    396396        {
    397           WRITE_FLAG( pcPPS->getDLT()->getUseBitmapRep( layerId ) ? 1 : 0, "dlt_bit_map_rep_flag[ layerId ]" );
     397          WRITE_FLAG( pcPPS->getDLT()->getUseBitmapRep( layerId ) ? 1 : 0, "dlt_val_flags_present_flag[i]" );
    398398         
    399399          for( UInt ui = 0; ui<uiNumDepthValues_coded; ui++ )
    … …  
    419419            if ( d == aiIdx2DepthValue_coded[uiDltArrayIndex] )
    420420            {
    421               WRITE_FLAG(1, "dlt_bit_map_flag[ layerId ][ j ]");
     421              WRITE_FLAG(1, "dlt_value_flag[i][j]");
    422422              uiDltArrayIndex++;
    423423            }
    424424            else
    425425            {
    426               WRITE_FLAG(0, "dlt_bit_map_flag[ layerId ][ j ]");
     426              WRITE_FLAG(0, "dlt_value_flag[i][j]");
    427427            }
    428428          }
    … …  
    462462          }
    463463         
    464           WRITE_CODE(uiNumDepthValues_coded, 8, "num_depth_values_in_dlt[layerId]");    // num_entry
     464          WRITE_CODE(uiNumDepthValues_coded, 8, "num_val_delta_dlt");    // num_entry
    465465          {
    466466            // The condition if( uiNumDepthValues_coded > 0 ) is always true since for Single-view Diff Coding, there is at least one depth value in depth component.
    467467            if ( uiNumDepthValues_coded > 1 )
    468468            {
    469               WRITE_CODE(uiMaxDiff, 8, "max_diff[ layerId ]");        // max_diff
     469              WRITE_CODE(uiMaxDiff, 8, "max_diff");        // max_diff
    470470            }
    471471           
    472472            if ( uiNumDepthValues_coded > 2 )
    473473            {
    474               WRITE_CODE((uiMinDiff - 1), uiLengthMinDiff, "min_diff_minus1[ layerId ]");     // min_diff_minus1
     474              WRITE_CODE((uiMinDiff - 1), uiLengthMinDiff, "min_diff_minus1");     // min_diff_minus1
    475475            }
    476476           
    477             WRITE_CODE(aiIdx2DepthValue_coded[0], 8, "dlt_depth_value0[layerId]");          // entry0
     477            WRITE_CODE(aiIdx2DepthValue_coded[0], 8, "delta_dlt_val0");          // entry0
    478478           
    479479            if (uiMaxDiff > uiMinDiff)
    … …  
    481481              for (UInt d=1; d < uiNumDepthValues_coded; d++)
    482482              {
    483                 WRITE_CODE( (puiDltDiffValues[d] - uiMinDiff), uiLengthDltDiffMinusMin, "dlt_depth_value_diff_minus_min[ layerId ][ j ]");    // entry_value_diff_minus_min[ k ]
     483                WRITE_CODE( (puiDltDiffValues[d] - uiMinDiff), uiLengthDltDiffMinusMin, "delta_val_diff_minus_min[k]");    // entry_value_diff_minus_min[ k ]
    484484              }
    485485            }

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncSearch.cpp

    r1243 r1247  
    31983198          Bool zeroResiTest = (pcCU->getSlice()->getIsDepth() && !pcCU->getSlice()->isIRAP());
    31993199#if NH_3D_SDC_INTRA
    3200           zeroResiTest |= pcCU->getSDCFlag(uiPartOffset);
     3200          zeroResiTest = zeroResiTest || pcCU->getSDCFlag(uiPartOffset);
    32013201          if( uiSDC != 0 && iSDCDeltaResi != 0 )
    32023202          {
    … …  
    32043204          }
    32053205#endif
    3206           for( UInt zeroResi = 0; zeroResi <= zeroResiTest?1:0; zeroResi++ )
     3206          for( UInt zeroResi = 0; zeroResi <= ( zeroResiTest ? 1 : 0 ); zeroResi++ )
    32073207          {
    32083208#endif
Note: See TracChangeset for help on using the changeset viewer.