Changeset 202 in 3DVCSoftware


Ignore:
Timestamp:
5 Dec 2012, 13:05:28 (11 years ago)
Author:
tech
Message:

Minor cleanup of additional newlines.

Location:
branches/HTM-5.0-Nokia/source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.0-Nokia/source/App/TAppDecoder/TAppDecTop.cpp

    r201 r202  
    272272          }
    273273        }
    274 
    275274        viewDepthId=fcoIndex;
    276 
    277275      }
    278276#else
    279277  viewDepthId = viewId * 2 + depth;   // coding order T0D0T1D1T2D2
    280278#endif
    281      
    282279#endif
    283280#endif     
  • branches/HTM-5.0-Nokia/source/App/TAppEncoder/TAppEncCfg.cpp

    r201 r202  
    111111  if (m_pchBitstreamFile != NULL)
    112112    free (m_pchBitstreamFile) ;
    113 
    114113#if FLEX_CODING_ORDER_M23723
    115114  if (m_pchMVCJointCodingOrder != NULL)
     
    118117  }
    119118#endif
    120 
    121119#if HHI_VSO
    122120  if (  m_pchVSOConfig != NULL)
     
    259257 
    260258  ("NumberOfViews",         m_iNumberOfViews,    0, "Number of views")
    261 
    262259#if FLEX_CODING_ORDER_M23723
    263260  ("FCO",               m_b3DVFlexOrder,   false, "flexible coding order flag" )
    264261  ("FCOCodingOrder",   cfg_JointCodingOrdering,  string(""), "The coding order for joint texture-depth coding")
    265262#endif
    266 
    267263  /* Unit definition parameters */
    268264  ("MaxCUWidth",          m_uiMaxCUWidth,  64u)
     
    552548  m_pchBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
    553549  m_pchdQPFile = cfg_dQPFile.empty() ? NULL : strdup(cfg_dQPFile.c_str());
    554  
    555550#if FLEX_CODING_ORDER_M23723
    556551  m_pchMVCJointCodingOrder= cfg_JointCodingOrdering.empty()?NULL:strdup(cfg_JointCodingOrdering.c_str());
     
    592587#endif
    593588#endif
    594 
    595 
    596 
    597 
    598  
    599589  m_pchColumnWidth = cfg_ColumnWidth.empty() ? NULL: strdup(cfg_ColumnWidth.c_str());
    600590  m_pchRowHeight = cfg_RowHeight.empty() ? NULL : strdup(cfg_RowHeight.c_str());
     
    18261816  printf("TMVP:%d ", (m_enableTMVP[1] ? 1 : 0) );
    18271817#endif
    1828 
    18291818#if FLEX_CODING_ORDER_M23723
    18301819  printf("FCO:%d ",   (m_b3DVFlexOrder ? 1: 0));
     
    18351824  }
    18361825#endif
    1837 
    18381826#if HHI_VSO
    18391827  printf("VSO:%d ", m_bUseVSO             );
  • branches/HTM-5.0-Nokia/source/App/TAppEncoder/TAppEncCfg.h

    r201 r202  
    9090 
    9191#if FLEX_CODING_ORDER_M23723
    92   char*  m_pchMVCJointCodingOrder;      ///<  texture-depth coding order
     92  Char*  m_pchMVCJointCodingOrder;      ///<  texture-depth coding order
    9393  Bool    m_b3DVFlexOrder;    ///<  flexible coding order flag
    9494#endif
  • branches/HTM-5.0-Nokia/source/App/TAppEncoder/TAppEncTop.cpp

    r201 r202  
    707707    m_acTEncDepthTopList[iViewIdx]->setUseDMM                     ( m_bUseDMM );
    708708#endif
    709 
    710709#if FLEX_CODING_ORDER_M23723 && HHI_DMM_PRED_TEX
    711710    m_acTEncDepthTopList[iViewIdx]->setUseDMM34( (m_b3DVFlexOrder && isDepthFirst) ? false : m_bUseDMM );
     
    715714    m_acTEncDepthTopList[iViewIdx]->setUseQTLPC                   (m_bUseQTLPC);
    716715#endif
    717 
    718716#if HHI_MPI
    719717#if FLEX_CODING_ORDER_M23723
     
    723721#endif
    724722#endif
    725 
    726 
    727723#if RWTH_SDC_DLT_B0036
    728724      m_acTEncDepthTopList[iViewIdx]->setUseDLT                   ( m_bUseDLT );
     
    10901086
    10911087#endif
    1092 
    1093 //original code
    1094 
    1095 
    1096 
    1097 
    1098 
    1099 
    11001088      for(Int iViewIdx=0; iViewIdx < m_iNumberOfViews; iViewIdx++ )
    11011089      {
  • branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TComSlice.cpp

    r201 r202  
    15941594, m_bUseDMM                   (false)
    15951595#endif
    1596 
    15971596#if FLEX_CODING_ORDER_M23723 && HHI_DMM_PRED_TEX
    15981597, m_bUseDMM34                   (false)
    15991598#endif
    1600 
    16011599#if OL_QTLIMIT_PREDCODING_B0068
    16021600, m_bUseQTLPC                 (false)
Note: See TracChangeset for help on using the changeset viewer.