Changeset 202 in 3DVCSoftware for branches/HTM-5.0-Nokia/source
- Timestamp:
- 5 Dec 2012, 13:05:28 (12 years ago)
- 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 272 272 } 273 273 } 274 275 274 viewDepthId=fcoIndex; 276 277 275 } 278 276 #else 279 277 viewDepthId = viewId * 2 + depth; // coding order T0D0T1D1T2D2 280 278 #endif 281 282 279 #endif 283 280 #endif -
branches/HTM-5.0-Nokia/source/App/TAppEncoder/TAppEncCfg.cpp
r201 r202 111 111 if (m_pchBitstreamFile != NULL) 112 112 free (m_pchBitstreamFile) ; 113 114 113 #if FLEX_CODING_ORDER_M23723 115 114 if (m_pchMVCJointCodingOrder != NULL) … … 118 117 } 119 118 #endif 120 121 119 #if HHI_VSO 122 120 if ( m_pchVSOConfig != NULL) … … 259 257 260 258 ("NumberOfViews", m_iNumberOfViews, 0, "Number of views") 261 262 259 #if FLEX_CODING_ORDER_M23723 263 260 ("FCO", m_b3DVFlexOrder, false, "flexible coding order flag" ) 264 261 ("FCOCodingOrder", cfg_JointCodingOrdering, string(""), "The coding order for joint texture-depth coding") 265 262 #endif 266 267 263 /* Unit definition parameters */ 268 264 ("MaxCUWidth", m_uiMaxCUWidth, 64u) … … 552 548 m_pchBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str()); 553 549 m_pchdQPFile = cfg_dQPFile.empty() ? NULL : strdup(cfg_dQPFile.c_str()); 554 555 550 #if FLEX_CODING_ORDER_M23723 556 551 m_pchMVCJointCodingOrder= cfg_JointCodingOrdering.empty()?NULL:strdup(cfg_JointCodingOrdering.c_str()); … … 592 587 #endif 593 588 #endif 594 595 596 597 598 599 589 m_pchColumnWidth = cfg_ColumnWidth.empty() ? NULL: strdup(cfg_ColumnWidth.c_str()); 600 590 m_pchRowHeight = cfg_RowHeight.empty() ? NULL : strdup(cfg_RowHeight.c_str()); … … 1826 1816 printf("TMVP:%d ", (m_enableTMVP[1] ? 1 : 0) ); 1827 1817 #endif 1828 1829 1818 #if FLEX_CODING_ORDER_M23723 1830 1819 printf("FCO:%d ", (m_b3DVFlexOrder ? 1: 0)); … … 1835 1824 } 1836 1825 #endif 1837 1838 1826 #if HHI_VSO 1839 1827 printf("VSO:%d ", m_bUseVSO ); -
branches/HTM-5.0-Nokia/source/App/TAppEncoder/TAppEncCfg.h
r201 r202 90 90 91 91 #if FLEX_CODING_ORDER_M23723 92 char* m_pchMVCJointCodingOrder; ///< texture-depth coding order92 Char* m_pchMVCJointCodingOrder; ///< texture-depth coding order 93 93 Bool m_b3DVFlexOrder; ///< flexible coding order flag 94 94 #endif -
branches/HTM-5.0-Nokia/source/App/TAppEncoder/TAppEncTop.cpp
r201 r202 707 707 m_acTEncDepthTopList[iViewIdx]->setUseDMM ( m_bUseDMM ); 708 708 #endif 709 710 709 #if FLEX_CODING_ORDER_M23723 && HHI_DMM_PRED_TEX 711 710 m_acTEncDepthTopList[iViewIdx]->setUseDMM34( (m_b3DVFlexOrder && isDepthFirst) ? false : m_bUseDMM ); … … 715 714 m_acTEncDepthTopList[iViewIdx]->setUseQTLPC (m_bUseQTLPC); 716 715 #endif 717 718 716 #if HHI_MPI 719 717 #if FLEX_CODING_ORDER_M23723 … … 723 721 #endif 724 722 #endif 725 726 727 723 #if RWTH_SDC_DLT_B0036 728 724 m_acTEncDepthTopList[iViewIdx]->setUseDLT ( m_bUseDLT ); … … 1090 1086 1091 1087 #endif 1092 1093 //original code1094 1095 1096 1097 1098 1099 1100 1088 for(Int iViewIdx=0; iViewIdx < m_iNumberOfViews; iViewIdx++ ) 1101 1089 { -
branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TComSlice.cpp
r201 r202 1594 1594 , m_bUseDMM (false) 1595 1595 #endif 1596 1597 1596 #if FLEX_CODING_ORDER_M23723 && HHI_DMM_PRED_TEX 1598 1597 , m_bUseDMM34 (false) 1599 1598 #endif 1600 1601 1599 #if OL_QTLIMIT_PREDCODING_B0068 1602 1600 , m_bUseQTLPC (false)
Note: See TracChangeset for help on using the changeset viewer.