![(please configure the [header_logo] section in trac.ini)](/repos/chrome/site/pj.jpg)
Changeset 2747 for pjproject/trunk
- Timestamp:
- Jun 4, 2009 6:48:49 PM (15 years ago)
- Location:
- pjproject/trunk/pjmedia
- Files:
-
- 2 added
- 4 edited
-
build/pjmedia.vcproj (modified) (114 diffs)
-
include/pjmedia/sync_port.h (added)
-
src/pjmedia/conference.c (modified) (8 diffs)
-
src/pjmedia/echo_common.c (modified) (10 diffs)
-
src/pjmedia/sound_port.c (modified) (24 diffs)
-
src/pjmedia/sync_port.c (added)
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjmedia/build/pjmedia.vcproj
r2664 r2747 35 35 <Configuration 36 36 Name="Release|Win32" 37 ConfigurationType="4" 37 38 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" 38 39 UseOfMFC="0" 39 40 ATLMinimizesCRunTimeLibraryUsage="false" 40 41 41 CharacterSet="2" 42 43 ConfigurationType="4"44 UseOfMFC="0"45 42 > 46 43 <Tool … … 61 58 <Tool 62 59 Name="VCCLCompilerTool" 60 AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;"$(DXSDK_DIR)include"" 63 61 PreprocessorDefinitions="_LIB;" 64 65 AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;"$(DXSDK_DIR)include""66 62 PrecompiledHeaderFile="" 67 63 /> … … 96 92 <Configuration 97 93 Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" 94 ConfigurationType="4" 98 95 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" 99 100 96 ATLMinimizesCRunTimeLibraryUsage="false" 101 102 97 CharacterSet="1" 103 104 ConfigurationType="4"105 98 > 106 99 <Tool … … 121 114 <Tool 122 115 Name="VCCLCompilerTool" 123 PreprocessorDefinitions="_LIB;"124 125 116 ExecutionBucket="7" 126 117 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 118 PreprocessorDefinitions="_LIB;" 127 119 PrecompiledHeaderFile="" 128 120 /> … … 139 131 Name="VCLibrarianTool" 140 132 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 141 142 133 /> 143 134 <Tool … … 167 158 <Configuration 168 159 Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" 160 ConfigurationType="4" 169 161 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" 170 171 162 ATLMinimizesCRunTimeLibraryUsage="false" 172 173 163 CharacterSet="1" 174 175 ConfigurationType="4"176 164 > 177 165 <Tool … … 192 180 <Tool 193 181 Name="VCCLCompilerTool" 194 PreprocessorDefinitions="_LIB;"195 196 182 ExecutionBucket="7" 197 183 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 184 PreprocessorDefinitions="_LIB;" 198 185 PrecompiledHeaderFile="" 199 186 /> … … 210 197 Name="VCLibrarianTool" 211 198 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 212 213 199 /> 214 200 <Tool … … 237 223 </Configuration> 238 224 <Configuration 239 Name=" Debug|Win32"240 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"241 225 Name="Release|Pocket PC 2003 (ARMV4)" 226 ConfigurationType="4" 227 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" 242 228 ATLMinimizesCRunTimeLibraryUsage="false" 243 244 CharacterSet="2" 245 246 ConfigurationType="4" 247 UseOfMFC="0" 229 CharacterSet="1" 248 230 > 249 231 <Tool … … 264 246 <Tool 265 247 Name="VCCLCompilerTool" 266 PreprocessorDefinitions="_LIB;"267 268 AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;"$(DXSDK_DIR)include""269 PrecompiledHeaderFile=""270 />271 <Tool272 Name="VCManagedResourceCompilerTool"273 />274 <Tool275 Name="VCResourceCompilerTool"276 />277 <Tool278 Name="VCPreLinkEventTool"279 />280 <Tool281 Name="VCLibrarianTool"282 />283 <Tool284 Name="VCALinkTool"285 />286 <Tool287 Name="VCXDCMakeTool"288 />289 <Tool290 Name="VCBscMakeTool"291 />292 <Tool293 Name="VCFxCopTool"294 />295 <Tool296 Name="VCPostBuildEventTool"297 />298 </Configuration>299 <Configuration300 Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"301 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"302 303 ATLMinimizesCRunTimeLibraryUsage="false"304 305 CharacterSet="1"306 307 ConfigurationType="4"308 >309 <Tool310 Name="VCPreBuildEventTool"311 />312 <Tool313 Name="VCCustomBuildTool"314 />315 <Tool316 Name="VCXMLDataGeneratorTool"317 />318 <Tool319 Name="VCWebServiceProxyGeneratorTool"320 />321 <Tool322 Name="VCMIDLTool"323 />324 <Tool325 Name="VCCLCompilerTool"326 PreprocessorDefinitions="_LIB;"327 328 248 ExecutionBucket="7" 329 249 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 250 PreprocessorDefinitions="_LIB;" 330 251 PrecompiledHeaderFile="" 331 252 /> … … 341 262 <Tool 342 263 Name="VCLibrarianTool" 343 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 344 264 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 345 265 /> 346 266 <Tool … … 369 289 </Configuration> 370 290 <Configuration 371 Name=" Debug|Windows Mobile 6 Professional SDK (ARMV4I)"372 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"373 291 Name="Release|Smartphone 2003 (ARMV4)" 292 ConfigurationType="4" 293 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" 374 294 ATLMinimizesCRunTimeLibraryUsage="false" 375 376 295 CharacterSet="1" 377 378 ConfigurationType="4"379 296 > 380 297 <Tool … … 395 312 <Tool 396 313 Name="VCCLCompilerTool" 397 PreprocessorDefinitions="_LIB;"398 399 314 ExecutionBucket="7" 400 315 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 316 PreprocessorDefinitions="_LIB;" 401 317 PrecompiledHeaderFile="" 402 318 /> … … 412 328 <Tool 413 329 Name="VCLibrarianTool" 414 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 415 330 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 416 331 /> 417 332 <Tool … … 440 355 </Configuration> 441 356 <Configuration 442 Name=" Debug-Static|Win32"443 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"444 357 Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 358 ConfigurationType="4" 359 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 445 360 ATLMinimizesCRunTimeLibraryUsage="false" 446 447 CharacterSet="2" 448 449 ConfigurationType="4" 450 UseOfMFC="0" 361 CharacterSet="1" 451 362 > 452 363 <Tool … … 467 378 <Tool 468 379 Name="VCCLCompilerTool" 469 PreprocessorDefinitions="_LIB;"470 471 AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;"$(DXSDK_DIR)include""472 PrecompiledHeaderFile=""473 />474 <Tool475 Name="VCManagedResourceCompilerTool"476 />477 <Tool478 Name="VCResourceCompilerTool"479 />480 <Tool481 Name="VCPreLinkEventTool"482 />483 <Tool484 Name="VCLibrarianTool"485 />486 <Tool487 Name="VCALinkTool"488 />489 <Tool490 Name="VCXDCMakeTool"491 />492 <Tool493 Name="VCBscMakeTool"494 />495 <Tool496 Name="VCFxCopTool"497 />498 <Tool499 Name="VCPostBuildEventTool"500 />501 </Configuration>502 <Configuration503 Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"504 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"505 506 ATLMinimizesCRunTimeLibraryUsage="false"507 508 CharacterSet="1"509 510 ConfigurationType="4"511 >512 <Tool513 Name="VCPreBuildEventTool"514 />515 <Tool516 Name="VCCustomBuildTool"517 />518 <Tool519 Name="VCXMLDataGeneratorTool"520 />521 <Tool522 Name="VCWebServiceProxyGeneratorTool"523 />524 <Tool525 Name="VCMIDLTool"526 />527 <Tool528 Name="VCCLCompilerTool"529 PreprocessorDefinitions="_LIB;"530 531 380 ExecutionBucket="7" 532 381 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 382 PreprocessorDefinitions="_LIB;" 533 383 PrecompiledHeaderFile="" 534 384 /> … … 544 394 <Tool 545 395 Name="VCLibrarianTool" 546 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 547 396 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 548 397 /> 549 398 <Tool … … 572 421 </Configuration> 573 422 <Configuration 574 Name=" Debug-Static|Windows Mobile 6 ProfessionalSDK (ARMV4I)"575 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"576 423 Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 424 ConfigurationType="4" 425 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 577 426 ATLMinimizesCRunTimeLibraryUsage="false" 578 579 427 CharacterSet="1" 580 581 ConfigurationType="4"582 428 > 583 429 <Tool … … 598 444 <Tool 599 445 Name="VCCLCompilerTool" 600 PreprocessorDefinitions="_LIB;"601 602 446 ExecutionBucket="7" 603 447 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 448 PreprocessorDefinitions="_LIB;" 604 449 PrecompiledHeaderFile="" 605 450 /> … … 615 460 <Tool 616 461 Name="VCLibrarianTool" 617 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 618 462 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 619 463 /> 620 464 <Tool … … 643 487 </Configuration> 644 488 <Configuration 645 Name="Release-Dynamic|Win32" 646 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" 647 489 Name="Debug|Win32" 490 ConfigurationType="4" 491 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops" 492 UseOfMFC="0" 648 493 ATLMinimizesCRunTimeLibraryUsage="false" 649 650 494 CharacterSet="2" 651 652 ConfigurationType="4"653 UseOfMFC="0"654 495 > 655 496 <Tool … … 670 511 <Tool 671 512 Name="VCCLCompilerTool" 513 AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;"$(DXSDK_DIR)include"" 672 514 PreprocessorDefinitions="_LIB;" 673 674 AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;"$(DXSDK_DIR)include""675 515 PrecompiledHeaderFile="" 676 516 /> … … 704 544 </Configuration> 705 545 <Configuration 706 Name=" Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"707 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"708 546 Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" 547 ConfigurationType="4" 548 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" 709 549 ATLMinimizesCRunTimeLibraryUsage="false" 710 711 550 CharacterSet="1" 712 713 ConfigurationType="4"714 551 > 715 552 <Tool … … 730 567 <Tool 731 568 Name="VCCLCompilerTool" 732 PreprocessorDefinitions="_LIB;"733 734 569 ExecutionBucket="7" 735 570 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 571 PreprocessorDefinitions="_LIB;" 736 572 PrecompiledHeaderFile="" 737 573 /> … … 748 584 Name="VCLibrarianTool" 749 585 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 750 751 586 /> 752 587 <Tool … … 775 610 </Configuration> 776 611 <Configuration 777 Name=" Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"778 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"779 612 Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" 613 ConfigurationType="4" 614 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" 780 615 ATLMinimizesCRunTimeLibraryUsage="false" 781 782 616 CharacterSet="1" 783 784 ConfigurationType="4"785 617 > 786 618 <Tool … … 801 633 <Tool 802 634 Name="VCCLCompilerTool" 803 PreprocessorDefinitions="_LIB;"804 805 635 ExecutionBucket="7" 806 636 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 637 PreprocessorDefinitions="_LIB;" 807 638 PrecompiledHeaderFile="" 808 639 /> … … 819 650 Name="VCLibrarianTool" 820 651 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 821 822 652 /> 823 653 <Tool … … 846 676 </Configuration> 847 677 <Configuration 848 Name="Debug -Dynamic|Win32"849 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"850 678 Name="Debug|Pocket PC 2003 (ARMV4)" 679 ConfigurationType="4" 680 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" 851 681 ATLMinimizesCRunTimeLibraryUsage="false" 852 853 CharacterSet="2" 854 855 ConfigurationType="4" 856 UseOfMFC="0" 682 CharacterSet="1" 857 683 > 858 684 <Tool … … 873 699 <Tool 874 700 Name="VCCLCompilerTool" 875 PreprocessorDefinitions="_LIB;"876 877 AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;"$(DXSDK_DIR)include""878 PrecompiledHeaderFile=""879 />880 <Tool881 Name="VCManagedResourceCompilerTool"882 />883 <Tool884 Name="VCResourceCompilerTool"885 />886 <Tool887 Name="VCPreLinkEventTool"888 />889 <Tool890 Name="VCLibrarianTool"891 />892 <Tool893 Name="VCALinkTool"894 />895 <Tool896 Name="VCXDCMakeTool"897 />898 <Tool899 Name="VCBscMakeTool"900 />901 <Tool902 Name="VCFxCopTool"903 />904 <Tool905 Name="VCPostBuildEventTool"906 />907 </Configuration>908 <Configuration909 Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"910 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"911 912 ATLMinimizesCRunTimeLibraryUsage="false"913 914 CharacterSet="1"915 916 ConfigurationType="4"917 >918 <Tool919 Name="VCPreBuildEventTool"920 />921 <Tool922 Name="VCCustomBuildTool"923 />924 <Tool925 Name="VCXMLDataGeneratorTool"926 />927 <Tool928 Name="VCWebServiceProxyGeneratorTool"929 />930 <Tool931 Name="VCMIDLTool"932 />933 <Tool934 Name="VCCLCompilerTool"935 PreprocessorDefinitions="_LIB;"936 937 701 ExecutionBucket="7" 938 702 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 703 PreprocessorDefinitions="_LIB;" 939 704 PrecompiledHeaderFile="" 940 705 /> … … 950 715 <Tool 951 716 Name="VCLibrarianTool" 952 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 953 717 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 954 718 /> 955 719 <Tool … … 978 742 </Configuration> 979 743 <Configuration 980 Name="Debug -Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"981 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"982 744 Name="Debug|Smartphone 2003 (ARMV4)" 745 ConfigurationType="4" 746 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" 983 747 ATLMinimizesCRunTimeLibraryUsage="false" 984 985 748 CharacterSet="1" 986 987 ConfigurationType="4"988 749 > 989 750 <Tool … … 1004 765 <Tool 1005 766 Name="VCCLCompilerTool" 1006 PreprocessorDefinitions="_LIB;"1007 1008 767 ExecutionBucket="7" 1009 768 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 769 PreprocessorDefinitions="_LIB;" 1010 770 PrecompiledHeaderFile="" 1011 771 /> … … 1021 781 <Tool 1022 782 Name="VCLibrarianTool" 1023 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 1024 783 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 1025 784 /> 1026 785 <Tool … … 1049 808 </Configuration> 1050 809 <Configuration 1051 Name=" Release-Static|Win32"1052 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"1053 810 Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 811 ConfigurationType="4" 812 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 1054 813 ATLMinimizesCRunTimeLibraryUsage="false" 1055 1056 CharacterSet="2" 1057 1058 ConfigurationType="4" 1059 UseOfMFC="0" 814 CharacterSet="1" 1060 815 > 1061 816 <Tool … … 1076 831 <Tool 1077 832 Name="VCCLCompilerTool" 1078 PreprocessorDefinitions="_LIB;"1079 1080 AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;"$(DXSDK_DIR)include""1081 PrecompiledHeaderFile=""1082 />1083 <Tool1084 Name="VCManagedResourceCompilerTool"1085 />1086 <Tool1087 Name="VCResourceCompilerTool"1088 />1089 <Tool1090 Name="VCPreLinkEventTool"1091 />1092 <Tool1093 Name="VCLibrarianTool"1094 />1095 <Tool1096 Name="VCALinkTool"1097 />1098 <Tool1099 Name="VCXDCMakeTool"1100 />1101 <Tool1102 Name="VCBscMakeTool"1103 />1104 <Tool1105 Name="VCFxCopTool"1106 />1107 <Tool1108 Name="VCPostBuildEventTool"1109 />1110 </Configuration>1111 <Configuration1112 Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"1113 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"1114 1115 ATLMinimizesCRunTimeLibraryUsage="false"1116 1117 CharacterSet="1"1118 1119 ConfigurationType="4"1120 >1121 <Tool1122 Name="VCPreBuildEventTool"1123 />1124 <Tool1125 Name="VCCustomBuildTool"1126 />1127 <Tool1128 Name="VCXMLDataGeneratorTool"1129 />1130 <Tool1131 Name="VCWebServiceProxyGeneratorTool"1132 />1133 <Tool1134 Name="VCMIDLTool"1135 />1136 <Tool1137 Name="VCCLCompilerTool"1138 PreprocessorDefinitions="_LIB;"1139 1140 833 ExecutionBucket="7" 1141 834 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 835 PreprocessorDefinitions="_LIB;" 1142 836 PrecompiledHeaderFile="" 1143 837 /> … … 1153 847 <Tool 1154 848 Name="VCLibrarianTool" 1155 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 1156 849 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 1157 850 /> 1158 851 <Tool … … 1181 874 </Configuration> 1182 875 <Configuration 1183 Name=" Release-Static|Windows Mobile 6 ProfessionalSDK (ARMV4I)"1184 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"1185 876 Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 877 ConfigurationType="4" 878 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 1186 879 ATLMinimizesCRunTimeLibraryUsage="false" 1187 1188 880 CharacterSet="1" 1189 1190 ConfigurationType="4"1191 881 > 1192 882 <Tool … … 1207 897 <Tool 1208 898 Name="VCCLCompilerTool" 1209 PreprocessorDefinitions="_LIB;"1210 1211 899 ExecutionBucket="7" 1212 900 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 901 PreprocessorDefinitions="_LIB;" 1213 902 PrecompiledHeaderFile="" 1214 903 /> … … 1224 913 <Tool 1225 914 Name="VCLibrarianTool" 1226 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 1227 915 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 1228 916 /> 1229 917 <Tool … … 1252 940 </Configuration> 1253 941 <Configuration 1254 Name="Release|Pocket PC 2003 (ARMV4)" 1255 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" 1256 942 Name="Debug-Static|Win32" 943 ConfigurationType="4" 944 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops" 945 UseOfMFC="0" 1257 946 ATLMinimizesCRunTimeLibraryUsage="false" 1258 947 CharacterSet="2" 948 > 949 <Tool 950 Name="VCPreBuildEventTool" 951 /> 952 <Tool 953 Name="VCCustomBuildTool" 954 /> 955 <Tool 956 Name="VCXMLDataGeneratorTool" 957 /> 958 <Tool 959 Name="VCWebServiceProxyGeneratorTool" 960 /> 961 <Tool 962 Name="VCMIDLTool" 963 /> 964 <Tool 965 Name="VCCLCompilerTool" 966 AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;"$(DXSDK_DIR)include"" 967 PreprocessorDefinitions="_LIB;" 968 PrecompiledHeaderFile="" 969 /> 970 <Tool 971 Name="VCManagedResourceCompilerTool" 972 /> 973 <Tool 974 Name="VCResourceCompilerTool" 975 /> 976 <Tool 977 Name="VCPreLinkEventTool" 978 /> 979 <Tool 980 Name="VCLibrarianTool" 981 /> 982 <Tool 983 Name="VCALinkTool" 984 /> 985 <Tool 986 Name="VCXDCMakeTool" 987 /> 988 <Tool 989 Name="VCBscMakeTool" 990 /> 991 <Tool 992 Name="VCFxCopTool" 993 /> 994 <Tool 995 Name="VCPostBuildEventTool" 996 /> 997 </Configuration> 998 <Configuration 999 Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)" 1000 ConfigurationType="4" 1001 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" 1002 ATLMinimizesCRunTimeLibraryUsage="false" 1259 1003 CharacterSet="1" 1260 1261 ConfigurationType="4"1262 1004 > 1263 1005 <Tool … … 1278 1020 <Tool 1279 1021 Name="VCCLCompilerTool" 1280 PreprocessorDefinitions="_LIB;"1281 1282 1022 ExecutionBucket="7" 1283 1023 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1024 PreprocessorDefinitions="_LIB;" 1284 1025 PrecompiledHeaderFile="" 1285 1026 /> … … 1295 1036 <Tool 1296 1037 Name="VCLibrarianTool" 1297 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1298 1038 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 1299 1039 /> 1300 1040 <Tool … … 1323 1063 </Configuration> 1324 1064 <Configuration 1325 Name="Debug |Pocket PC 2003 (ARMV4)"1326 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"1327 1065 Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)" 1066 ConfigurationType="4" 1067 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" 1328 1068 ATLMinimizesCRunTimeLibraryUsage="false" 1329 1330 1069 CharacterSet="1" 1331 1332 ConfigurationType="4"1333 1070 > 1334 1071 <Tool … … 1349 1086 <Tool 1350 1087 Name="VCCLCompilerTool" 1351 PreprocessorDefinitions="_LIB;"1352 1353 1088 ExecutionBucket="7" 1354 1089 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1090 PreprocessorDefinitions="_LIB;" 1355 1091 PrecompiledHeaderFile="" 1356 1092 /> … … 1366 1102 <Tool 1367 1103 Name="VCLibrarianTool" 1368 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1369 1104 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 1370 1105 /> 1371 1106 <Tool … … 1395 1130 <Configuration 1396 1131 Name="Debug-Static|Pocket PC 2003 (ARMV4)" 1132 ConfigurationType="4" 1397 1133 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" 1398 1399 1134 ATLMinimizesCRunTimeLibraryUsage="false" 1400 1401 1135 CharacterSet="1" 1402 1403 ConfigurationType="4"1404 1136 > 1405 1137 <Tool … … 1420 1152 <Tool 1421 1153 Name="VCCLCompilerTool" 1422 PreprocessorDefinitions="_LIB;"1423 1424 1154 ExecutionBucket="7" 1425 1155 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1156 PreprocessorDefinitions="_LIB;" 1426 1157 PrecompiledHeaderFile="" 1427 1158 /> … … 1438 1169 Name="VCLibrarianTool" 1439 1170 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1440 1441 1171 /> 1442 1172 <Tool … … 1465 1195 </Configuration> 1466 1196 <Configuration 1467 Name=" Release-Dynamic|Pocket PC2003 (ARMV4)"1468 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"1469 1197 Name="Debug-Static|Smartphone 2003 (ARMV4)" 1198 ConfigurationType="4" 1199 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" 1470 1200 ATLMinimizesCRunTimeLibraryUsage="false" 1471 1472 1201 CharacterSet="1" 1473 1474 ConfigurationType="4"1475 1202 > 1476 1203 <Tool … … 1491 1218 <Tool 1492 1219 Name="VCCLCompilerTool" 1493 PreprocessorDefinitions="_LIB;"1494 1495 1220 ExecutionBucket="7" 1496 1221 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1222 PreprocessorDefinitions="_LIB;" 1497 1223 PrecompiledHeaderFile="" 1498 1224 /> … … 1508 1234 <Tool 1509 1235 Name="VCLibrarianTool" 1510 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1511 1236 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 1512 1237 /> 1513 1238 <Tool … … 1536 1261 </Configuration> 1537 1262 <Configuration 1538 Name="Debug- Dynamic|Pocket PC 2003 (ARMV4)"1539 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"1540 1263 Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 1264 ConfigurationType="4" 1265 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 1541 1266 ATLMinimizesCRunTimeLibraryUsage="false" 1542 1543 1267 CharacterSet="1" 1544 1545 ConfigurationType="4"1546 1268 > 1547 1269 <Tool … … 1562 1284 <Tool 1563 1285 Name="VCCLCompilerTool" 1564 PreprocessorDefinitions="_LIB;"1565 1566 1286 ExecutionBucket="7" 1567 1287 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1288 PreprocessorDefinitions="_LIB;" 1568 1289 PrecompiledHeaderFile="" 1569 1290 /> … … 1579 1300 <Tool 1580 1301 Name="VCLibrarianTool" 1581 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1582 1302 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 1583 1303 /> 1584 1304 <Tool … … 1607 1327 </Configuration> 1608 1328 <Configuration 1609 Name=" Release-Static|Pocket PC 2003 (ARMV4)"1610 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"1611 1329 Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 1330 ConfigurationType="4" 1331 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 1612 1332 ATLMinimizesCRunTimeLibraryUsage="false" 1613 1614 1333 CharacterSet="1" 1615 1616 ConfigurationType="4"1617 1334 > 1618 1335 <Tool … … 1633 1350 <Tool 1634 1351 Name="VCCLCompilerTool" 1635 PreprocessorDefinitions="_LIB;"1636 1637 1352 ExecutionBucket="7" 1638 1353 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1354 PreprocessorDefinitions="_LIB;" 1639 1355 PrecompiledHeaderFile="" 1640 1356 /> … … 1650 1366 <Tool 1651 1367 Name="VCLibrarianTool" 1652 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1653 1368 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 1654 1369 /> 1655 1370 <Tool … … 1678 1393 </Configuration> 1679 1394 <Configuration 1680 Name="Release|Smartphone 2003 (ARMV4)" 1681 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" 1682 1395 Name="Release-Dynamic|Win32" 1396 ConfigurationType="4" 1397 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" 1398 UseOfMFC="0" 1683 1399 ATLMinimizesCRunTimeLibraryUsage="false" 1684 1400 CharacterSet="2" 1401 > 1402 <Tool 1403 Name="VCPreBuildEventTool" 1404 /> 1405 <Tool 1406 Name="VCCustomBuildTool" 1407 /> 1408 <Tool 1409 Name="VCXMLDataGeneratorTool" 1410 /> 1411 <Tool 1412 Name="VCWebServiceProxyGeneratorTool" 1413 /> 1414 <Tool 1415 Name="VCMIDLTool" 1416 /> 1417 <Tool 1418 Name="VCCLCompilerTool" 1419 AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;"$(DXSDK_DIR)include"" 1420 PreprocessorDefinitions="_LIB;" 1421 PrecompiledHeaderFile="" 1422 /> 1423 <Tool 1424 Name="VCManagedResourceCompilerTool" 1425 /> 1426 <Tool 1427 Name="VCResourceCompilerTool" 1428 /> 1429 <Tool 1430 Name="VCPreLinkEventTool" 1431 /> 1432 <Tool 1433 Name="VCLibrarianTool" 1434 /> 1435 <Tool 1436 Name="VCALinkTool" 1437 /> 1438 <Tool 1439 Name="VCXDCMakeTool" 1440 /> 1441 <Tool 1442 Name="VCBscMakeTool" 1443 /> 1444 <Tool 1445 Name="VCFxCopTool" 1446 /> 1447 <Tool 1448 Name="VCPostBuildEventTool" 1449 /> 1450 </Configuration> 1451 <Configuration 1452 Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)" 1453 ConfigurationType="4" 1454 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" 1455 ATLMinimizesCRunTimeLibraryUsage="false" 1685 1456 CharacterSet="1" 1686 1687 ConfigurationType="4"1688 1457 > 1689 1458 <Tool … … 1704 1473 <Tool 1705 1474 Name="VCCLCompilerTool" 1706 PreprocessorDefinitions="_LIB;"1707 1708 1475 ExecutionBucket="7" 1709 1476 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1477 PreprocessorDefinitions="_LIB;" 1710 1478 PrecompiledHeaderFile="" 1711 1479 /> … … 1721 1489 <Tool 1722 1490 Name="VCLibrarianTool" 1723 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 1724 1491 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 1725 1492 /> 1726 1493 <Tool … … 1749 1516 </Configuration> 1750 1517 <Configuration 1751 Name=" Debug|Smartphone 2003 (ARMV4)"1752 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"1753 1518 Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)" 1519 ConfigurationType="4" 1520 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" 1754 1521 ATLMinimizesCRunTimeLibraryUsage="false" 1755 1756 1522 CharacterSet="1" 1757 1758 ConfigurationType="4"1759 1523 > 1760 1524 <Tool … … 1775 1539 <Tool 1776 1540 Name="VCCLCompilerTool" 1777 PreprocessorDefinitions="_LIB;"1778 1779 1541 ExecutionBucket="7" 1780 1542 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1543 PreprocessorDefinitions="_LIB;" 1781 1544 PrecompiledHeaderFile="" 1782 1545 /> … … 1792 1555 <Tool 1793 1556 Name="VCLibrarianTool" 1794 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 1795 1557 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 1796 1558 /> 1797 1559 <Tool … … 1820 1582 </Configuration> 1821 1583 <Configuration 1822 Name=" Debug-Static|Smartphone2003 (ARMV4)"1823 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"1824 1584 Name="Release-Dynamic|Pocket PC 2003 (ARMV4)" 1585 ConfigurationType="4" 1586 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" 1825 1587 ATLMinimizesCRunTimeLibraryUsage="false" 1826 1827 1588 CharacterSet="1" 1828 1829 ConfigurationType="4"1830 1589 > 1831 1590 <Tool … … 1846 1605 <Tool 1847 1606 Name="VCCLCompilerTool" 1848 PreprocessorDefinitions="_LIB;"1849 1850 1607 ExecutionBucket="7" 1851 1608 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1609 PreprocessorDefinitions="_LIB;" 1852 1610 PrecompiledHeaderFile="" 1853 1611 /> … … 1863 1621 <Tool 1864 1622 Name="VCLibrarianTool" 1865 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 1866 1623 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1867 1624 /> 1868 1625 <Tool … … 1892 1649 <Configuration 1893 1650 Name="Release-Dynamic|Smartphone 2003 (ARMV4)" 1651 ConfigurationType="4" 1894 1652 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" 1895 1896 1653 ATLMinimizesCRunTimeLibraryUsage="false" 1897 1898 1654 CharacterSet="1" 1899 1900 ConfigurationType="4"1901 1655 > 1902 1656 <Tool … … 1917 1671 <Tool 1918 1672 Name="VCCLCompilerTool" 1919 PreprocessorDefinitions="_LIB;"1920 1921 1673 ExecutionBucket="7" 1922 1674 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1675 PreprocessorDefinitions="_LIB;" 1923 1676 PrecompiledHeaderFile="" 1924 1677 /> … … 1935 1688 Name="VCLibrarianTool" 1936 1689 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 1937 1938 1690 /> 1939 1691 <Tool … … 1962 1714 </Configuration> 1963 1715 <Configuration 1964 Name=" Debug-Dynamic|Smartphone 2003 (ARMV4)"1965 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"1966 1716 Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 1717 ConfigurationType="4" 1718 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 1967 1719 ATLMinimizesCRunTimeLibraryUsage="false" 1968 1969 1720 CharacterSet="1" 1970 1971 ConfigurationType="4"1972 1721 > 1973 1722 <Tool … … 1988 1737 <Tool 1989 1738 Name="VCCLCompilerTool" 1990 PreprocessorDefinitions="_LIB;"1991 1992 1739 ExecutionBucket="7" 1993 1740 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1741 PreprocessorDefinitions="_LIB;" 1994 1742 PrecompiledHeaderFile="" 1995 1743 /> … … 2005 1753 <Tool 2006 1754 Name="VCLibrarianTool" 2007 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 2008 1755 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2009 1756 /> 2010 1757 <Tool … … 2033 1780 </Configuration> 2034 1781 <Configuration 2035 Name="Release- Static|Smartphone 2003 (ARMV4)"2036 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"2037 1782 Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 1783 ConfigurationType="4" 1784 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 2038 1785 ATLMinimizesCRunTimeLibraryUsage="false" 2039 2040 1786 CharacterSet="1" 2041 2042 ConfigurationType="4"2043 1787 > 2044 1788 <Tool … … 2059 1803 <Tool 2060 1804 Name="VCCLCompilerTool" 2061 PreprocessorDefinitions="_LIB;"2062 2063 1805 ExecutionBucket="7" 2064 1806 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1807 PreprocessorDefinitions="_LIB;" 2065 1808 PrecompiledHeaderFile="" 2066 1809 /> … … 2076 1819 <Tool 2077 1820 Name="VCLibrarianTool" 2078 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 2079 1821 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2080 1822 /> 2081 1823 <Tool … … 2104 1846 </Configuration> 2105 1847 <Configuration 2106 Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 2107 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 2108 1848 Name="Debug-Dynamic|Win32" 1849 ConfigurationType="4" 1850 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops" 1851 UseOfMFC="0" 2109 1852 ATLMinimizesCRunTimeLibraryUsage="false" 2110 1853 CharacterSet="2" 1854 > 1855 <Tool 1856 Name="VCPreBuildEventTool" 1857 /> 1858 <Tool 1859 Name="VCCustomBuildTool" 1860 /> 1861 <Tool 1862 Name="VCXMLDataGeneratorTool" 1863 /> 1864 <Tool 1865 Name="VCWebServiceProxyGeneratorTool" 1866 /> 1867 <Tool 1868 Name="VCMIDLTool" 1869 /> 1870 <Tool 1871 Name="VCCLCompilerTool" 1872 AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;"$(DXSDK_DIR)include"" 1873 PreprocessorDefinitions="_LIB;" 1874 PrecompiledHeaderFile="" 1875 /> 1876 <Tool 1877 Name="VCManagedResourceCompilerTool" 1878 /> 1879 <Tool 1880 Name="VCResourceCompilerTool" 1881 /> 1882 <Tool 1883 Name="VCPreLinkEventTool" 1884 /> 1885 <Tool 1886 Name="VCLibrarianTool" 1887 /> 1888 <Tool 1889 Name="VCALinkTool" 1890 /> 1891 <Tool 1892 Name="VCXDCMakeTool" 1893 /> 1894 <Tool 1895 Name="VCBscMakeTool" 1896 /> 1897 <Tool 1898 Name="VCFxCopTool" 1899 /> 1900 <Tool 1901 Name="VCPostBuildEventTool" 1902 /> 1903 </Configuration> 1904 <Configuration 1905 Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)" 1906 ConfigurationType="4" 1907 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" 1908 ATLMinimizesCRunTimeLibraryUsage="false" 2111 1909 CharacterSet="1" 2112 2113 ConfigurationType="4"2114 1910 > 2115 1911 <Tool … … 2130 1926 <Tool 2131 1927 Name="VCCLCompilerTool" 2132 PreprocessorDefinitions="_LIB;"2133 2134 1928 ExecutionBucket="7" 2135 1929 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1930 PreprocessorDefinitions="_LIB;" 2136 1931 PrecompiledHeaderFile="" 2137 1932 /> … … 2147 1942 <Tool 2148 1943 Name="VCLibrarianTool" 2149 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2150 1944 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 2151 1945 /> 2152 1946 <Tool … … 2175 1969 </Configuration> 2176 1970 <Configuration 2177 Name="Debug |Windows Mobile 5.0 Pocket PCSDK (ARMV4I)"2178 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"2179 1971 Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)" 1972 ConfigurationType="4" 1973 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" 2180 1974 ATLMinimizesCRunTimeLibraryUsage="false" 2181 2182 1975 CharacterSet="1" 2183 2184 ConfigurationType="4"2185 1976 > 2186 1977 <Tool … … 2201 1992 <Tool 2202 1993 Name="VCCLCompilerTool" 2203 PreprocessorDefinitions="_LIB;"2204 2205 1994 ExecutionBucket="7" 2206 1995 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 1996 PreprocessorDefinitions="_LIB;" 2207 1997 PrecompiledHeaderFile="" 2208 1998 /> … … 2218 2008 <Tool 2219 2009 Name="VCLibrarianTool" 2220 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2221 2010 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 2222 2011 /> 2223 2012 <Tool … … 2246 2035 </Configuration> 2247 2036 <Configuration 2248 Name="Debug- Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"2249 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"2250 2037 Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)" 2038 ConfigurationType="4" 2039 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" 2251 2040 ATLMinimizesCRunTimeLibraryUsage="false" 2252 2253 2041 CharacterSet="1" 2254 2255 ConfigurationType="4"2256 2042 > 2257 2043 <Tool … … 2272 2058 <Tool 2273 2059 Name="VCCLCompilerTool" 2274 PreprocessorDefinitions="_LIB;"2275 2276 2060 ExecutionBucket="7" 2277 2061 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 2062 PreprocessorDefinitions="_LIB;" 2278 2063 PrecompiledHeaderFile="" 2279 2064 /> … … 2289 2074 <Tool 2290 2075 Name="VCLibrarianTool" 2291 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2292 2076 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 2293 2077 /> 2294 2078 <Tool … … 2317 2101 </Configuration> 2318 2102 <Configuration 2319 Name=" Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"2320 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"2321 2103 Name="Debug-Dynamic|Smartphone 2003 (ARMV4)" 2104 ConfigurationType="4" 2105 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" 2322 2106 ATLMinimizesCRunTimeLibraryUsage="false" 2323 2324 2107 CharacterSet="1" 2325 2326 ConfigurationType="4"2327 2108 > 2328 2109 <Tool … … 2343 2124 <Tool 2344 2125 Name="VCCLCompilerTool" 2345 PreprocessorDefinitions="_LIB;"2346 2347 2126 ExecutionBucket="7" 2348 2127 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 2128 PreprocessorDefinitions="_LIB;" 2349 2129 PrecompiledHeaderFile="" 2350 2130 /> … … 2360 2140 <Tool 2361 2141 Name="VCLibrarianTool" 2362 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2363 2142 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 2364 2143 /> 2365 2144 <Tool … … 2389 2168 <Configuration 2390 2169 Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 2170 ConfigurationType="4" 2391 2171 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 2392 2393 2172 ATLMinimizesCRunTimeLibraryUsage="false" 2394 2395 2173 CharacterSet="1" 2396 2397 ConfigurationType="4"2398 2174 > 2399 2175 <Tool … … 2414 2190 <Tool 2415 2191 Name="VCCLCompilerTool" 2416 PreprocessorDefinitions="_LIB;"2417 2418 2192 ExecutionBucket="7" 2419 2193 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 2194 PreprocessorDefinitions="_LIB;" 2420 2195 PrecompiledHeaderFile="" 2421 2196 /> … … 2432 2207 Name="VCLibrarianTool" 2433 2208 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2434 2435 2209 /> 2436 2210 <Tool … … 2459 2233 </Configuration> 2460 2234 <Configuration 2461 Name=" Release-Static|Windows Mobile 5.0 Pocket PCSDK (ARMV4I)"2462 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"2463 2235 Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 2236 ConfigurationType="4" 2237 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 2464 2238 ATLMinimizesCRunTimeLibraryUsage="false" 2465 2466 2239 CharacterSet="1" 2467 2468 ConfigurationType="4"2469 2240 > 2470 2241 <Tool … … 2485 2256 <Tool 2486 2257 Name="VCCLCompilerTool" 2487 PreprocessorDefinitions="_LIB;"2488 2489 2258 ExecutionBucket="7" 2490 2259 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 2260 PreprocessorDefinitions="_LIB;" 2491 2261 PrecompiledHeaderFile="" 2492 2262 /> … … 2502 2272 <Tool 2503 2273 Name="VCLibrarianTool" 2504 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2505 2274 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2506 2275 /> 2507 2276 <Tool … … 2530 2299 </Configuration> 2531 2300 <Configuration 2532 Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 2533 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 2534 2301 Name="Release-Static|Win32" 2302 ConfigurationType="4" 2303 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" 2304 UseOfMFC="0" 2535 2305 ATLMinimizesCRunTimeLibraryUsage="false" 2536 2306 CharacterSet="2" 2307 > 2308 <Tool 2309 Name="VCPreBuildEventTool" 2310 /> 2311 <Tool 2312 Name="VCCustomBuildTool" 2313 /> 2314 <Tool 2315 Name="VCXMLDataGeneratorTool" 2316 /> 2317 <Tool 2318 Name="VCWebServiceProxyGeneratorTool" 2319 /> 2320 <Tool 2321 Name="VCMIDLTool" 2322 /> 2323 <Tool 2324 Name="VCCLCompilerTool" 2325 AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;"$(DXSDK_DIR)include"" 2326 PreprocessorDefinitions="_LIB;" 2327 PrecompiledHeaderFile="" 2328 /> 2329 <Tool 2330 Name="VCManagedResourceCompilerTool" 2331 /> 2332 <Tool 2333 Name="VCResourceCompilerTool" 2334 /> 2335 <Tool 2336 Name="VCPreLinkEventTool" 2337 /> 2338 <Tool 2339 Name="VCLibrarianTool" 2340 /> 2341 <Tool 2342 Name="VCALinkTool" 2343 /> 2344 <Tool 2345 Name="VCXDCMakeTool" 2346 /> 2347 <Tool 2348 Name="VCBscMakeTool" 2349 /> 2350 <Tool 2351 Name="VCFxCopTool" 2352 /> 2353 <Tool 2354 Name="VCPostBuildEventTool" 2355 /> 2356 </Configuration> 2357 <Configuration 2358 Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)" 2359 ConfigurationType="4" 2360 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" 2361 ATLMinimizesCRunTimeLibraryUsage="false" 2537 2362 CharacterSet="1" 2538 2539 ConfigurationType="4"2540 2363 > 2541 2364 <Tool … … 2556 2379 <Tool 2557 2380 Name="VCCLCompilerTool" 2558 PreprocessorDefinitions="_LIB;"2559 2560 2381 ExecutionBucket="7" 2561 2382 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 2383 PreprocessorDefinitions="_LIB;" 2562 2384 PrecompiledHeaderFile="" 2563 2385 /> … … 2573 2395 <Tool 2574 2396 Name="VCLibrarianTool" 2575 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2576 2397 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 2577 2398 /> 2578 2399 <Tool … … 2601 2422 </Configuration> 2602 2423 <Configuration 2603 Name=" Debug|Windows Mobile 5.0 SmartphoneSDK (ARMV4I)"2604 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"2605 2424 Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)" 2425 ConfigurationType="4" 2426 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" 2606 2427 ATLMinimizesCRunTimeLibraryUsage="false" 2607 2608 2428 CharacterSet="1" 2609 2610 ConfigurationType="4"2611 2429 > 2612 2430 <Tool … … 2627 2445 <Tool 2628 2446 Name="VCCLCompilerTool" 2629 PreprocessorDefinitions="_LIB;"2630 2631 2447 ExecutionBucket="7" 2632 2448 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 2449 PreprocessorDefinitions="_LIB;" 2633 2450 PrecompiledHeaderFile="" 2634 2451 /> … … 2644 2461 <Tool 2645 2462 Name="VCLibrarianTool" 2646 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2647 2463 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 2648 2464 /> 2649 2465 <Tool … … 2672 2488 </Configuration> 2673 2489 <Configuration 2674 Name=" Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"2675 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"2676 2490 Name="Release-Static|Pocket PC 2003 (ARMV4)" 2491 ConfigurationType="4" 2492 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" 2677 2493 ATLMinimizesCRunTimeLibraryUsage="false" 2678 2679 2494 CharacterSet="1" 2680 2681 ConfigurationType="4"2682 2495 > 2683 2496 <Tool … … 2698 2511 <Tool 2699 2512 Name="VCCLCompilerTool" 2700 PreprocessorDefinitions="_LIB;"2701 2702 2513 ExecutionBucket="7" 2703 2514 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 2515 PreprocessorDefinitions="_LIB;" 2704 2516 PrecompiledHeaderFile="" 2705 2517 /> … … 2715 2527 <Tool 2716 2528 Name="VCLibrarianTool" 2717 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2718 2529 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 2719 2530 /> 2720 2531 <Tool … … 2743 2554 </Configuration> 2744 2555 <Configuration 2745 Name="Release- Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"2746 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"2747 2556 Name="Release-Static|Smartphone 2003 (ARMV4)" 2557 ConfigurationType="4" 2558 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" 2748 2559 ATLMinimizesCRunTimeLibraryUsage="false" 2749 2750 2560 CharacterSet="1" 2751 2752 ConfigurationType="4"2753 2561 > 2754 2562 <Tool … … 2769 2577 <Tool 2770 2578 Name="VCCLCompilerTool" 2771 PreprocessorDefinitions="_LIB;"2772 2773 2579 ExecutionBucket="7" 2774 2580 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 2581 PreprocessorDefinitions="_LIB;" 2775 2582 PrecompiledHeaderFile="" 2776 2583 /> … … 2786 2593 <Tool 2787 2594 Name="VCLibrarianTool" 2788 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2789 2595 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 2790 2596 /> 2791 2597 <Tool … … 2814 2620 </Configuration> 2815 2621 <Configuration 2816 Name=" Debug-Dynamic|Windows Mobile 5.0 SmartphoneSDK (ARMV4I)"2817 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"2818 2622 Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 2623 ConfigurationType="4" 2624 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 2819 2625 ATLMinimizesCRunTimeLibraryUsage="false" 2820 2821 2626 CharacterSet="1" 2822 2823 ConfigurationType="4"2824 2627 > 2825 2628 <Tool … … 2840 2643 <Tool 2841 2644 Name="VCCLCompilerTool" 2842 PreprocessorDefinitions="_LIB;"2843 2844 2645 ExecutionBucket="7" 2845 2646 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 2647 PreprocessorDefinitions="_LIB;" 2846 2648 PrecompiledHeaderFile="" 2847 2649 /> … … 2857 2659 <Tool 2858 2660 Name="VCLibrarianTool" 2859 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2860 2661 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2861 2662 /> 2862 2663 <Tool … … 2886 2687 <Configuration 2887 2688 Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 2689 ConfigurationType="4" 2888 2690 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 2889 2890 2691 ATLMinimizesCRunTimeLibraryUsage="false" 2891 2892 2692 CharacterSet="1" 2893 2894 ConfigurationType="4"2895 2693 > 2896 2694 <Tool … … 2911 2709 <Tool 2912 2710 Name="VCCLCompilerTool" 2913 PreprocessorDefinitions="_LIB;"2914 2915 2711 ExecutionBucket="7" 2916 2712 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.." 2713 PreprocessorDefinitions="_LIB;" 2917 2714 PrecompiledHeaderFile="" 2918 2715 /> … … 2929 2726 Name="VCLibrarianTool" 2930 2727 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2931 2932 2728 /> 2933 2729 <Tool … … 4794 4590 </File> 4795 4591 <File 4592 RelativePath="..\src\pjmedia\sync_port.c" 4593 > 4594 </File> 4595 <File 4796 4596 RelativePath="..\src\pjmedia\tonegen.c" 4797 4597 > … … 5303 5103 </File> 5304 5104 <File 5105 RelativePath="..\include\pjmedia\sync_port.h" 5106 > 5107 </File> 5108 <File 5305 5109 RelativePath="..\include\pjmedia\tonegen.h" 5306 5110 > -
pjproject/trunk/pjmedia/src/pjmedia/conference.c
r2728 r2747 237 237 unsigned samples_per_frame; /**< Samples per frame. */ 238 238 unsigned bits_per_sample; /**< Bits per sample. */ 239 pj_int16_t *master_port_buf; 239 240 }; 240 241 … … 458 459 459 460 460 status = create_ pasv_port(conf, pool, &name, NULL, &conf_port);461 status = create_conf_port(conf, pool, &name, NULL, &conf_port); 461 462 if (status != PJ_SUCCESS) 462 463 return status; … … 557 558 conf->master_port = PJ_POOL_ZALLOC_T(pool, pjmedia_port); 558 559 PJ_ASSERT_RETURN(conf->master_port, PJ_ENOMEM); 560 561 conf->master_port_buf = (pj_int16_t*) 562 pj_pool_zalloc(pool, conf->samples_per_frame<<1); 563 PJ_ASSERT_RETURN(conf->master_port_buf, PJ_ENOMEM); 559 564 560 565 pjmedia_port_info_init(&conf->master_port->info, &name, SIGNATURE, … … 1052 1057 1053 1058 /* if source port is passive port and has no listener, reset delaybuf */ 1054 if (src_port->delay_buf && src_port->listener_cnt == 0) 1055 pjmedia_delay_buf_reset(src_port->delay_buf); 1059 if (src_port->listener_cnt == 0) { 1060 if (src_port->delay_buf) 1061 pjmedia_delay_buf_reset(src_port->delay_buf); 1062 if (src_port->port == NULL) 1063 pjmedia_zero_samples(conf->master_port_buf, 1064 conf->samples_per_frame); 1065 } 1056 1066 } 1057 1067 … … 1842 1852 1843 1853 /* Get frame from this port. 1854 * For port 0 (master port), get the frame from master_port_buf. 1844 1855 * For passive ports, get the frame from the delay_buf. 1845 1856 * For other ports, get the frame from the port. 1846 1857 */ 1847 if (conf_port->delay_buf != NULL) { 1858 if (conf_port->port == NULL) { 1859 1860 pjmedia_copy_samples((pj_int16_t*)frame->buf, conf->master_port_buf, 1861 conf->samples_per_frame); 1862 1863 } else if (conf_port->delay_buf != NULL) { 1864 1848 1865 pj_status_t status; 1849 1866 … … 2055 2072 pjmedia_conf *conf = (pjmedia_conf*) this_port->port_data.pdata; 2056 2073 struct conf_port *port = conf->ports[this_port->port_data.ldata]; 2057 pj_status_t status;2058 2074 2059 2075 /* Check for correct size. */ … … 2062 2078 PJMEDIA_ENCSAMPLESPFRAME); 2063 2079 2064 /* Check existance of delay_buf instance */2065 PJ_ASSERT_RETURN( port->delay_buf, PJ_EBUG );2066 2067 2080 /* Skip if this port is muted/disabled. */ 2068 2081 if (port->rx_setting != PJMEDIA_PORT_ENABLE) { … … 2075 2088 } 2076 2089 2077 status = pjmedia_delay_buf_put(port->delay_buf, (pj_int16_t*)frame->buf); 2078 2079 return status; 2090 pjmedia_copy_samples(conf->master_port_buf, (pj_int16_t*)frame->buf, 2091 conf->samples_per_frame); 2092 2093 return PJ_SUCCESS; 2080 2094 } 2081 2095 -
pjproject/trunk/pjmedia/src/pjmedia/echo_common.c
r2728 r2747 20 20 21 21 #include <pjmedia/echo.h> 22 #include <pjmedia/delaybuf.h>23 22 #include <pjmedia/errno.h> 24 23 #include <pj/assert.h> … … 51 50 struct frame lat_buf; /* Frame queue for delayed playback */ 52 51 struct frame lat_free; /* Free frame list. */ 53 54 pjmedia_delay_buf *delay_buf;55 52 }; 56 53 … … 147 144 pjmedia_echo_state *ec; 148 145 pj_status_t status; 146 unsigned i; 149 147 150 148 /* Create new pool and instantiate and init the EC */ … … 192 190 /* Create latency buffers */ 193 191 ptime = samples_per_frame * 1000 / clock_rate; 194 if (latency_ms == 0) {195 /* Give at least one frame delay to simplify programming */ 192 /* Give at least one frame delay to simplify programming */ 193 if (latency_ms < ptime) { 196 194 latency_ms = ptime; 197 195 } 198 196 ec->lat_target_cnt = latency_ms / ptime; 199 if (ec->lat_target_cnt != 0) { 200 unsigned i; 201 for (i=0; i < ec->lat_target_cnt; ++i) { 202 struct frame *frm; 203 204 frm = (struct frame*) pj_pool_alloc(pool, (samples_per_frame<<1) + 205 sizeof(struct frame)); 206 pj_list_push_back(&ec->lat_free, frm); 207 } 208 } else { 209 ec->lat_ready = PJ_TRUE; 210 } 211 212 /* Create delay buffer to compensate drifts */ 213 status = pjmedia_delay_buf_create(ec->pool, ec->obj_name, clock_rate, 214 samples_per_frame, channel_count, 215 (PJMEDIA_SOUND_BUFFER_COUNT+1) * ptime, 216 0, &ec->delay_buf); 217 if (status != PJ_SUCCESS) { 218 pj_pool_release(pool); 219 return status; 197 for (i=0; i < ec->lat_target_cnt; ++i) { 198 struct frame *frm; 199 200 frm = (struct frame*) pj_pool_alloc(pool, (samples_per_frame<<1) + 201 sizeof(struct frame)); 202 pj_list_push_back(&ec->lat_free, frm); 220 203 } 221 204 … … 241 224 (*echo->op->ec_destroy)(echo->state); 242 225 243 if (echo->delay_buf) {244 pjmedia_delay_buf_destroy(echo->delay_buf);245 echo->delay_buf = NULL;246 }247 248 226 pj_pool_release(echo->pool); 249 227 return PJ_SUCCESS; … … 263 241 } 264 242 echo->lat_ready = PJ_FALSE; 265 pjmedia_delay_buf_reset(echo->delay_buf);266 243 echo->op->ec_reset(echo->state); 267 244 return PJ_SUCCESS; … … 275 252 pj_int16_t *play_frm ) 276 253 { 277 if (!echo->lat_ready) { 254 struct frame *frm; 255 256 if (echo->lat_ready) { 257 frm = echo->lat_buf.next; 258 pj_list_erase(frm); 259 } else { 278 260 /* We've not built enough latency in the buffer, so put this frame 279 261 * in the latency buffer list. 280 262 */ 281 struct frame *frm;282 263 frm = echo->lat_free.prev; 264 pj_list_erase(frm); 283 265 if (pj_list_empty(&echo->lat_free)) { 284 266 echo->lat_ready = PJ_TRUE; 285 267 PJ_LOG(5,(echo->obj_name, "Latency bufferring complete")); 286 pjmedia_delay_buf_put(echo->delay_buf, play_frm);287 return PJ_SUCCESS;288 268 } 289 290 frm = echo->lat_free.prev; 291 pj_list_erase(frm); 292 293 pjmedia_copy_samples(frm->buf, play_frm, echo->samples_per_frame); 294 pj_list_push_back(&echo->lat_buf, frm); 295 296 } else { 297 /* Latency buffer is ready (full), so we put this frame in the 298 * delay buffer. 299 */ 300 pjmedia_delay_buf_put(echo->delay_buf, play_frm); 301 } 269 } 270 271 /* Put the incoming frame into the end of latency buffer */ 272 pjmedia_copy_samples(frm->buf, play_frm, echo->samples_per_frame); 273 pj_list_push_back(&echo->lat_buf, frm); 302 274 303 275 return PJ_SUCCESS; … … 314 286 { 315 287 struct frame *oldest_frm; 316 pj_status_t status , rc;288 pj_status_t status; 317 289 318 290 if (!echo->lat_ready) { … … 324 296 /* Retrieve oldest frame from the latency buffer */ 325 297 oldest_frm = echo->lat_buf.next; 326 pj_list_erase(oldest_frm);327 298 328 299 /* Cancel echo using this reference frame */ … … 330 301 options, NULL); 331 302 332 /* Move one frame from delay buffer to the latency buffer. */333 rc = pjmedia_delay_buf_get(echo->delay_buf, oldest_frm->buf);334 if (rc != PJ_SUCCESS) {335 /* Ooops.. no frame! */336 PJ_LOG(5,(echo->obj_name,337 "No frame from delay buffer. This will upset EC later"));338 pjmedia_zero_samples(oldest_frm->buf, echo->samples_per_frame);339 }340 pj_list_push_back(&echo->lat_buf, oldest_frm);341 342 303 return status; 343 304 } -
pjproject/trunk/pjmedia/src/pjmedia/sound_port.c
r2685 r2747 20 20 #include <pjmedia/sound_port.h> 21 21 #include <pjmedia/alaw_ulaw.h> 22 #include <pjmedia/delaybuf.h> 23 #include <pjmedia/echo.h> 22 #include <pjmedia/echo_port.h> 24 23 #include <pjmedia/errno.h> 24 #include <pjmedia/sync_port.h> 25 25 #include <pj/assert.h> 26 26 #include <pj/log.h> … … 29 29 30 30 #define AEC_TAIL 128 /* default AEC length in ms */ 31 #define AEC_SUSPEND_LIMIT 5 /* seconds of no activity */32 31 33 32 #define THIS_FILE "sound_port.c" 34 33 35 //#define TEST_OVERFLOW_UNDERFLOW36 37 34 struct pjmedia_snd_port 38 35 { 36 pj_pool_t *pool; 39 37 int rec_id; 40 38 int play_id; … … 44 42 pjmedia_dir dir; 45 43 pjmedia_port *port; 44 pjmedia_port *dn_port; 45 pjmedia_port *sync_port; 46 46 47 47 unsigned clock_rate; … … 51 51 52 52 /* software ec */ 53 pjmedia_ echo_state *ec_state;53 pjmedia_port *echo_port; 54 54 unsigned ec_options; 55 55 unsigned ec_tail_len; 56 pj_bool_t ec_suspended;57 unsigned ec_suspend_count;58 unsigned ec_suspend_limit;59 56 }; 60 57 … … 70 67 pj_status_t status; 71 68 72 port = snd_port-> port;69 port = snd_port->dn_port; 73 70 if (port == NULL) 74 71 goto no_frame; … … 83 80 /* Must supply the required samples */ 84 81 pj_assert(frame->size == required_size); 85 86 if (snd_port->ec_state) {87 if (snd_port->ec_suspended) {88 snd_port->ec_suspended = PJ_FALSE;89 //pjmedia_echo_state_reset(snd_port->ec_state);90 PJ_LOG(4,(THIS_FILE, "EC activated"));91 }92 snd_port->ec_suspend_count = 0;93 pjmedia_echo_playback(snd_port->ec_state, (pj_int16_t*)frame->buf);94 }95 82 96 83 … … 102 89 pj_bzero(frame->buf, frame->size); 103 90 104 if (snd_port->ec_state && !snd_port->ec_suspended) {105 ++snd_port->ec_suspend_count;106 if (snd_port->ec_suspend_count > snd_port->ec_suspend_limit) {107 snd_port->ec_suspended = PJ_TRUE;108 PJ_LOG(4,(THIS_FILE, "EC suspended because of inactivity"));109 }110 if (snd_port->ec_state) {111 /* To maintain correct delay in EC */112 pjmedia_echo_playback(snd_port->ec_state, (pj_int16_t*)frame->buf);113 }114 }115 116 91 return PJ_SUCCESS; 117 92 } … … 123 98 */ 124 99 static pj_status_t rec_cb(void *user_data, pjmedia_frame *frame) 100 { 101 pjmedia_snd_port *snd_port = (pjmedia_snd_port*) user_data; 102 pjmedia_port *port; 103 104 port = snd_port->dn_port; 105 if (port == NULL) 106 return PJ_SUCCESS; 107 108 pjmedia_port_put_frame(port, frame); 109 110 return PJ_SUCCESS; 111 } 112 113 /* 114 * The callback called by sound player when it needs more samples to be 115 * played. This version is for non-PCM data. 116 */ 117 static pj_status_t play_cb_ext(void *user_data, pjmedia_frame *frame) 118 { 119 pjmedia_snd_port *snd_port = (pjmedia_snd_port*) user_data; 120 pjmedia_port *port = snd_port->port; 121 122 if (port == NULL) { 123 frame->type = PJMEDIA_FRAME_TYPE_NONE; 124 return PJ_SUCCESS; 125 } 126 127 pjmedia_port_get_frame(port, frame); 128 129 return PJ_SUCCESS; 130 } 131 132 133 /* 134 * The callback called by sound recorder when it has finished capturing a 135 * frame. This version is for non-PCM data. 136 */ 137 static pj_status_t rec_cb_ext(void *user_data, pjmedia_frame *frame) 125 138 { 126 139 pjmedia_snd_port *snd_port = (pjmedia_snd_port*) user_data; … … 131 144 return PJ_SUCCESS; 132 145 133 /* Cancel echo */134 if (snd_port->ec_state && !snd_port->ec_suspended) {135 pjmedia_echo_capture(snd_port->ec_state, (pj_int16_t*) frame->buf, 0);136 }137 138 pjmedia_port_put_frame(port, frame);139 140 return PJ_SUCCESS;141 }142 143 /*144 * The callback called by sound player when it needs more samples to be145 * played. This version is for non-PCM data.146 */147 static pj_status_t play_cb_ext(void *user_data, pjmedia_frame *frame)148 {149 pjmedia_snd_port *snd_port = (pjmedia_snd_port*) user_data;150 pjmedia_port *port = snd_port->port;151 152 if (port == NULL) {153 frame->type = PJMEDIA_FRAME_TYPE_NONE;154 return PJ_SUCCESS;155 }156 157 pjmedia_port_get_frame(port, frame);158 159 return PJ_SUCCESS;160 }161 162 163 /*164 * The callback called by sound recorder when it has finished capturing a165 * frame. This version is for non-PCM data.166 */167 static pj_status_t rec_cb_ext(void *user_data, pjmedia_frame *frame)168 {169 pjmedia_snd_port *snd_port = (pjmedia_snd_port*) user_data;170 pjmedia_port *port;171 172 port = snd_port->port;173 if (port == NULL)174 return PJ_SUCCESS;175 176 146 pjmedia_port_put_frame(port, frame); 177 147 … … 183 153 * This may be called even when the sound stream has already been started. 184 154 */ 185 static pj_status_t start_sound_device( pj_pool_t *pool, 186 pjmedia_snd_port *snd_port ) 155 static pj_status_t start_sound_device( pjmedia_snd_port *snd_port ) 187 156 { 188 157 pjmedia_aud_rec_cb snd_rec_cb; 189 158 pjmedia_aud_play_cb snd_play_cb; 190 pjmedia_aud_param param_copy;159 pjmedia_aud_param *param; 191 160 pj_status_t status; 192 161 … … 200 169 PJ_EBUG); 201 170 171 param = &snd_port->aud_param; 172 202 173 /* Get device caps */ 203 if ( snd_port->aud_param.dir & PJMEDIA_DIR_CAPTURE) {174 if (param->dir & PJMEDIA_DIR_CAPTURE) { 204 175 pjmedia_aud_dev_info dev_info; 205 176 206 status = pjmedia_aud_dev_get_info(snd_port->aud_param.rec_id, 207 &dev_info); 177 status = pjmedia_aud_dev_get_info(param->rec_id, &dev_info); 208 178 if (status != PJ_SUCCESS) 209 179 return status; … … 214 184 } 215 185 216 /* Process EC settings */217 pj_memcpy(¶m_copy, &snd_port->aud_param, sizeof(param_copy));218 if (param_copy.flags & PJMEDIA_AUD_DEV_CAP_EC) {219 /* EC is wanted */220 if (snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC) {221 /* Device supports EC */222 /* Nothing to do */223 } else {224 /* Device doesn't support EC, remove EC settings from225 * device parameters226 */227 param_copy.flags &= ~(PJMEDIA_AUD_DEV_CAP_EC |228 PJMEDIA_AUD_DEV_CAP_EC_TAIL);229 }230 }231 232 186 /* Use different callback if format is not PCM */ 233 if ( snd_port->aud_param.ext_fmt.id == PJMEDIA_FORMAT_L16) {187 if (param->ext_fmt.id == PJMEDIA_FORMAT_L16) { 234 188 snd_rec_cb = &rec_cb; 235 189 snd_play_cb = &play_cb; … … 240 194 241 195 /* Open the device */ 242 status = pjmedia_aud_stream_create( ¶m_copy,196 status = pjmedia_aud_stream_create(param, 243 197 snd_rec_cb, 244 198 snd_play_cb, … … 248 202 if (status != PJ_SUCCESS) 249 203 return status; 250 251 /* Inactivity limit before EC is suspended. */252 snd_port->ec_suspend_limit = AEC_SUSPEND_LIMIT *253 (snd_port->clock_rate /254 snd_port->samples_per_frame);255 256 /* Create software EC if parameter specifies EC but device257 * doesn't support EC. Only do this if the format is PCM!258 */259 if ((snd_port->aud_param.flags & PJMEDIA_AUD_DEV_CAP_EC) &&260 (snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC)==0 &&261 param_copy.ext_fmt.id == PJMEDIA_FORMAT_PCM)262 {263 if ((snd_port->aud_param.flags & PJMEDIA_AUD_DEV_CAP_EC_TAIL)==0) {264 snd_port->aud_param.flags |= PJMEDIA_AUD_DEV_CAP_EC_TAIL;265 snd_port->aud_param.ec_tail_ms = AEC_TAIL;266 PJ_LOG(4,(THIS_FILE, "AEC tail is set to default %u ms",267 snd_port->aud_param.ec_tail_ms));268 }269 270 status = pjmedia_snd_port_set_ec(snd_port, pool,271 snd_port->aud_param.ec_tail_ms, 0);272 if (status != PJ_SUCCESS) {273 pjmedia_aud_stream_destroy(snd_port->aud_stream);274 snd_port->aud_stream = NULL;275 return status;276 }277 }278 204 279 205 /* Start sound stream. */ … … 300 226 pjmedia_aud_stream_destroy(snd_port->aud_stream); 301 227 snd_port->aud_stream = NULL; 302 }303 304 /* Destroy AEC */305 if (snd_port->ec_state) {306 pjmedia_echo_destroy(snd_port->ec_state);307 snd_port->ec_state = NULL;308 228 } 309 229 … … 421 341 PJ_ASSERT_RETURN(pool && prm && p_port, PJ_EINVAL); 422 342 343 pool = pj_pool_create(pool->factory, pool->obj_name, 256, 256, NULL); 423 344 snd_port = PJ_POOL_ZALLOC_T(pool, pjmedia_snd_port); 424 345 PJ_ASSERT_RETURN(snd_port, PJ_ENOMEM); 425 346 347 snd_port->pool = pool; 426 348 snd_port->dir = prm->dir; 427 349 snd_port->rec_id = prm->rec_id; … … 438 360 * empty signal. 439 361 */ 440 status = start_sound_device( pool,snd_port );362 status = start_sound_device( snd_port ); 441 363 if (status != PJ_SUCCESS) { 442 364 pjmedia_snd_port_destroy(snd_port); … … 454 376 PJ_DEF(pj_status_t) pjmedia_snd_port_destroy(pjmedia_snd_port *snd_port) 455 377 { 378 pj_status_t status; 379 456 380 PJ_ASSERT_RETURN(snd_port, PJ_EINVAL); 457 381 458 return stop_sound_device(snd_port); 382 /* Stop sound port */ 383 status = stop_sound_device(snd_port); 384 385 /* Disconnect sound port */ 386 pjmedia_snd_port_disconnect(snd_port); 387 388 pj_pool_release(snd_port->pool); 389 390 return status; 459 391 } 460 392 … … 552 484 553 485 /* Destroy AEC */ 554 if (snd_port->ec _state) {555 pjmedia_ echo_destroy(snd_port->ec_state);556 snd_port->ec _state= NULL;486 if (snd_port->echo_port) { 487 pjmedia_port_destroy(snd_port->echo_port); 488 snd_port->echo_port = NULL; 557 489 } 558 490 … … 565 497 // snd_port->clock_rate; 566 498 delay_ms = prm.output_latency_ms; 567 status = pjmedia_echo_create2(pool, snd_port->clock_rate, 568 snd_port->channel_count, 569 snd_port->samples_per_frame, 570 tail_ms, delay_ms, 571 options, &snd_port->ec_state); 499 status = pjmedia_echo_port_create(pool, snd_port->port, 500 tail_ms, delay_ms, 501 options, &snd_port->echo_port); 572 502 if (status != PJ_SUCCESS) 573 snd_port->ec_state = NULL; 574 else 575 snd_port->ec_suspended = PJ_FALSE; 503 snd_port->echo_port = NULL; 576 504 } else { 577 505 PJ_LOG(4,(THIS_FILE, "Echo canceller is now disabled in the " … … 623 551 } else { 624 552 /* We use software EC */ 625 *p_length = snd_port->ec _state? snd_port->ec_tail_len : 0;553 *p_length = snd_port->echo_port ? snd_port->ec_tail_len : 0; 626 554 } 627 555 return PJ_SUCCESS; … … 636 564 { 637 565 pjmedia_port_info *pinfo; 566 pjmedia_aud_param *param; 567 pjmedia_sync_param sync_param; 568 pj_status_t status; 638 569 639 570 PJ_ASSERT_RETURN(snd_port && port, PJ_EINVAL); … … 657 588 /* Port is okay. */ 658 589 snd_port->port = port; 590 591 /* Create software EC if parameter specifies EC but device 592 * doesn't support EC. Only do this if the format is PCM! 593 */ 594 param = &snd_port->aud_param; 595 if ((param->flags & PJMEDIA_AUD_DEV_CAP_EC) && 596 (snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC)==0 && 597 param->ext_fmt.id == PJMEDIA_FORMAT_PCM) 598 { 599 if ((param->flags & PJMEDIA_AUD_DEV_CAP_EC_TAIL)==0) { 600 param->flags |= PJMEDIA_AUD_DEV_CAP_EC_TAIL; 601 param->ec_tail_ms = AEC_TAIL; 602 PJ_LOG(4,(THIS_FILE, "AEC tail is set to default %u ms", 603 param->ec_tail_ms)); 604 } 605 606 status = pjmedia_snd_port_set_ec(snd_port, snd_port->pool, 607 param->ec_tail_ms, 0); 608 if (status != PJ_SUCCESS) 609 return status; 610 } 611 612 /* Create sync port */ 613 pj_bzero(&sync_param, sizeof(sync_param)); 614 sync_param.options = PJMEDIA_SYNC_DONT_DESTROY_DN; 615 status = pjmedia_sync_port_create(snd_port->pool, 616 (snd_port->echo_port? 617 snd_port->echo_port:snd_port->port), 618 &sync_param, &snd_port->sync_port); 619 if (status != PJ_SUCCESS) 620 return status; 621 622 /* Update down port of sound port */ 623 snd_port->dn_port = snd_port->sync_port; 624 659 625 return PJ_SUCCESS; 660 626 } … … 679 645 680 646 snd_port->port = NULL; 681 682 return PJ_SUCCESS; 683 } 684 685 647 snd_port->dn_port = NULL; 648 649 /* Destroy sync port */ 650 if (snd_port->sync_port) { 651 pjmedia_port_destroy(snd_port->sync_port); 652 snd_port->sync_port = NULL; 653 } 654 655 /* Destroy EC port */ 656 if (snd_port->echo_port) { 657 pjmedia_port_destroy(snd_port->echo_port); 658 snd_port->echo_port = NULL; 659 snd_port->ec_tail_len = 0; 660 snd_port->ec_options = 0; 661 } 662 663 return PJ_SUCCESS; 664 } 665 666
Note: See TracChangeset
for help on using the changeset viewer.
