Changeset 1175 in 3DVCSoftware for branches/HTM-13.1-dev0/source/App
- Timestamp:
- 7 Apr 2015, 15:33:31 (10 years ago)
- Location:
- branches/HTM-13.1-dev0/source/App
- Files:
-
- 20 edited
-
TAppDecoder/TAppDecCfg.cpp (modified) (1 diff)
-
TAppDecoder/TAppDecCfg.h (modified) (1 diff)
-
TAppDecoder/TAppDecTop.cpp (modified) (3 diffs)
-
TAppDecoder/TAppDecTop.h (modified) (1 diff)
-
TAppDecoder/decmain.cpp (modified) (1 diff)
-
TAppEncoder/TAppEncCfg.cpp (modified) (2 diffs)
-
TAppEncoder/TAppEncCfg.h (modified) (1 diff)
-
TAppEncoder/TAppEncTop.cpp (modified) (4 diffs)
-
TAppEncoder/TAppEncTop.h (modified) (1 diff)
-
TAppEncoder/encmain.cpp (modified) (1 diff)
-
TAppExtractor/TAppExtrCfg.cpp (modified) (1 diff)
-
TAppExtractor/TAppExtrCfg.h (modified) (1 diff)
-
TAppExtractor/TAppExtrTop.cpp (modified) (1 diff)
-
TAppExtractor/TAppExtrTop.h (modified) (1 diff)
-
TAppExtractor/extrmain.cpp (modified) (1 diff)
-
TAppRenderer/RendererMain.cpp (modified) (1 diff)
-
TAppRenderer/TAppRendererCfg.cpp (modified) (1 diff)
-
TAppRenderer/TAppRendererCfg.h (modified) (1 diff)
-
TAppRenderer/TAppRendererTop.cpp (modified) (1 diff)
-
TAppRenderer/TAppRendererTop.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-13.1-dev0/source/App/TAppDecoder/TAppDecCfg.cpp
r1084 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 4, ITU/ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppDecoder/TAppDecCfg.h
r1084 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 4, ITU/ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppDecoder/TAppDecTop.cpp
r1170 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 4, ITU/ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * … … 248 248 { 249 249 m_tDecTop[decIdx]->setTargetOptLayerSetIdx( m_targetOptLayerSetIdx ); 250 #if H_3D_ANNEX_SELECTION_FIX 250 251 m_tDecTop[decIdx]->setProfileIdc( ); 252 #endif 251 253 } 252 254 … … 1051 1053 m_tDecTop[ decIdx ]->setLayerInitilizedFlags( m_layerInitilizedFlags ); 1052 1054 m_tDecTop[ decIdx ]->setTargetOptLayerSetIdx( m_targetOptLayerSetIdx ); 1055 #if H_3D_ANNEX_SELECTION_FIX 1053 1056 m_tDecTop[ decIdx ]->setProfileIdc ( ); 1057 #endif 1054 1058 1055 1059 #if H_3D -
branches/HTM-13.1-dev0/source/App/TAppDecoder/TAppDecTop.h
r976 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 4, ITU/ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppDecoder/decmain.cpp
r872 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 4, ITU/ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp
r1172 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 4, ITU/ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * … … 1559 1559 { 1560 1560 xConfirmPara( m_directRefLayers[i][j] < 0 || m_directRefLayers[i][j] >= i , "Reference layer id shall be greater than or equal to 0 and less than dependent layer id"); 1561 xConfirmPara( m_dependencyTypes[i][j] < 0 || m_dependencyTypes[i][j] > 2 , "Dependency type shall be greater than or equal to 0 and less than 3"); 1561 #if H_3D_DIRECT_DEP_TYPE 1562 xConfirmPara( m_dependencyTypes[i][j] < 0 || m_dependencyTypes[i][j] > 6 , "Dependency type shall be greater than or equal to 0 and less than 7"); 1563 #else 1564 xConfirmPara( m_dependencyTypes[i][j] < 0 || m_dependencyTypes[i][j] > 2 , "Dependency type shall be greater than or equal to 0 and less than 3"); 1565 #endif 1562 1566 } 1563 1567 } -
branches/HTM-13.1-dev0/source/App/TAppEncoder/TAppEncCfg.h
r1166 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 4, ITU/ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppEncoder/TAppEncTop.cpp
r1172 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 4, ITU/ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * … … 1412 1412 Bool defaultDirectDependencyFlag = false; 1413 1413 1414 #if H_3D_DIRECT_DEP_TYPE 1415 Int directDepTypeLenMinus2 = 0; 1416 #endif 1414 1417 for( Int depLayer = 1; depLayer < m_numberOfLayers; depLayer++ ) 1415 1418 { … … 1421 1424 vps.setDirectDependencyFlag( depLayer, refLayer, true); 1422 1425 Int curDirectDependencyType = m_dependencyTypes[depLayer][i]; 1423 1426 #if H_3D_DIRECT_DEP_TYPE 1427 directDepTypeLenMinus2 = std::max( directDepTypeLenMinus2, gCeilLog2( curDirectDependencyType + 1 ) - 2 ); 1428 #endif 1424 1429 if ( defaultDirectDependencyType != -1 ) 1425 1430 { … … 1438 1443 vps.setDefaultDirectDependencyFlag( defaultDirectDependencyFlag ); 1439 1444 vps.setDefaultDirectDependencyType( defaultDirectDependencyFlag ? defaultDirectDependencyType : -1 ); 1445 1446 #if H_3D_DIRECT_DEP_TYPE 1447 assert( directDepTypeLenMinus2 <= 1 ); 1448 vps.setDirectDepTypeLenMinus2( directDepTypeLenMinus2 ); 1449 #endif 1450 1440 1451 1441 1452 vps.setRefLayers(); -
branches/HTM-13.1-dev0/source/App/TAppEncoder/TAppEncTop.h
r1172 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 4, ITU/ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppEncoder/encmain.cpp
r872 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 4, ITU/ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppExtractor/TAppExtrCfg.cpp
r56 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 1,ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppExtractor/TAppExtrCfg.h
r42 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 1,ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppExtractor/TAppExtrTop.cpp
r608 r1175 4 4 // * granted under this license. 5 5 // * 6 // * Copyright (c) 2010-201 1,ISO/IEC6 // * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 // * All rights reserved. 8 8 // * -
branches/HTM-13.1-dev0/source/App/TAppExtractor/TAppExtrTop.h
r608 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 1,ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppExtractor/extrmain.cpp
r608 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 1,ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppRenderer/RendererMain.cpp
r608 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 1,ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppRenderer/TAppRendererCfg.cpp
r608 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 1,ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppRenderer/TAppRendererCfg.h
r608 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 1,ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppRenderer/TAppRendererTop.cpp
r608 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 1,ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * -
branches/HTM-13.1-dev0/source/App/TAppRenderer/TAppRendererTop.h
r608 r1175 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 1,ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 *
Note: See TracChangeset for help on using the changeset viewer.
