Changeset 1077 in SHVCSoftware
- Timestamp:
- 10 Mar 2015, 17:32:41 (10 years ago)
- Location:
- branches/SHM-dev
- Files:
-
- 8 edited
-
build/vc8/TLibCommon_vc8.vcproj (modified) (9 diffs)
-
build/vc8/TLibEncoder_vc8.vcproj (modified) (2 diffs)
-
build/vc9/TLibCommon_vc9.vcproj (modified) (9 diffs)
-
source/App/TAppDecoder/TAppDecTop.cpp (modified) (4 diffs)
-
source/Lib/TLibCommon/TComSlice.cpp (modified) (2 diffs)
-
source/Lib/TLibEncoder/SEIwrite.cpp (modified) (1 diff)
-
source/Lib/TLibEncoder/TEncGOP.cpp (modified) (4 diffs)
-
source/Lib/TLibVideoIO/TVideoIOYuv.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/build/vc8/TLibCommon_vc8.vcproj
r313 r1077 289 289 </File> 290 290 <File 291 RelativePath="..\..\source\Lib\TLibCommon\Debug.cpp" 292 > 293 </File> 294 <File 291 295 RelativePath="..\..\source\Lib\libmd5\libmd5.c" 292 296 > … … 297 301 </File> 298 302 <File 303 RelativePath="..\..\source\Lib\TLibCommon\TCom3DAsymLUT.cpp" 304 > 305 </File> 306 <File 299 307 RelativePath="..\..\source\Lib\TLibCommon\TComBitStream.cpp" 300 308 > … … 305 313 </File> 306 314 <File 315 RelativePath="..\..\source\Lib\TLibCommon\TComChromaFormat.cpp" 316 > 317 </File> 318 <File 307 319 RelativePath="..\..\source\Lib\TLibCommon\TComDataCU.cpp" 308 320 > … … 366 378 <File 367 379 RelativePath="..\..\source\Lib\TLibCommon\TComTrQuant.cpp" 380 > 381 </File> 382 <File 383 RelativePath="..\..\source\Lib\TLibCommon\TComTU.cpp" 368 384 > 369 385 </File> … … 407 423 </File> 408 424 <File 425 RelativePath="..\..\source\Lib\TLibCommon\Debug.h" 426 > 427 </File> 428 <File 409 429 RelativePath="..\..\source\Lib\libmd5\libmd5.h" 410 430 > … … 423 443 </File> 424 444 <File 445 RelativePath="..\..\source\Lib\TLibCommon\TCom3DAsymLUT.h" 446 > 447 </File> 448 <File 425 449 RelativePath="..\..\source\Lib\TLibCommon\TComBitCounter.h" 426 450 > … … 435 459 </File> 436 460 <File 461 RelativePath="..\..\source\Lib\TLibCommon\TComChromaFormat.h" 462 > 463 </File> 464 <File 465 RelativePath="..\..\source\Lib\TLibCommon\TComCodingStatistics.h" 466 > 467 </File> 468 <File 437 469 RelativePath="..\..\source\Lib\TLibCommon\TComDataCU.h" 438 470 > … … 487 519 </File> 488 520 <File 521 RelativePath="..\..\source\Lib\TLibCommon\TComRectangle.h" 522 > 523 </File> 524 <File 489 525 RelativePath="..\..\source\Lib\TLibCommon\TComRom.h" 490 526 > … … 500 536 <File 501 537 RelativePath="..\..\source\Lib\TLibCommon\TComTrQuant.h" 538 > 539 </File> 540 <File 541 RelativePath="..\..\source\Lib\TLibCommon\TComTU.h" 502 542 > 503 543 </File> -
branches/SHM-dev/build/vc8/TLibEncoder_vc8.vcproj
r313 r1077 292 292 </File> 293 293 <File 294 RelativePath="..\..\source\Lib\TLibEncoder\TEnc3DAsymLUT.cpp" 295 > 296 </File> 297 <File 294 298 RelativePath="..\..\source\Lib\TLibEncoder\TEncAnalyze.cpp" 295 299 > … … 374 378 <File 375 379 RelativePath="..\..\source\Lib\TLibEncoder\SyntaxElementWriter.h" 380 > 381 </File> 382 <File 383 RelativePath="..\..\source\Lib\TLibEncoder\TEnc3DAsymLUT.h" 376 384 > 377 385 </File> -
branches/SHM-dev/build/vc9/TLibCommon_vc9.vcproj
r713 r1077 82 82 </Configuration> 83 83 <Configuration 84 Name="Debug|x64" 85 OutputDirectory="$(SolutionDir)\vc9\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)" 86 IntermediateDirectory="$(SolutionDir)\vc9\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)" 87 ConfigurationType="4" 88 CharacterSet="2" 89 > 90 <Tool 91 Name="VCPreBuildEventTool" 92 /> 93 <Tool 94 Name="VCCustomBuildTool" 95 /> 96 <Tool 97 Name="VCXMLDataGeneratorTool" 98 /> 99 <Tool 100 Name="VCWebServiceProxyGeneratorTool" 101 /> 102 <Tool 103 Name="VCMIDLTool" 104 TargetEnvironment="3" 105 /> 106 <Tool 107 Name="VCCLCompilerTool" 108 Optimization="0" 109 AdditionalIncludeDirectories="$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc" 110 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" 111 MinimalRebuild="true" 112 BasicRuntimeChecks="3" 113 RuntimeLibrary="1" 114 WarningLevel="3" 115 DebugInformationFormat="3" 116 /> 117 <Tool 118 Name="VCManagedResourceCompilerTool" 119 /> 120 <Tool 121 Name="VCResourceCompilerTool" 122 /> 123 <Tool 124 Name="VCPreLinkEventTool" 125 /> 126 <Tool 127 Name="VCLibrarianTool" 128 /> 129 <Tool 130 Name="VCALinkTool" 131 /> 132 <Tool 133 Name="VCXDCMakeTool" 134 /> 135 <Tool 136 Name="VCBscMakeTool" 137 /> 138 <Tool 139 Name="VCFxCopTool" 140 /> 141 <Tool 142 Name="VCPostBuildEventTool" 143 /> 144 </Configuration> 145 <Configuration 84 146 Name="Release|Win32" 85 147 OutputDirectory="$(SolutionDir)\vc9\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)" … … 147 209 </Configuration> 148 210 <Configuration 149 Name="Debug|x64"150 OutputDirectory="$(SolutionDir)\vc9\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)"151 IntermediateDirectory="$(SolutionDir)\vc9\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)"152 ConfigurationType="4"153 CharacterSet="2"154 >155 <Tool156 Name="VCPreBuildEventTool"157 />158 <Tool159 Name="VCCustomBuildTool"160 />161 <Tool162 Name="VCXMLDataGeneratorTool"163 />164 <Tool165 Name="VCWebServiceProxyGeneratorTool"166 />167 <Tool168 Name="VCMIDLTool"169 TargetEnvironment="3"170 />171 <Tool172 Name="VCCLCompilerTool"173 Optimization="0"174 AdditionalIncludeDirectories="$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc"175 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"176 MinimalRebuild="true"177 BasicRuntimeChecks="3"178 RuntimeLibrary="1"179 WarningLevel="3"180 DebugInformationFormat="3"181 />182 <Tool183 Name="VCManagedResourceCompilerTool"184 />185 <Tool186 Name="VCResourceCompilerTool"187 />188 <Tool189 Name="VCPreLinkEventTool"190 />191 <Tool192 Name="VCLibrarianTool"193 />194 <Tool195 Name="VCALinkTool"196 />197 <Tool198 Name="VCXDCMakeTool"199 />200 <Tool201 Name="VCBscMakeTool"202 />203 <Tool204 Name="VCFxCopTool"205 />206 <Tool207 Name="VCPostBuildEventTool"208 />209 </Configuration>210 <Configuration211 211 Name="Release|x64" 212 212 OutputDirectory="$(SolutionDir)\vc9\$(PlatformName)\$(ConfigurationName)\$(RootNamespace)" … … 292 292 </File> 293 293 <File 294 RelativePath="..\..\source\Lib\TLibCommon\Debug.cpp" 295 > 296 </File> 297 <File 294 298 RelativePath="..\..\source\Lib\libmd5\libmd5.c" 295 299 > … … 312 316 </File> 313 317 <File 318 RelativePath="..\..\source\Lib\TLibCommon\TComChromaFormat.cpp" 319 > 320 </File> 321 <File 314 322 RelativePath="..\..\source\Lib\TLibCommon\TComDataCU.cpp" 315 323 > … … 373 381 <File 374 382 RelativePath="..\..\source\Lib\TLibCommon\TComTrQuant.cpp" 383 > 384 </File> 385 <File 386 RelativePath="..\..\source\Lib\TLibCommon\TComTU.cpp" 375 387 > 376 388 </File> … … 414 426 </File> 415 427 <File 428 RelativePath="..\..\source\Lib\TLibCommon\Debug.h" 429 > 430 </File> 431 <File 416 432 RelativePath="..\..\source\Lib\libmd5\libmd5.h" 417 433 > … … 446 462 </File> 447 463 <File 464 RelativePath="..\..\source\Lib\TLibCommon\TComChromaFormat.h" 465 > 466 </File> 467 <File 468 RelativePath="..\..\source\Lib\TLibCommon\TComCodingStatistics.h" 469 > 470 </File> 471 <File 448 472 RelativePath="..\..\source\Lib\TLibCommon\TComDataCU.h" 449 473 > … … 498 522 </File> 499 523 <File 524 RelativePath="..\..\source\Lib\TLibCommon\TComRectangle.h" 525 > 526 </File> 527 <File 500 528 RelativePath="..\..\source\Lib\TLibCommon\TComRom.h" 501 529 > … … 511 539 <File 512 540 RelativePath="..\..\source\Lib\TLibCommon\TComTrQuant.h" 541 > 542 </File> 543 <File 544 RelativePath="..\..\source\Lib\TLibCommon\TComTU.h" 513 545 > 514 546 </File> -
branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp
r1057 r1077 1491 1491 if( it != listOfPocsInEachLayer[layerId].end() ) // picture found. 1492 1492 { 1493 Int picPosition = std::distance( listOfPocsInEachLayer[layerId].begin(), it );1493 Int picPosition = (Int)std::distance( listOfPocsInEachLayer[layerId].begin(), it ); 1494 1494 Int j; 1495 1495 for(j = 0, iterPic = m_acTDecTop[layerId].getListPic()->begin(); j < listOfPocsPositionInEachLayer[layerId][picPosition]; j++) // Picture to be output … … 1648 1648 if( it != listOfPocsInEachLayer[i].end() ) 1649 1649 { 1650 Int picPosition = std::distance( listOfPocsInEachLayer[i].begin(), it );1650 Int picPosition = (Int)std::distance( listOfPocsInEachLayer[i].begin(), it ); 1651 1651 Int j; 1652 1652 for(j = 0, iterPic = m_acTDecTop[i].getListPic()->begin(); j < listOfPocsPositionInEachLayer[i][picPosition]; j++) // Picture to be output … … 1803 1803 Int targetLsIdx = vps->getOutputLayerSetIdx( getCommonDecoderParams()->getTargetOutputLayerSetIdx() ); 1804 1804 // Update status 1805 dpbStatus.m_numAUsNotDisplayed = listOfPocs.size(); // Number of AUs not displayed1805 dpbStatus.m_numAUsNotDisplayed = (Int)listOfPocs.size(); // Number of AUs not displayed 1806 1806 dpbStatus.m_numLayers = vps->getNumLayersInIdList( targetLsIdx ); 1807 1807 #if FIX_ALIGN_BUMPING … … 1823 1823 #endif 1824 1824 { 1825 dpbStatus.m_numPicsNotDisplayedInLayer[i] = listOfPocsInEachLayer[i].size();1825 dpbStatus.m_numPicsNotDisplayedInLayer[i] = (Int)listOfPocsInEachLayer[i].size(); 1826 1826 #if RESOLUTION_BASED_DPB 1827 1827 dpbStatus.m_numPicsInSubDpb[vps->getSubDpbAssigned(targetLsIdx,i)] += dpbStatus.m_numPicsInLayer[i]; -
branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp
r1073 r1077 3329 3329 } 3330 3330 } 3331 m_numLayerInIdList.push_back( m_layerSetLayerIdList[i].size());3331 m_numLayerInIdList.push_back((Int)m_layerSetLayerIdList[i].size()); 3332 3332 } 3333 3333 } … … 3591 3591 if( it != m_layerSetLayerIdList[olsIdx].end() ) 3592 3592 { 3593 layerIdc = std::distance( m_layerSetLayerIdList[olsIdx].begin(), it );3593 layerIdc = (Int)std::distance( m_layerSetLayerIdList[olsIdx].begin(), it ); 3594 3594 } 3595 3595 -
branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp
r1037 r1077 1165 1165 #if NESTING_SEI_EXTENSIBILITY 1166 1166 assert( sei.m_nestedSEIs.size() <= MAX_SEIS_IN_BSP_NESTING ); 1167 WRITE_UVLC( sei.m_nestedSEIs.size(), "num_seis_in_bsp_minus1" );1167 WRITE_UVLC( (UInt)sei.m_nestedSEIs.size(), "num_seis_in_bsp_minus1" ); 1168 1168 #endif 1169 1169 // write nested SEI messages -
branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp
r1063 r1077 3047 3047 if (m_pcCfg->getCabacZeroWordPaddingEnabled()) 3048 3048 { 3049 std::vector<Char> zeroBytesPadding( numberOfAdditionalCabacZeroBytes, Char(0));3050 for( Int64i=0; i<numberOfAdditionalCabacZeroWords; i++)3049 std::vector<Char> zeroBytesPadding((size_t)numberOfAdditionalCabacZeroBytes, Char(0)); 3050 for(size_t i=0; i<numberOfAdditionalCabacZeroWords; i++) 3051 3051 { 3052 3052 zeroBytesPadding[i*3+2]=3; // 00 00 03 3053 3053 } 3054 accessUnit.back()->m_nalUnitData.write(&(zeroBytesPadding[0]), numberOfAdditionalCabacZeroBytes);3054 accessUnit.back()->m_nalUnitData.write(&(zeroBytesPadding[0]), (size_t)numberOfAdditionalCabacZeroBytes); 3055 3055 printf("Adding %lld bytes of padding\n", numberOfAdditionalCabacZeroWords*3); 3056 3056 } … … 4448 4448 { 4449 4449 strTmp = m_pcCfg->getOverlaySEILanguage()[i]; 4450 nBytes = m_pcCfg->getOverlaySEILanguage()[i].size();4450 nBytes = (Int)m_pcCfg->getOverlaySEILanguage()[i].size(); 4451 4451 assert( nBytes>0 ); 4452 4452 sei->m_overlayLanguage[i] = new UChar[nBytes]; … … 4457 4457 //overlay name 4458 4458 strTmp = m_pcCfg->getOverlaySEIName()[i]; 4459 nBytes = m_pcCfg->getOverlaySEIName()[i].size();4459 nBytes = (Int)m_pcCfg->getOverlaySEIName()[i].size(); 4460 4460 assert( nBytes>0 ); 4461 4461 sei->m_overlayName[i] = new UChar[nBytes]; … … 4472 4472 { 4473 4473 strTmp = m_pcCfg->getOverlaySEIElementName()[i][j]; 4474 nBytes = m_pcCfg->getOverlaySEIElementName()[i][j].size();4474 nBytes = (Int)m_pcCfg->getOverlaySEIElementName()[i][j].size(); 4475 4475 assert( nBytes>0 ); 4476 4476 sei->m_overlayElementName[i][j] = new UChar[nBytes]; -
branches/SHM-dev/source/Lib/TLibVideoIO/TVideoIOYuv.cpp
r1029 r1077 202 202 /* fall back to consuming the input */ 203 203 Char buf[512]; 204 const UIntoffset_mod_bufsize = offset % sizeof(buf);204 const streamoff offset_mod_bufsize = offset % sizeof(buf); 205 205 for (streamoff i = 0; i < offset - offset_mod_bufsize; i += sizeof(buf)) 206 206 {
Note: See TracChangeset for help on using the changeset viewer.
