Changeset 1439 in SHVCSoftware
- Timestamp:
- 12 Aug 2015, 20:03:56 (9 years ago)
- Location:
- branches/SHM-dev
- Files:
-
- 6 edited
-
SHM.xcodeproj/project.pbxproj (modified) (25 diffs)
-
source/Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)
-
source/Lib/TLibCommon/TComSlice.h (modified) (1 diff)
-
source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
-
source/Lib/TLibDecoder/TDecSlice.h (modified) (1 diff)
-
source/Lib/TLibEncoder/TEncTop.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/SHM.xcodeproj/project.pbxproj
r815 r1439 77 77 6767961211AD623900421804 /* TDecTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6767960411AD623900421804 /* TDecTop.cpp */; }; 78 78 6767961311AD623900421804 /* TDecTop.h in Headers */ = {isa = PBXBuildFile; fileRef = 6767960511AD623900421804 /* TDecTop.h */; }; 79 6767963311AD628100421804 /* TEncAnalyze.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6767961E11AD628100421804 /* TEncAnalyze.cpp */; };80 79 6767963411AD628100421804 /* TEncAnalyze.h in Headers */ = {isa = PBXBuildFile; fileRef = 6767961F11AD628100421804 /* TEncAnalyze.h */; }; 81 80 6767963511AD628100421804 /* TEncCavlc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6767962011AD628100421804 /* TEncCavlc.cpp */; }; … … 131 130 71AD603A11EBC28D00F5F1FE /* libTLibEncoder.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6767961911AD626F00421804 /* libTLibEncoder.a */; }; 132 131 71AD603B11EBC29600F5F1FE /* libTLibVideoIO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6767964B11AD629200421804 /* libTLibVideoIO.a */; }; 132 71BA9DD71B7B6137000B0413 /* SEIEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71BA9DD51B7B6137000B0413 /* SEIEncoder.cpp */; }; 133 71BA9DD81B7B6137000B0413 /* SEIEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 71BA9DD61B7B6137000B0413 /* SEIEncoder.h */; }; 134 71BA9DE11B7B679A000B0413 /* Debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71BA9DD91B7B679A000B0413 /* Debug.cpp */; }; 135 71BA9DE21B7B679A000B0413 /* Debug.h in Headers */ = {isa = PBXBuildFile; fileRef = 71BA9DDA1B7B679A000B0413 /* Debug.h */; }; 136 71BA9DE31B7B679A000B0413 /* TComChromaFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71BA9DDB1B7B679A000B0413 /* TComChromaFormat.cpp */; }; 137 71BA9DE41B7B679A000B0413 /* TComChromaFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 71BA9DDC1B7B679A000B0413 /* TComChromaFormat.h */; }; 138 71BA9DE51B7B679A000B0413 /* TComCodingStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = 71BA9DDD1B7B679A000B0413 /* TComCodingStatistics.h */; }; 139 71BA9DE61B7B679A000B0413 /* TComRectangle.h in Headers */ = {isa = PBXBuildFile; fileRef = 71BA9DDE1B7B679A000B0413 /* TComRectangle.h */; }; 140 71BA9DE71B7B679A000B0413 /* TComTU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71BA9DDF1B7B679A000B0413 /* TComTU.cpp */; }; 141 71BA9DE81B7B679A000B0413 /* TComTU.h in Headers */ = {isa = PBXBuildFile; fileRef = 71BA9DE01B7B679A000B0413 /* TComTU.h */; }; 133 142 C3D5A69A190AD6DA005E0EBE /* TCom3DAsymLUT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3D5A698190AD6DA005E0EBE /* TCom3DAsymLUT.cpp */; }; 134 143 C3D5A69B190AD6DA005E0EBE /* TCom3DAsymLUT.h in Headers */ = {isa = PBXBuildFile; fileRef = C3D5A699190AD6DA005E0EBE /* TCom3DAsymLUT.h */; }; … … 289 298 6767960511AD623900421804 /* TDecTop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TDecTop.h; path = source/Lib/TLibDecoder/TDecTop.h; sourceTree = "<group>"; }; 290 299 6767961911AD626F00421804 /* libTLibEncoder.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libTLibEncoder.a; sourceTree = BUILT_PRODUCTS_DIR; }; 291 6767961E11AD628100421804 /* TEncAnalyze.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TEncAnalyze.cpp; path = source/Lib/TLibEncoder/TEncAnalyze.cpp; sourceTree = "<group>"; };292 300 6767961F11AD628100421804 /* TEncAnalyze.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TEncAnalyze.h; path = source/Lib/TLibEncoder/TEncAnalyze.h; sourceTree = "<group>"; }; 293 301 6767962011AD628100421804 /* TEncCavlc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TEncCavlc.cpp; path = source/Lib/TLibEncoder/TEncCavlc.cpp; sourceTree = "<group>"; }; … … 344 352 7184647513FAE75800747BF9 /* program_options_lite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = program_options_lite.cpp; path = source/Lib/TAppCommon/program_options_lite.cpp; sourceTree = "<group>"; }; 345 353 7184647613FAE75800747BF9 /* program_options_lite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = program_options_lite.h; path = source/Lib/TAppCommon/program_options_lite.h; sourceTree = "<group>"; }; 354 71BA9DD51B7B6137000B0413 /* SEIEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SEIEncoder.cpp; path = source/Lib/TLibEncoder/SEIEncoder.cpp; sourceTree = "<group>"; }; 355 71BA9DD61B7B6137000B0413 /* SEIEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SEIEncoder.h; path = source/Lib/TLibEncoder/SEIEncoder.h; sourceTree = "<group>"; }; 356 71BA9DD91B7B679A000B0413 /* Debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Debug.cpp; path = source/Lib/TLibCommon/Debug.cpp; sourceTree = "<group>"; }; 357 71BA9DDA1B7B679A000B0413 /* Debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Debug.h; path = source/Lib/TLibCommon/Debug.h; sourceTree = "<group>"; }; 358 71BA9DDB1B7B679A000B0413 /* TComChromaFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TComChromaFormat.cpp; path = source/Lib/TLibCommon/TComChromaFormat.cpp; sourceTree = "<group>"; }; 359 71BA9DDC1B7B679A000B0413 /* TComChromaFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TComChromaFormat.h; path = source/Lib/TLibCommon/TComChromaFormat.h; sourceTree = "<group>"; }; 360 71BA9DDD1B7B679A000B0413 /* TComCodingStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TComCodingStatistics.h; path = source/Lib/TLibCommon/TComCodingStatistics.h; sourceTree = "<group>"; }; 361 71BA9DDE1B7B679A000B0413 /* TComRectangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TComRectangle.h; path = source/Lib/TLibCommon/TComRectangle.h; sourceTree = "<group>"; }; 362 71BA9DDF1B7B679A000B0413 /* TComTU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TComTU.cpp; path = source/Lib/TLibCommon/TComTU.cpp; sourceTree = "<group>"; }; 363 71BA9DE01B7B679A000B0413 /* TComTU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TComTU.h; path = source/Lib/TLibCommon/TComTU.h; sourceTree = "<group>"; }; 346 364 C3D5A698190AD6DA005E0EBE /* TCom3DAsymLUT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TCom3DAsymLUT.cpp; path = source/Lib/TLibCommon/TCom3DAsymLUT.cpp; sourceTree = "<group>"; }; 347 365 C3D5A699190AD6DA005E0EBE /* TCom3DAsymLUT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TCom3DAsymLUT.h; path = source/Lib/TLibCommon/TCom3DAsymLUT.h; sourceTree = "<group>"; }; … … 472 490 isa = PBXGroup; 473 491 children = ( 474 C3D5A698190AD6DA005E0EBE /* TCom3DAsymLUT.cpp */,475 C3D5A699190AD6DA005E0EBE /* TCom3DAsymLUT.h */,476 6B635E7516E5EAB60057B313 /* TComUpsampleFilter.h */,477 6B635E7616E5EAB60057B313 /* TComUpsampleFilter.cpp */,478 492 712FAEA81379BA2F00DB5314 /* AccessUnit.h */, 479 712FAEA91379BA2F00DB5314 /* NAL.h */,480 65EA1B85135744C400988950 /* libmd5.h */,481 65EA1B86135744C400988950 /* libmd5.c */,482 65EA1B87135744C400988950 /* MD5.h */,483 493 6767959911AD61FC00421804 /* CommonDef.h */, 484 6767959A11AD61FC00421804 /* ContextTables.h */,485 494 671E0D3811B6AD8C00F3747B /* ContextModel.cpp */, 486 495 671E0D3911B6AD8C00F3747B /* ContextModel.h */, 487 496 671E0D3A11B6AD8C00F3747B /* ContextModel3DBuffer.cpp */, 488 497 671E0D3B11B6AD8C00F3747B /* ContextModel3DBuffer.h */, 498 6767959A11AD61FC00421804 /* ContextTables.h */, 499 71BA9DD91B7B679A000B0413 /* Debug.cpp */, 500 71BA9DDA1B7B679A000B0413 /* Debug.h */, 501 65EA1B86135744C400988950 /* libmd5.c */, 502 65EA1B85135744C400988950 /* libmd5.h */, 503 65EA1B87135744C400988950 /* MD5.h */, 504 712FAEA91379BA2F00DB5314 /* NAL.h */, 505 71161E9E16A7253F0021E8A8 /* SEI.cpp */, 506 65EA1B941357451300988950 /* SEI.h */, 507 65EA1B91135744FE00988950 /* SEIwrite.cpp */, 508 65EA1B90135744FE00988950 /* SEIwrite.h */, 509 C3D5A698190AD6DA005E0EBE /* TCom3DAsymLUT.cpp */, 510 C3D5A699190AD6DA005E0EBE /* TCom3DAsymLUT.h */, 489 511 671E0D3E11B6AD8C00F3747B /* TComBitCounter.h */, 512 676795A311AD61FC00421804 /* TComBitStream.cpp */, 513 676795A411AD61FC00421804 /* TComBitStream.h */, 490 514 671E0D3F11B6AD8C00F3747B /* TComCABACTables.cpp */, 491 515 671E0D4011B6AD8C00F3747B /* TComCABACTables.h */, 492 671E0D4111B6AD8C00F3747B /* TComMv.h */, 493 676795A311AD61FC00421804 /* TComBitStream.cpp */, 494 65EA1B96135745D500988950 /* TComPicYuvMD5.cpp */, 495 676795A411AD61FC00421804 /* TComBitStream.h */, 516 71BA9DDB1B7B679A000B0413 /* TComChromaFormat.cpp */, 517 71BA9DDC1B7B679A000B0413 /* TComChromaFormat.h */, 518 71BA9DDD1B7B679A000B0413 /* TComCodingStatistics.h */, 496 519 676795A511AD61FC00421804 /* TComDataCU.cpp */, 497 520 676795A611AD61FC00421804 /* TComDataCU.h */, … … 503 526 676795AA11AD61FC00421804 /* TComMotionInfo.cpp */, 504 527 676795AB11AD61FC00421804 /* TComMotionInfo.h */, 528 671E0D4111B6AD8C00F3747B /* TComMv.h */, 505 529 676795AD11AD61FC00421804 /* TComPattern.cpp */, 506 530 676795AE11AD61FC00421804 /* TComPattern.h */, … … 511 535 676795B311AD61FC00421804 /* TComPicYuv.cpp */, 512 536 676795B411AD61FC00421804 /* TComPicYuv.h */, 537 65EA1B96135745D500988950 /* TComPicYuvMD5.cpp */, 513 538 676795B711AD61FC00421804 /* TComPrediction.cpp */, 514 539 676795B811AD61FC00421804 /* TComPrediction.h */, … … 517 542 DBC9C9471447847400A77A93 /* TComRdCostWeightPrediction.cpp */, 518 543 DBC9C9481447847400A77A93 /* TComRdCostWeightPrediction.h */, 544 71BA9DDE1B7B679A000B0413 /* TComRectangle.h */, 519 545 676795BB11AD61FC00421804 /* TComRom.cpp */, 520 546 676795BC11AD61FC00421804 /* TComRom.h */, … … 523 549 676795BD11AD61FC00421804 /* TComSlice.cpp */, 524 550 676795BE11AD61FC00421804 /* TComSlice.h */, 525 65EA1B941357451300988950 /* SEI.h */,526 71161E9E16A7253F0021E8A8 /* SEI.cpp */,527 65EA1B90135744FE00988950 /* SEIwrite.h */,528 65EA1B91135744FE00988950 /* SEIwrite.cpp */,529 551 676795BF11AD61FC00421804 /* TComTrQuant.cpp */, 530 552 676795C011AD61FC00421804 /* TComTrQuant.h */, 553 71BA9DDF1B7B679A000B0413 /* TComTU.cpp */, 554 71BA9DE01B7B679A000B0413 /* TComTU.h */, 555 6B635E7616E5EAB60057B313 /* TComUpsampleFilter.cpp */, 556 6B635E7516E5EAB60057B313 /* TComUpsampleFilter.h */, 531 557 DBC9C9491447847400A77A93 /* TComWeightPrediction.cpp */, 532 558 DBC9C94A1447847400A77A93 /* TComWeightPrediction.h */, … … 541 567 isa = PBXGroup; 542 568 children = ( 543 71206CD416066EC700A354E7 /* SyntaxElementParser.cpp */,544 71206CD516066EC700A354E7 /* SyntaxElementParser.h */,545 569 712FAEB21379BA6600DB5314 /* AnnexBread.cpp */, 546 570 712FAEB31379BA6600DB5314 /* AnnexBread.h */, 547 571 712FAEB41379BA6600DB5314 /* NALread.cpp */, 548 572 712FAEB51379BA6600DB5314 /* NALread.h */, 573 65EA1B8D135744EA00988950 /* SEIread.cpp */, 549 574 65EA1B8C135744EA00988950 /* SEIread.h */, 550 65EA1B8D135744EA00988950 /* SEIread.cpp */, 575 71206CD416066EC700A354E7 /* SyntaxElementParser.cpp */, 576 71206CD516066EC700A354E7 /* SyntaxElementParser.h */, 551 577 671E0D5611B6ADD300F3747B /* TDecBinCoder.h */, 552 578 671E0D5711B6ADD300F3747B /* TDecBinCoderCABAC.cpp */, … … 573 599 isa = PBXGroup; 574 600 children = ( 575 C3D5A69C190AD6F8005E0EBE /* TEnc3DAsymLUT.cpp */,576 C3D5A69D190AD6F8005E0EBE /* TEnc3DAsymLUT.h */,577 71206CD916066EDD00A354E7 /* SyntaxElementWriter.cpp */,578 71206CDA16066EDD00A354E7 /* SyntaxElementWriter.h */,579 601 712FAEAC1379BA4900DB5314 /* AnnexBwrite.h */, 580 602 712FAEAD1379BA4900DB5314 /* NALwrite.cpp */, 581 603 712FAEAE1379BA4900DB5314 /* NALwrite.h */, 604 71BA9DD51B7B6137000B0413 /* SEIEncoder.cpp */, 605 71BA9DD61B7B6137000B0413 /* SEIEncoder.h */, 606 71206CD916066EDD00A354E7 /* SyntaxElementWriter.cpp */, 607 71206CDA16066EDD00A354E7 /* SyntaxElementWriter.h */, 608 C3D5A69C190AD6F8005E0EBE /* TEnc3DAsymLUT.cpp */, 609 C3D5A69D190AD6F8005E0EBE /* TEnc3DAsymLUT.h */, 610 6767961F11AD628100421804 /* TEncAnalyze.h */, 582 611 671E0D7211B6ADE900F3747B /* TEncBinCoder.h */, 583 612 671E0D7311B6ADE900F3747B /* TEncBinCoderCABAC.cpp */, … … 585 614 DBA796C61499ADE2003F7D5D /* TEncBinCoderCABACCounter.cpp */, 586 615 DBA796C71499ADE3003F7D5D /* TEncBinCoderCABACCounter.h */, 587 6767961E11AD628100421804 /* TEncAnalyze.cpp */,588 6767961F11AD628100421804 /* TEncAnalyze.h */,589 616 6767962011AD628100421804 /* TEncCavlc.cpp */, 590 617 6767962111AD628100421804 /* TEncCavlc.h */, … … 680 707 676795CF11AD61FC00421804 /* TComBitStream.h in Headers */, 681 708 676795D111AD61FC00421804 /* TComDataCU.h in Headers */, 709 71BA9DE21B7B679A000B0413 /* Debug.h in Headers */, 682 710 676795D211AD61FC00421804 /* TComList.h in Headers */, 683 711 676795D411AD61FC00421804 /* TComLoopFilter.h in Headers */, … … 693 721 676795E911AD61FC00421804 /* TComSlice.h in Headers */, 694 722 676795EB11AD61FC00421804 /* TComTrQuant.h in Headers */, 723 71BA9DE81B7B679A000B0413 /* TComTU.h in Headers */, 695 724 676795ED11AD61FC00421804 /* TComYuv.h in Headers */, 696 725 676795EE11AD61FC00421804 /* TypeDef.h in Headers */, … … 698 727 671E0D4C11B6AD8C00F3747B /* ContextModel3DBuffer.h in Headers */, 699 728 671E0D4F11B6AD8C00F3747B /* TComBitCounter.h in Headers */, 729 71BA9DE61B7B679A000B0413 /* TComRectangle.h in Headers */, 700 730 C3D5A69F190AD6F8005E0EBE /* TEnc3DAsymLUT.h in Headers */, 731 71BA9DE41B7B679A000B0413 /* TComChromaFormat.h in Headers */, 701 732 671E0D5111B6AD8C00F3747B /* TComCABACTables.h in Headers */, 702 733 671E0D5211B6AD8C00F3747B /* TComMv.h in Headers */, … … 712 743 DBC9C94C1447847400A77A93 /* TComRdCostWeightPrediction.h in Headers */, 713 744 DBC9C94E1447847400A77A93 /* TComWeightPrediction.h in Headers */, 745 71BA9DE51B7B679A000B0413 /* TComCodingStatistics.h in Headers */, 714 746 6B635E7716E5EAB60057B313 /* TComUpsampleFilter.h in Headers */, 715 747 ); … … 745 777 6767963911AD628100421804 /* TEncCu.h in Headers */, 746 778 6767963B11AD628100421804 /* TEncEntropy.h in Headers */, 779 71BA9DD81B7B6137000B0413 /* SEIEncoder.h in Headers */, 747 780 6767963D11AD628100421804 /* TEncGOP.h in Headers */, 748 781 6767963F11AD628100421804 /* TEncSbac.h in Headers */, … … 914 947 attributes = { 915 948 BuildIndependentTargetsInParallel = YES; 916 LastUpgradeCheck = 0 450;949 LastUpgradeCheck = 0640; 917 950 }; 918 951 buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "SHM" */; … … 956 989 C3D5A69A190AD6DA005E0EBE /* TCom3DAsymLUT.cpp in Sources */, 957 990 676795DE11AD61FC00421804 /* TComPicYuv.cpp in Sources */, 991 71BA9DE31B7B679A000B0413 /* TComChromaFormat.cpp in Sources */, 958 992 676795E211AD61FC00421804 /* TComPrediction.cpp in Sources */, 993 71BA9DE11B7B679A000B0413 /* Debug.cpp in Sources */, 959 994 676795E411AD61FC00421804 /* TComRdCost.cpp in Sources */, 960 995 676795E611AD61FC00421804 /* TComRom.cpp in Sources */, … … 967 1002 65EA1B89135744C400988950 /* libmd5.c in Sources */, 968 1003 65EA1B97135745D500988950 /* TComPicYuvMD5.cpp in Sources */, 1004 71BA9DE71B7B679A000B0413 /* TComTU.cpp in Sources */, 969 1005 DBDDB3AB13E26B4400A70251 /* TComInterpolationFilter.cpp in Sources */, 970 1006 DB7795C213F1226500C92469 /* TEncPic.cpp in Sources */, … … 1001 1037 buildActionMask = 2147483647; 1002 1038 files = ( 1003 6767963311AD628100421804 /* TEncAnalyze.cpp in Sources */,1004 1039 6767963511AD628100421804 /* TEncCavlc.cpp in Sources */, 1040 71BA9DD71B7B6137000B0413 /* SEIEncoder.cpp in Sources */, 1005 1041 6767963811AD628100421804 /* TEncCu.cpp in Sources */, 1006 1042 6767963A11AD628100421804 /* TEncEntropy.cpp in Sources */, … … 1107 1143 isa = XCBuildConfiguration; 1108 1144 buildSettings = { 1109 ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";1110 1145 GCC_C_LANGUAGE_STANDARD = gnu99; 1111 1146 GCC_OPTIMIZATION_LEVEL = 0; 1112 1147 GCC_WARN_ABOUT_RETURN_TYPE = YES; 1148 GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; 1113 1149 GCC_WARN_UNUSED_VARIABLE = YES; 1114 1150 HEADER_SEARCH_PATHS = source/Lib; 1115 1151 ONLY_ACTIVE_ARCH = YES; 1116 SDKROOT = macosx10.8;1152 SDKROOT = ""; 1117 1153 }; 1118 1154 name = Debug; … … 1121 1157 isa = XCBuildConfiguration; 1122 1158 buildSettings = { 1123 ARCHS = "$(NATIVE_ARCH_ACTUAL)";1124 1159 GCC_C_LANGUAGE_STANDARD = gnu99; 1125 1160 GCC_OPTIMIZATION_LEVEL = 3; 1126 1161 GCC_WARN_ABOUT_RETURN_TYPE = YES; 1162 GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; 1127 1163 GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; 1128 1164 GCC_WARN_UNUSED_VARIABLE = YES; 1129 1165 HEADER_SEARCH_PATHS = source/Lib; 1130 SDKROOT = macosx10.8;1166 SDKROOT = ""; 1131 1167 }; 1132 1168 name = Release; … … 1143 1179 INSTALL_PATH = /usr/local/lib; 1144 1180 PRODUCT_NAME = TLibCommon; 1181 SDKROOT = ""; 1145 1182 }; 1146 1183 name = Debug; … … 1156 1193 INSTALL_PATH = /usr/local/lib; 1157 1194 PRODUCT_NAME = TLibCommon; 1195 SDKROOT = ""; 1158 1196 ZERO_LINK = NO; 1159 1197 }; -
branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp
r1431 r1439 3024 3024 Int TComVPS::scalTypeToScalIdx( ScalabilityType scalType ) const 3025 3025 { 3026 assert( scalType >= 0 &&scalType <= MAX_VPS_NUM_SCALABILITY_TYPES );3027 assert( scalType == MAX_VPS_NUM_SCALABILITY_TYPES || getScalabilityMask( scalType ) );3026 assert( (Int)scalType >= 0 && (Int)scalType <= MAX_VPS_NUM_SCALABILITY_TYPES ); 3027 assert( (Int)scalType == MAX_VPS_NUM_SCALABILITY_TYPES || getScalabilityMask( scalType ) ); 3028 3028 Int scalIdx = 0; 3029 3029 for( Int curScalType = 0; curScalType < scalType; curScalType++ ) -
branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h
r1400 r1439 717 717 UInt m_treePartitionLayerIdList[MAX_LAYERS][MAX_LAYERS]; 718 718 719 Int m_TolsIdx;720 719 Bool m_subLayerFlagInfoPresentFlag [MAX_VPS_OP_LAYER_SETS_PLUS1]; 721 720 Bool m_subLayerDpbInfoPresentFlag [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS]; -
branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
r1433 r1439 3411 3411 else 3412 3412 { 3413 vps->setNumVideoSignalInfo(vps->getMaxLayers() - vps->getBaseLayerInternalFlag() ? 0 : 1);3413 vps->setNumVideoSignalInfo(vps->getMaxLayers() - (vps->getBaseLayerInternalFlag() ? 0 : 1)); 3414 3414 } 3415 3415 -
branches/SHM-dev/source/Lib/TLibDecoder/TDecSlice.h
r1287 r1439 69 69 TDecSbac m_entropyCodingSyncContextState; ///< context storate for state of contexts at the wavefront/WPP/entropy-coding-sync second CTU of tile-row 70 70 71 #if SVC_EXTENSION72 UInt* m_saoMaxOffsetQVal;73 #endif74 75 71 public: 76 72 TDecSlice(); -
branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h
r1348 r1439 143 143 Bool m_pocDecrementedInDPBFlag; 144 144 Int m_currPocMsb; 145 Bool m_prevPicHasEos;146 145 #endif //SVC_EXTENSION 147 146 protected:
Note: See TracChangeset for help on using the changeset viewer.
