Changeset 2755
- Timestamp:
- Jun 7, 2009 4:49:42 PM (15 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 2 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/build.symbian/pjmedia.mmp
r2751 r2755 68 68 SOURCE stereo_port.c 69 69 SOURCE stream.c 70 SOURCE sync_port.c71 70 SOURCE tonegen.c 72 71 SOURCE transport_adapter_sample.c -
pjproject/trunk/pjmedia/build/Makefile
r2751 r2755 59 59 sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \ 60 60 sound_legacy.o sound_port.o stereo_port.o \ 61 stream.o sync_port.otonegen.o transport_adapter_sample.o \61 stream.o tonegen.o transport_adapter_sample.o \ 62 62 transport_ice.o transport_loop.o \ 63 63 transport_srtp.o transport_udp.o \ -
pjproject/trunk/pjmedia/build/pjmedia.dsp
r2751 r2755 250 250 # Begin Source File 251 251 252 SOURCE=..\src\pjmedia\sync_port.c253 # End Source File254 # Begin Source File255 256 252 SOURCE=..\src\pjmedia\tonegen.c 257 253 # End Source File … … 439 435 440 436 SOURCE=..\include\pjmedia\stream.h 441 # End Source File442 # Begin Source File443 444 SOURCE=..\include\pjmedia\sync_port.h445 437 # End Source File 446 438 # Begin Source File -
pjproject/trunk/pjmedia/build/pjmedia.vcproj
r2747 r2755 35 35 <Configuration 36 36 Name="Release|Win32" 37 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" 38 39 ATLMinimizesCRunTimeLibraryUsage="false" 40 41 CharacterSet="2" 42 37 43 ConfigurationType="4" 38 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"39 44 UseOfMFC="0" 40 ATLMinimizesCRunTimeLibraryUsage="false"41 CharacterSet="2"42 45 > 43 46 <Tool … … 58 61 <Tool 59 62 Name="VCCLCompilerTool" 63 PreprocessorDefinitions="_LIB;" 64 60 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"" 61 PreprocessorDefinitions="_LIB;"62 66 PrecompiledHeaderFile="" 63 67 /> … … 92 96 <Configuration 93 97 Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" 98 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" 99 100 ATLMinimizesCRunTimeLibraryUsage="false" 101 102 CharacterSet="1" 103 94 104 ConfigurationType="4" 95 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"96 ATLMinimizesCRunTimeLibraryUsage="false"97 CharacterSet="1"98 105 > 99 106 <Tool … … 114 121 <Tool 115 122 Name="VCCLCompilerTool" 123 PreprocessorDefinitions="_LIB;" 124 116 125 ExecutionBucket="7" 117 126 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;"119 127 PrecompiledHeaderFile="" 120 128 /> … … 131 139 Name="VCLibrarianTool" 132 140 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 141 133 142 /> 134 143 <Tool … … 158 167 <Configuration 159 168 Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" 169 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" 170 171 ATLMinimizesCRunTimeLibraryUsage="false" 172 173 CharacterSet="1" 174 160 175 ConfigurationType="4" 161 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"162 ATLMinimizesCRunTimeLibraryUsage="false"163 CharacterSet="1"164 176 > 165 177 <Tool … … 180 192 <Tool 181 193 Name="VCCLCompilerTool" 194 PreprocessorDefinitions="_LIB;" 195 182 196 ExecutionBucket="7" 183 197 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;"185 198 PrecompiledHeaderFile="" 186 199 /> … … 197 210 Name="VCLibrarianTool" 198 211 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 212 199 213 /> 200 214 <Tool … … 223 237 </Configuration> 224 238 <Configuration 225 Name="Release|Pocket PC 2003 (ARMV4)" 239 Name="Debug|Win32" 240 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops" 241 242 ATLMinimizesCRunTimeLibraryUsage="false" 243 244 CharacterSet="2" 245 226 246 ConfigurationType="4" 227 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" 247 UseOfMFC="0" 248 > 249 <Tool 250 Name="VCPreBuildEventTool" 251 /> 252 <Tool 253 Name="VCCustomBuildTool" 254 /> 255 <Tool 256 Name="VCXMLDataGeneratorTool" 257 /> 258 <Tool 259 Name="VCWebServiceProxyGeneratorTool" 260 /> 261 <Tool 262 Name="VCMIDLTool" 263 /> 264 <Tool 265 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 <Tool 272 Name="VCManagedResourceCompilerTool" 273 /> 274 <Tool 275 Name="VCResourceCompilerTool" 276 /> 277 <Tool 278 Name="VCPreLinkEventTool" 279 /> 280 <Tool 281 Name="VCLibrarianTool" 282 /> 283 <Tool 284 Name="VCALinkTool" 285 /> 286 <Tool 287 Name="VCXDCMakeTool" 288 /> 289 <Tool 290 Name="VCBscMakeTool" 291 /> 292 <Tool 293 Name="VCFxCopTool" 294 /> 295 <Tool 296 Name="VCPostBuildEventTool" 297 /> 298 </Configuration> 299 <Configuration 300 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 228 303 ATLMinimizesCRunTimeLibraryUsage="false" 304 229 305 CharacterSet="1" 306 307 ConfigurationType="4" 230 308 > 231 309 <Tool … … 246 324 <Tool 247 325 Name="VCCLCompilerTool" 326 PreprocessorDefinitions="_LIB;" 327 248 328 ExecutionBucket="7" 249 329 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;"251 330 PrecompiledHeaderFile="" 252 331 /> … … 262 341 <Tool 263 342 Name="VCLibrarianTool" 264 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 343 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 344 265 345 /> 266 346 <Tool … … 289 369 </Configuration> 290 370 <Configuration 291 Name="Release|Smartphone 2003 (ARMV4)" 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 374 ATLMinimizesCRunTimeLibraryUsage="false" 375 376 CharacterSet="1" 377 292 378 ConfigurationType="4" 293 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"294 ATLMinimizesCRunTimeLibraryUsage="false"295 CharacterSet="1"296 379 > 297 380 <Tool … … 312 395 <Tool 313 396 Name="VCCLCompilerTool" 397 PreprocessorDefinitions="_LIB;" 398 314 399 ExecutionBucket="7" 315 400 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;"317 401 PrecompiledHeaderFile="" 318 402 /> … … 328 412 <Tool 329 413 Name="VCLibrarianTool" 330 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 414 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 415 331 416 /> 332 417 <Tool … … 355 440 </Configuration> 356 441 <Configuration 357 Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 442 Name="Debug-Static|Win32" 443 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops" 444 445 ATLMinimizesCRunTimeLibraryUsage="false" 446 447 CharacterSet="2" 448 358 449 ConfigurationType="4" 359 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 450 UseOfMFC="0" 451 > 452 <Tool 453 Name="VCPreBuildEventTool" 454 /> 455 <Tool 456 Name="VCCustomBuildTool" 457 /> 458 <Tool 459 Name="VCXMLDataGeneratorTool" 460 /> 461 <Tool 462 Name="VCWebServiceProxyGeneratorTool" 463 /> 464 <Tool 465 Name="VCMIDLTool" 466 /> 467 <Tool 468 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 <Tool 475 Name="VCManagedResourceCompilerTool" 476 /> 477 <Tool 478 Name="VCResourceCompilerTool" 479 /> 480 <Tool 481 Name="VCPreLinkEventTool" 482 /> 483 <Tool 484 Name="VCLibrarianTool" 485 /> 486 <Tool 487 Name="VCALinkTool" 488 /> 489 <Tool 490 Name="VCXDCMakeTool" 491 /> 492 <Tool 493 Name="VCBscMakeTool" 494 /> 495 <Tool 496 Name="VCFxCopTool" 497 /> 498 <Tool 499 Name="VCPostBuildEventTool" 500 /> 501 </Configuration> 502 <Configuration 503 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 360 506 ATLMinimizesCRunTimeLibraryUsage="false" 507 361 508 CharacterSet="1" 509 510 ConfigurationType="4" 362 511 > 363 512 <Tool … … 378 527 <Tool 379 528 Name="VCCLCompilerTool" 529 PreprocessorDefinitions="_LIB;" 530 380 531 ExecutionBucket="7" 381 532 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;"383 533 PrecompiledHeaderFile="" 384 534 /> … … 394 544 <Tool 395 545 Name="VCLibrarianTool" 396 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 546 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 547 397 548 /> 398 549 <Tool … … 421 572 </Configuration> 422 573 <Configuration 423 Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 574 Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)" 575 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" 576 577 ATLMinimizesCRunTimeLibraryUsage="false" 578 579 CharacterSet="1" 580 424 581 ConfigurationType="4" 425 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"426 ATLMinimizesCRunTimeLibraryUsage="false"427 CharacterSet="1"428 582 > 429 583 <Tool … … 444 598 <Tool 445 599 Name="VCCLCompilerTool" 600 PreprocessorDefinitions="_LIB;" 601 446 602 ExecutionBucket="7" 447 603 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;"449 604 PrecompiledHeaderFile="" 450 605 /> … … 460 615 <Tool 461 616 Name="VCLibrarianTool" 462 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 617 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 618 463 619 /> 464 620 <Tool … … 487 643 </Configuration> 488 644 <Configuration 489 Name="Debug|Win32" 645 Name="Release-Dynamic|Win32" 646 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" 647 648 ATLMinimizesCRunTimeLibraryUsage="false" 649 650 CharacterSet="2" 651 490 652 ConfigurationType="4" 491 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"492 653 UseOfMFC="0" 493 ATLMinimizesCRunTimeLibraryUsage="false"494 CharacterSet="2"495 654 > 496 655 <Tool … … 511 670 <Tool 512 671 Name="VCCLCompilerTool" 672 PreprocessorDefinitions="_LIB;" 673 513 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"" 514 PreprocessorDefinitions="_LIB;"515 675 PrecompiledHeaderFile="" 516 676 /> … … 544 704 </Configuration> 545 705 <Configuration 546 Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" 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 709 ATLMinimizesCRunTimeLibraryUsage="false" 710 711 CharacterSet="1" 712 547 713 ConfigurationType="4" 548 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"549 ATLMinimizesCRunTimeLibraryUsage="false"550 CharacterSet="1"551 714 > 552 715 <Tool … … 567 730 <Tool 568 731 Name="VCCLCompilerTool" 732 PreprocessorDefinitions="_LIB;" 733 569 734 ExecutionBucket="7" 570 735 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;"572 736 PrecompiledHeaderFile="" 573 737 /> … … 584 748 Name="VCLibrarianTool" 585 749 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 750 586 751 /> 587 752 <Tool … … 610 775 </Configuration> 611 776 <Configuration 612 Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" 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 780 ATLMinimizesCRunTimeLibraryUsage="false" 781 782 CharacterSet="1" 783 613 784 ConfigurationType="4" 614 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"615 ATLMinimizesCRunTimeLibraryUsage="false"616 CharacterSet="1"617 785 > 618 786 <Tool … … 633 801 <Tool 634 802 Name="VCCLCompilerTool" 803 PreprocessorDefinitions="_LIB;" 804 635 805 ExecutionBucket="7" 636 806 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;"638 807 PrecompiledHeaderFile="" 639 808 /> … … 650 819 Name="VCLibrarianTool" 651 820 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 821 652 822 /> 653 823 <Tool … … 676 846 </Configuration> 677 847 <Configuration 678 Name="Debug|Pocket PC 2003 (ARMV4)" 848 Name="Debug-Dynamic|Win32" 849 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops" 850 851 ATLMinimizesCRunTimeLibraryUsage="false" 852 853 CharacterSet="2" 854 679 855 ConfigurationType="4" 680 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" 856 UseOfMFC="0" 857 > 858 <Tool 859 Name="VCPreBuildEventTool" 860 /> 861 <Tool 862 Name="VCCustomBuildTool" 863 /> 864 <Tool 865 Name="VCXMLDataGeneratorTool" 866 /> 867 <Tool 868 Name="VCWebServiceProxyGeneratorTool" 869 /> 870 <Tool 871 Name="VCMIDLTool" 872 /> 873 <Tool 874 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 <Tool 881 Name="VCManagedResourceCompilerTool" 882 /> 883 <Tool 884 Name="VCResourceCompilerTool" 885 /> 886 <Tool 887 Name="VCPreLinkEventTool" 888 /> 889 <Tool 890 Name="VCLibrarianTool" 891 /> 892 <Tool 893 Name="VCALinkTool" 894 /> 895 <Tool 896 Name="VCXDCMakeTool" 897 /> 898 <Tool 899 Name="VCBscMakeTool" 900 /> 901 <Tool 902 Name="VCFxCopTool" 903 /> 904 <Tool 905 Name="VCPostBuildEventTool" 906 /> 907 </Configuration> 908 <Configuration 909 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 681 912 ATLMinimizesCRunTimeLibraryUsage="false" 913 682 914 CharacterSet="1" 915 916 ConfigurationType="4" 683 917 > 684 918 <Tool … … 699 933 <Tool 700 934 Name="VCCLCompilerTool" 935 PreprocessorDefinitions="_LIB;" 936 701 937 ExecutionBucket="7" 702 938 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;"704 939 PrecompiledHeaderFile="" 705 940 /> … … 715 950 <Tool 716 951 Name="VCLibrarianTool" 717 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 952 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 953 718 954 /> 719 955 <Tool … … 742 978 </Configuration> 743 979 <Configuration 744 Name="Debug|Smartphone 2003 (ARMV4)" 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 983 ATLMinimizesCRunTimeLibraryUsage="false" 984 985 CharacterSet="1" 986 745 987 ConfigurationType="4" 746 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"747 ATLMinimizesCRunTimeLibraryUsage="false"748 CharacterSet="1"749 988 > 750 989 <Tool … … 765 1004 <Tool 766 1005 Name="VCCLCompilerTool" 1006 PreprocessorDefinitions="_LIB;" 1007 767 1008 ExecutionBucket="7" 768 1009 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;"770 1010 PrecompiledHeaderFile="" 771 1011 /> … … 781 1021 <Tool 782 1022 Name="VCLibrarianTool" 783 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 1023 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 1024 784 1025 /> 785 1026 <Tool … … 808 1049 </Configuration> 809 1050 <Configuration 810 Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 1051 Name="Release-Static|Win32" 1052 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" 1053 1054 ATLMinimizesCRunTimeLibraryUsage="false" 1055 1056 CharacterSet="2" 1057 811 1058 ConfigurationType="4" 812 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 1059 UseOfMFC="0" 1060 > 1061 <Tool 1062 Name="VCPreBuildEventTool" 1063 /> 1064 <Tool 1065 Name="VCCustomBuildTool" 1066 /> 1067 <Tool 1068 Name="VCXMLDataGeneratorTool" 1069 /> 1070 <Tool 1071 Name="VCWebServiceProxyGeneratorTool" 1072 /> 1073 <Tool 1074 Name="VCMIDLTool" 1075 /> 1076 <Tool 1077 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 <Tool 1084 Name="VCManagedResourceCompilerTool" 1085 /> 1086 <Tool 1087 Name="VCResourceCompilerTool" 1088 /> 1089 <Tool 1090 Name="VCPreLinkEventTool" 1091 /> 1092 <Tool 1093 Name="VCLibrarianTool" 1094 /> 1095 <Tool 1096 Name="VCALinkTool" 1097 /> 1098 <Tool 1099 Name="VCXDCMakeTool" 1100 /> 1101 <Tool 1102 Name="VCBscMakeTool" 1103 /> 1104 <Tool 1105 Name="VCFxCopTool" 1106 /> 1107 <Tool 1108 Name="VCPostBuildEventTool" 1109 /> 1110 </Configuration> 1111 <Configuration 1112 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 813 1115 ATLMinimizesCRunTimeLibraryUsage="false" 1116 814 1117 CharacterSet="1" 1118 1119 ConfigurationType="4" 815 1120 > 816 1121 <Tool … … 831 1136 <Tool 832 1137 Name="VCCLCompilerTool" 1138 PreprocessorDefinitions="_LIB;" 1139 833 1140 ExecutionBucket="7" 834 1141 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;"836 1142 PrecompiledHeaderFile="" 837 1143 /> … … 847 1153 <Tool 848 1154 Name="VCLibrarianTool" 849 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 1155 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 1156 850 1157 /> 851 1158 <Tool … … 874 1181 </Configuration> 875 1182 <Configuration 876 Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 1183 Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)" 1184 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" 1185 1186 ATLMinimizesCRunTimeLibraryUsage="false" 1187 1188 CharacterSet="1" 1189 877 1190 ConfigurationType="4" 878 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"879 ATLMinimizesCRunTimeLibraryUsage="false"880 CharacterSet="1"881 1191 > 882 1192 <Tool … … 897 1207 <Tool 898 1208 Name="VCCLCompilerTool" 1209 PreprocessorDefinitions="_LIB;" 1210 899 1211 ExecutionBucket="7" 900 1212 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;"902 1213 PrecompiledHeaderFile="" 903 1214 /> … … 913 1224 <Tool 914 1225 Name="VCLibrarianTool" 915 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 1226 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 1227 916 1228 /> 917 1229 <Tool … … 940 1252 </Configuration> 941 1253 <Configuration 942 Name="Debug-Static|Win32" 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 1257 ATLMinimizesCRunTimeLibraryUsage="false" 1258 1259 CharacterSet="1" 1260 943 1261 ConfigurationType="4" 944 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"945 UseOfMFC="0"946 ATLMinimizesCRunTimeLibraryUsage="false"947 CharacterSet="2"948 1262 > 949 1263 <Tool … … 964 1278 <Tool 965 1279 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 1280 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" 1003 CharacterSet="1" 1004 > 1005 <Tool 1006 Name="VCPreBuildEventTool" 1007 /> 1008 <Tool 1009 Name="VCCustomBuildTool" 1010 /> 1011 <Tool 1012 Name="VCXMLDataGeneratorTool" 1013 /> 1014 <Tool 1015 Name="VCWebServiceProxyGeneratorTool" 1016 /> 1017 <Tool 1018 Name="VCMIDLTool" 1019 /> 1020 <Tool 1021 Name="VCCLCompilerTool" 1281 1022 1282 ExecutionBucket="7" 1023 1283 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;"1025 1284 PrecompiledHeaderFile="" 1026 1285 /> … … 1036 1295 <Tool 1037 1296 Name="VCLibrarianTool" 1038 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 1297 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1298 1039 1299 /> 1040 1300 <Tool … … 1063 1323 </Configuration> 1064 1324 <Configuration 1065 Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)" 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 1328 ATLMinimizesCRunTimeLibraryUsage="false" 1329 1330 CharacterSet="1" 1331 1066 1332 ConfigurationType="4" 1067 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"1068 ATLMinimizesCRunTimeLibraryUsage="false"1069 CharacterSet="1"1070 1333 > 1071 1334 <Tool … … 1086 1349 <Tool 1087 1350 Name="VCCLCompilerTool" 1351 PreprocessorDefinitions="_LIB;" 1352 1088 1353 ExecutionBucket="7" 1089 1354 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;"1091 1355 PrecompiledHeaderFile="" 1092 1356 /> … … 1102 1366 <Tool 1103 1367 Name="VCLibrarianTool" 1104 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 1368 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1369 1105 1370 /> 1106 1371 <Tool … … 1130 1395 <Configuration 1131 1396 Name="Debug-Static|Pocket PC 2003 (ARMV4)" 1397 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" 1398 1399 ATLMinimizesCRunTimeLibraryUsage="false" 1400 1401 CharacterSet="1" 1402 1132 1403 ConfigurationType="4" 1133 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"1134 ATLMinimizesCRunTimeLibraryUsage="false"1135 CharacterSet="1"1136 1404 > 1137 1405 <Tool … … 1152 1420 <Tool 1153 1421 Name="VCCLCompilerTool" 1422 PreprocessorDefinitions="_LIB;" 1423 1154 1424 ExecutionBucket="7" 1155 1425 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;"1157 1426 PrecompiledHeaderFile="" 1158 1427 /> … … 1169 1438 Name="VCLibrarianTool" 1170 1439 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1440 1171 1441 /> 1172 1442 <Tool … … 1195 1465 </Configuration> 1196 1466 <Configuration 1197 Name="Debug-Static|Smartphone 2003 (ARMV4)" 1467 Name="Release-Dynamic|Pocket PC 2003 (ARMV4)" 1468 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" 1469 1470 ATLMinimizesCRunTimeLibraryUsage="false" 1471 1472 CharacterSet="1" 1473 1198 1474 ConfigurationType="4" 1199 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"1200 ATLMinimizesCRunTimeLibraryUsage="false"1201 CharacterSet="1"1202 1475 > 1203 1476 <Tool … … 1218 1491 <Tool 1219 1492 Name="VCCLCompilerTool" 1493 PreprocessorDefinitions="_LIB;" 1494 1220 1495 ExecutionBucket="7" 1221 1496 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;"1223 1497 PrecompiledHeaderFile="" 1224 1498 /> … … 1234 1508 <Tool 1235 1509 Name="VCLibrarianTool" 1236 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 1510 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1511 1237 1512 /> 1238 1513 <Tool … … 1261 1536 </Configuration> 1262 1537 <Configuration 1263 Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 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 1541 ATLMinimizesCRunTimeLibraryUsage="false" 1542 1543 CharacterSet="1" 1544 1264 1545 ConfigurationType="4" 1265 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"1266 ATLMinimizesCRunTimeLibraryUsage="false"1267 CharacterSet="1"1268 1546 > 1269 1547 <Tool … … 1284 1562 <Tool 1285 1563 Name="VCCLCompilerTool" 1564 PreprocessorDefinitions="_LIB;" 1565 1286 1566 ExecutionBucket="7" 1287 1567 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;"1289 1568 PrecompiledHeaderFile="" 1290 1569 /> … … 1300 1579 <Tool 1301 1580 Name="VCLibrarianTool" 1302 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 1581 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1582 1303 1583 /> 1304 1584 <Tool … … 1327 1607 </Configuration> 1328 1608 <Configuration 1329 Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 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 1612 ATLMinimizesCRunTimeLibraryUsage="false" 1613 1614 CharacterSet="1" 1615 1330 1616 ConfigurationType="4" 1331 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"1332 ATLMinimizesCRunTimeLibraryUsage="false"1333 CharacterSet="1"1334 1617 > 1335 1618 <Tool … … 1350 1633 <Tool 1351 1634 Name="VCCLCompilerTool" 1635 PreprocessorDefinitions="_LIB;" 1636 1352 1637 ExecutionBucket="7" 1353 1638 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;"1355 1639 PrecompiledHeaderFile="" 1356 1640 /> … … 1366 1650 <Tool 1367 1651 Name="VCLibrarianTool" 1368 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 1652 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1653 1369 1654 /> 1370 1655 <Tool … … 1393 1678 </Configuration> 1394 1679 <Configuration 1395 Name="Release-Dynamic|Win32" 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 1683 ATLMinimizesCRunTimeLibraryUsage="false" 1684 1685 CharacterSet="1" 1686 1396 1687 ConfigurationType="4" 1397 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"1398 UseOfMFC="0"1399 ATLMinimizesCRunTimeLibraryUsage="false"1400 CharacterSet="2"1401 1688 > 1402 1689 <Tool … … 1417 1704 <Tool 1418 1705 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 1706 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" 1456 CharacterSet="1" 1457 > 1458 <Tool 1459 Name="VCPreBuildEventTool" 1460 /> 1461 <Tool 1462 Name="VCCustomBuildTool" 1463 /> 1464 <Tool 1465 Name="VCXMLDataGeneratorTool" 1466 /> 1467 <Tool 1468 Name="VCWebServiceProxyGeneratorTool" 1469 /> 1470 <Tool 1471 Name="VCMIDLTool" 1472 /> 1473 <Tool 1474 Name="VCCLCompilerTool" 1707 1475 1708 ExecutionBucket="7" 1476 1709 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;"1478 1710 PrecompiledHeaderFile="" 1479 1711 /> … … 1489 1721 <Tool 1490 1722 Name="VCLibrarianTool" 1491 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 1723 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 1724 1492 1725 /> 1493 1726 <Tool … … 1516 1749 </Configuration> 1517 1750 <Configuration 1518 Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)" 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 1754 ATLMinimizesCRunTimeLibraryUsage="false" 1755 1756 CharacterSet="1" 1757 1519 1758 ConfigurationType="4" 1520 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"1521 ATLMinimizesCRunTimeLibraryUsage="false"1522 CharacterSet="1"1523 1759 > 1524 1760 <Tool … … 1539 1775 <Tool 1540 1776 Name="VCCLCompilerTool" 1777 PreprocessorDefinitions="_LIB;" 1778 1541 1779 ExecutionBucket="7" 1542 1780 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;"1544 1781 PrecompiledHeaderFile="" 1545 1782 /> … … 1555 1792 <Tool 1556 1793 Name="VCLibrarianTool" 1557 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 1794 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 1795 1558 1796 /> 1559 1797 <Tool … … 1582 1820 </Configuration> 1583 1821 <Configuration 1584 Name="Release-Dynamic|Pocket PC 2003 (ARMV4)" 1822 Name="Debug-Static|Smartphone 2003 (ARMV4)" 1823 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" 1824 1825 ATLMinimizesCRunTimeLibraryUsage="false" 1826 1827 CharacterSet="1" 1828 1585 1829 ConfigurationType="4" 1586 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"1587 ATLMinimizesCRunTimeLibraryUsage="false"1588 CharacterSet="1"1589 1830 > 1590 1831 <Tool … … 1605 1846 <Tool 1606 1847 Name="VCCLCompilerTool" 1848 PreprocessorDefinitions="_LIB;" 1849 1607 1850 ExecutionBucket="7" 1608 1851 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;"1610 1852 PrecompiledHeaderFile="" 1611 1853 /> … … 1621 1863 <Tool 1622 1864 Name="VCLibrarianTool" 1623 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 1865 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 1866 1624 1867 /> 1625 1868 <Tool … … 1649 1892 <Configuration 1650 1893 Name="Release-Dynamic|Smartphone 2003 (ARMV4)" 1894 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" 1895 1896 ATLMinimizesCRunTimeLibraryUsage="false" 1897 1898 CharacterSet="1" 1899 1651 1900 ConfigurationType="4" 1652 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"1653 ATLMinimizesCRunTimeLibraryUsage="false"1654 CharacterSet="1"1655 1901 > 1656 1902 <Tool … … 1671 1917 <Tool 1672 1918 Name="VCCLCompilerTool" 1919 PreprocessorDefinitions="_LIB;" 1920 1673 1921 ExecutionBucket="7" 1674 1922 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;"1676 1923 PrecompiledHeaderFile="" 1677 1924 /> … … 1688 1935 Name="VCLibrarianTool" 1689 1936 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 1937 1690 1938 /> 1691 1939 <Tool … … 1714 1962 </Configuration> 1715 1963 <Configuration 1716 Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 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 1967 ATLMinimizesCRunTimeLibraryUsage="false" 1968 1969 CharacterSet="1" 1970 1717 1971 ConfigurationType="4" 1718 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"1719 ATLMinimizesCRunTimeLibraryUsage="false"1720 CharacterSet="1"1721 1972 > 1722 1973 <Tool … … 1737 1988 <Tool 1738 1989 Name="VCCLCompilerTool" 1990 PreprocessorDefinitions="_LIB;" 1991 1739 1992 ExecutionBucket="7" 1740 1993 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;"1742 1994 PrecompiledHeaderFile="" 1743 1995 /> … … 1753 2005 <Tool 1754 2006 Name="VCLibrarianTool" 1755 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2007 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 2008 1756 2009 /> 1757 2010 <Tool … … 1780 2033 </Configuration> 1781 2034 <Configuration 1782 Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 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 2038 ATLMinimizesCRunTimeLibraryUsage="false" 2039 2040 CharacterSet="1" 2041 1783 2042 ConfigurationType="4" 1784 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"1785 ATLMinimizesCRunTimeLibraryUsage="false"1786 CharacterSet="1"1787 2043 > 1788 2044 <Tool … … 1803 2059 <Tool 1804 2060 Name="VCCLCompilerTool" 2061 PreprocessorDefinitions="_LIB;" 2062 1805 2063 ExecutionBucket="7" 1806 2064 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;"1808 2065 PrecompiledHeaderFile="" 1809 2066 /> … … 1819 2076 <Tool 1820 2077 Name="VCLibrarianTool" 1821 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2078 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 2079 1822 2080 /> 1823 2081 <Tool … … 1846 2104 </Configuration> 1847 2105 <Configuration 1848 Name="Debug-Dynamic|Win32" 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 2109 ATLMinimizesCRunTimeLibraryUsage="false" 2110 2111 CharacterSet="1" 2112 1849 2113 ConfigurationType="4" 1850 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"1851 UseOfMFC="0"1852 ATLMinimizesCRunTimeLibraryUsage="false"1853 CharacterSet="2"1854 2114 > 1855 2115 <Tool … … 1870 2130 <Tool 1871 2131 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 2132 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" 1909 CharacterSet="1" 1910 > 1911 <Tool 1912 Name="VCPreBuildEventTool" 1913 /> 1914 <Tool 1915 Name="VCCustomBuildTool" 1916 /> 1917 <Tool 1918 Name="VCXMLDataGeneratorTool" 1919 /> 1920 <Tool 1921 Name="VCWebServiceProxyGeneratorTool" 1922 /> 1923 <Tool 1924 Name="VCMIDLTool" 1925 /> 1926 <Tool 1927 Name="VCCLCompilerTool" 2133 1928 2134 ExecutionBucket="7" 1929 2135 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;"1931 2136 PrecompiledHeaderFile="" 1932 2137 /> … … 1942 2147 <Tool 1943 2148 Name="VCLibrarianTool" 1944 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 2149 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2150 1945 2151 /> 1946 2152 <Tool … … 1969 2175 </Configuration> 1970 2176 <Configuration 1971 Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)" 2177 Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 2178 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 2179 2180 ATLMinimizesCRunTimeLibraryUsage="false" 2181 2182 CharacterSet="1" 2183 1972 2184 ConfigurationType="4" 1973 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"1974 ATLMinimizesCRunTimeLibraryUsage="false"1975 CharacterSet="1"1976 2185 > 1977 2186 <Tool … … 1992 2201 <Tool 1993 2202 Name="VCCLCompilerTool" 2203 PreprocessorDefinitions="_LIB;" 2204 1994 2205 ExecutionBucket="7" 1995 2206 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;"1997 2207 PrecompiledHeaderFile="" 1998 2208 /> … … 2008 2218 <Tool 2009 2219 Name="VCLibrarianTool" 2010 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 2220 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2221 2011 2222 /> 2012 2223 <Tool … … 2035 2246 </Configuration> 2036 2247 <Configuration 2037 Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)" 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 2251 ATLMinimizesCRunTimeLibraryUsage="false" 2252 2253 CharacterSet="1" 2254 2038 2255 ConfigurationType="4" 2039 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"2040 ATLMinimizesCRunTimeLibraryUsage="false"2041 CharacterSet="1"2042 2256 > 2043 2257 <Tool … … 2058 2272 <Tool 2059 2273 Name="VCCLCompilerTool" 2274 PreprocessorDefinitions="_LIB;" 2275 2060 2276 ExecutionBucket="7" 2061 2277 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;"2063 2278 PrecompiledHeaderFile="" 2064 2279 /> … … 2074 2289 <Tool 2075 2290 Name="VCLibrarianTool" 2076 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 2291 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2292 2077 2293 /> 2078 2294 <Tool … … 2101 2317 </Configuration> 2102 2318 <Configuration 2103 Name="Debug-Dynamic|Smartphone 2003 (ARMV4)" 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 2322 ATLMinimizesCRunTimeLibraryUsage="false" 2323 2324 CharacterSet="1" 2325 2104 2326 ConfigurationType="4" 2105 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"2106 ATLMinimizesCRunTimeLibraryUsage="false"2107 CharacterSet="1"2108 2327 > 2109 2328 <Tool … … 2124 2343 <Tool 2125 2344 Name="VCCLCompilerTool" 2345 PreprocessorDefinitions="_LIB;" 2346 2126 2347 ExecutionBucket="7" 2127 2348 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;"2129 2349 PrecompiledHeaderFile="" 2130 2350 /> … … 2140 2360 <Tool 2141 2361 Name="VCLibrarianTool" 2142 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 2362 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2363 2143 2364 /> 2144 2365 <Tool … … 2168 2389 <Configuration 2169 2390 Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 2391 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 2392 2393 ATLMinimizesCRunTimeLibraryUsage="false" 2394 2395 CharacterSet="1" 2396 2170 2397 ConfigurationType="4" 2171 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"2172 ATLMinimizesCRunTimeLibraryUsage="false"2173 CharacterSet="1"2174 2398 > 2175 2399 <Tool … … 2190 2414 <Tool 2191 2415 Name="VCCLCompilerTool" 2416 PreprocessorDefinitions="_LIB;" 2417 2192 2418 ExecutionBucket="7" 2193 2419 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;"2195 2420 PrecompiledHeaderFile="" 2196 2421 /> … … 2207 2432 Name="VCLibrarianTool" 2208 2433 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2434 2209 2435 /> 2210 2436 <Tool … … 2233 2459 </Configuration> 2234 2460 <Configuration 2235 Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 2461 Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 2462 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 2463 2464 ATLMinimizesCRunTimeLibraryUsage="false" 2465 2466 CharacterSet="1" 2467 2236 2468 ConfigurationType="4" 2237 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"2238 ATLMinimizesCRunTimeLibraryUsage="false"2239 CharacterSet="1"2240 2469 > 2241 2470 <Tool … … 2256 2485 <Tool 2257 2486 Name="VCCLCompilerTool" 2487 PreprocessorDefinitions="_LIB;" 2488 2258 2489 ExecutionBucket="7" 2259 2490 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;"2261 2491 PrecompiledHeaderFile="" 2262 2492 /> … … 2272 2502 <Tool 2273 2503 Name="VCLibrarianTool" 2274 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2504 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2505 2275 2506 /> 2276 2507 <Tool … … 2299 2530 </Configuration> 2300 2531 <Configuration 2301 Name="Release-Static|Win32" 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 2535 ATLMinimizesCRunTimeLibraryUsage="false" 2536 2537 CharacterSet="1" 2538 2302 2539 ConfigurationType="4" 2303 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"2304 UseOfMFC="0"2305 ATLMinimizesCRunTimeLibraryUsage="false"2306 CharacterSet="2"2307 2540 > 2308 2541 <Tool … … 2323 2556 <Tool 2324 2557 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 2558 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" 2362 CharacterSet="1" 2363 > 2364 <Tool 2365 Name="VCPreBuildEventTool" 2366 /> 2367 <Tool 2368 Name="VCCustomBuildTool" 2369 /> 2370 <Tool 2371 Name="VCXMLDataGeneratorTool" 2372 /> 2373 <Tool 2374 Name="VCWebServiceProxyGeneratorTool" 2375 /> 2376 <Tool 2377 Name="VCMIDLTool" 2378 /> 2379 <Tool 2380 Name="VCCLCompilerTool" 2559 2381 2560 ExecutionBucket="7" 2382 2561 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;"2384 2562 PrecompiledHeaderFile="" 2385 2563 /> … … 2395 2573 <Tool 2396 2574 Name="VCLibrarianTool" 2397 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 2575 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2576 2398 2577 /> 2399 2578 <Tool … … 2422 2601 </Configuration> 2423 2602 <Configuration 2424 Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)" 2603 Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 2604 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 2605 2606 ATLMinimizesCRunTimeLibraryUsage="false" 2607 2608 CharacterSet="1" 2609 2425 2610 ConfigurationType="4" 2426 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"2427 ATLMinimizesCRunTimeLibraryUsage="false"2428 CharacterSet="1"2429 2611 > 2430 2612 <Tool … … 2445 2627 <Tool 2446 2628 Name="VCCLCompilerTool" 2629 PreprocessorDefinitions="_LIB;" 2630 2447 2631 ExecutionBucket="7" 2448 2632 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;"2450 2633 PrecompiledHeaderFile="" 2451 2634 /> … … 2461 2644 <Tool 2462 2645 Name="VCLibrarianTool" 2463 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 2646 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2647 2464 2648 /> 2465 2649 <Tool … … 2488 2672 </Configuration> 2489 2673 <Configuration 2490 Name="Release-Static|Pocket PC 2003 (ARMV4)" 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 2677 ATLMinimizesCRunTimeLibraryUsage="false" 2678 2679 CharacterSet="1" 2680 2491 2681 ConfigurationType="4" 2492 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"2493 ATLMinimizesCRunTimeLibraryUsage="false"2494 CharacterSet="1"2495 2682 > 2496 2683 <Tool … … 2511 2698 <Tool 2512 2699 Name="VCCLCompilerTool" 2700 PreprocessorDefinitions="_LIB;" 2701 2513 2702 ExecutionBucket="7" 2514 2703 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;"2516 2704 PrecompiledHeaderFile="" 2517 2705 /> … … 2527 2715 <Tool 2528 2716 Name="VCLibrarianTool" 2529 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" 2717 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2718 2530 2719 /> 2531 2720 <Tool … … 2554 2743 </Configuration> 2555 2744 <Configuration 2556 Name="Release-Static|Smartphone 2003 (ARMV4)" 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 2748 ATLMinimizesCRunTimeLibraryUsage="false" 2749 2750 CharacterSet="1" 2751 2557 2752 ConfigurationType="4" 2558 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"2559 ATLMinimizesCRunTimeLibraryUsage="false"2560 CharacterSet="1"2561 2753 > 2562 2754 <Tool … … 2577 2769 <Tool 2578 2770 Name="VCCLCompilerTool" 2771 PreprocessorDefinitions="_LIB;" 2772 2579 2773 ExecutionBucket="7" 2580 2774 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;"2582 2775 PrecompiledHeaderFile="" 2583 2776 /> … … 2593 2786 <Tool 2594 2787 Name="VCLibrarianTool" 2595 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 2788 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2789 2596 2790 /> 2597 2791 <Tool … … 2620 2814 </Configuration> 2621 2815 <Configuration 2622 Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 2816 Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 2817 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 2818 2819 ATLMinimizesCRunTimeLibraryUsage="false" 2820 2821 CharacterSet="1" 2822 2623 2823 ConfigurationType="4" 2624 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"2625 ATLMinimizesCRunTimeLibraryUsage="false"2626 CharacterSet="1"2627 2824 > 2628 2825 <Tool … … 2643 2840 <Tool 2644 2841 Name="VCCLCompilerTool" 2842 PreprocessorDefinitions="_LIB;" 2843 2645 2844 ExecutionBucket="7" 2646 2845 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;"2648 2846 PrecompiledHeaderFile="" 2649 2847 /> … … 2659 2857 <Tool 2660 2858 Name="VCLibrarianTool" 2661 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2859 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2860 2662 2861 /> 2663 2862 <Tool … … 2687 2886 <Configuration 2688 2887 Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 2888 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 2889 2890 ATLMinimizesCRunTimeLibraryUsage="false" 2891 2892 CharacterSet="1" 2893 2689 2894 ConfigurationType="4" 2690 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"2691 ATLMinimizesCRunTimeLibraryUsage="false"2692 CharacterSet="1"2693 2895 > 2694 2896 <Tool … … 2709 2911 <Tool 2710 2912 Name="VCCLCompilerTool" 2913 PreprocessorDefinitions="_LIB;" 2914 2711 2915 ExecutionBucket="7" 2712 2916 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;"2714 2917 PrecompiledHeaderFile="" 2715 2918 /> … … 2726 2929 Name="VCLibrarianTool" 2727 2930 OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2931 2728 2932 /> 2729 2933 <Tool … … 4590 4794 </File> 4591 4795 <File 4592 RelativePath="..\src\pjmedia\sync_port.c"4593 >4594 </File>4595 <File4596 4796 RelativePath="..\src\pjmedia\tonegen.c" 4597 4797 > … … 5103 5303 </File> 5104 5304 <File 5105 RelativePath="..\include\pjmedia\sync_port.h"5106 >5107 </File>5108 <File5109 5305 RelativePath="..\include\pjmedia\tonegen.h" 5110 5306 > -
pjproject/trunk/pjmedia/src/pjmedia/conference.c
r2748 r2755 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;240 239 }; 241 240 … … 459 458 460 459 461 status = create_ conf_port(pool, conf, NULL, &name, &conf_port);460 status = create_pasv_port(conf, pool, &name, NULL, &conf_port); 462 461 if (status != PJ_SUCCESS) 463 462 return status; … … 558 557 conf->master_port = PJ_POOL_ZALLOC_T(pool, pjmedia_port); 559 558 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);564 559 565 560 pjmedia_port_info_init(&conf->master_port->info, &name, SIGNATURE, … … 1057 1052 1058 1053 /* if source port is passive port and has no listener, reset delaybuf */ 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 } 1054 if (src_port->delay_buf && src_port->listener_cnt == 0) 1055 pjmedia_delay_buf_reset(src_port->delay_buf); 1066 1056 } 1067 1057 … … 1852 1842 1853 1843 /* Get frame from this port. 1854 * For port 0 (master port), get the frame from master_port_buf.1855 1844 * For passive ports, get the frame from the delay_buf. 1856 1845 * For other ports, get the frame from the port. 1857 1846 */ 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 1847 if (conf_port->delay_buf != NULL) { 1865 1848 pj_status_t status; 1866 1849 … … 2072 2055 pjmedia_conf *conf = (pjmedia_conf*) this_port->port_data.pdata; 2073 2056 struct conf_port *port = conf->ports[this_port->port_data.ldata]; 2057 pj_status_t status; 2074 2058 2075 2059 /* Check for correct size. */ … … 2078 2062 PJMEDIA_ENCSAMPLESPFRAME); 2079 2063 2064 /* Check existance of delay_buf instance */ 2065 PJ_ASSERT_RETURN( port->delay_buf, PJ_EBUG ); 2066 2080 2067 /* Skip if this port is muted/disabled. */ 2081 2068 if (port->rx_setting != PJMEDIA_PORT_ENABLE) { … … 2088 2075 } 2089 2076 2090 pjmedia_copy_samples(conf->master_port_buf, (pj_int16_t*)frame->buf, 2091 conf->samples_per_frame); 2092 2093 return PJ_SUCCESS; 2077 status = pjmedia_delay_buf_put(port->delay_buf, (pj_int16_t*)frame->buf); 2078 2079 return status; 2094 2080 } 2095 2081 -
pjproject/trunk/pjmedia/src/pjmedia/echo_common.c
r2747 r2755 20 20 21 21 #include <pjmedia/echo.h> 22 #include <pjmedia/delaybuf.h> 22 23 #include <pjmedia/errno.h> 23 24 #include <pj/assert.h> … … 50 51 struct frame lat_buf; /* Frame queue for delayed playback */ 51 52 struct frame lat_free; /* Free frame list. */ 53 54 pjmedia_delay_buf *delay_buf; 52 55 }; 53 56 … … 144 147 pjmedia_echo_state *ec; 145 148 pj_status_t status; 146 unsigned i;147 149 148 150 /* Create new pool and instantiate and init the EC */ … … 190 192 /* Create latency buffers */ 191 193 ptime = samples_per_frame * 1000 / clock_rate; 192 /* Give at least one frame delay to simplify programming */193 if (latency_ms < ptime) { 194 if (latency_ms == 0) { 195 /* Give at least one frame delay to simplify programming */ 194 196 latency_ms = ptime; 195 197 } 196 198 ec->lat_target_cnt = latency_ms / ptime; 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); 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; 203 220 } 204 221 … … 224 241 (*echo->op->ec_destroy)(echo->state); 225 242 243 if (echo->delay_buf) { 244 pjmedia_delay_buf_destroy(echo->delay_buf); 245 echo->delay_buf = NULL; 246 } 247 226 248 pj_pool_release(echo->pool); 227 249 return PJ_SUCCESS; … … 241 263 } 242 264 echo->lat_ready = PJ_FALSE; 265 pjmedia_delay_buf_reset(echo->delay_buf); 243 266 echo->op->ec_reset(echo->state); 244 267 return PJ_SUCCESS; … … 252 275 pj_int16_t *play_frm ) 253 276 { 254 struct frame *frm; 255 256 if (echo->lat_ready) { 257 frm = echo->lat_buf.next; 258 pj_list_erase(frm); 259 } else { 277 if (!echo->lat_ready) { 260 278 /* We've not built enough latency in the buffer, so put this frame 261 279 * in the latency buffer list. 262 280 */ 263 frm = echo->lat_free.prev;264 pj_list_erase(frm); 281 struct frame *frm; 282 265 283 if (pj_list_empty(&echo->lat_free)) { 266 284 echo->lat_ready = PJ_TRUE; 267 285 PJ_LOG(5,(echo->obj_name, "Latency bufferring complete")); 286 pjmedia_delay_buf_put(echo->delay_buf, play_frm); 287 return PJ_SUCCESS; 268 288 } 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); 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 } 274 302 275 303 return PJ_SUCCESS; … … 286 314 { 287 315 struct frame *oldest_frm; 288 pj_status_t status ;316 pj_status_t status, rc; 289 317 290 318 if (!echo->lat_ready) { … … 296 324 /* Retrieve oldest frame from the latency buffer */ 297 325 oldest_frm = echo->lat_buf.next; 326 pj_list_erase(oldest_frm); 298 327 299 328 /* Cancel echo using this reference frame */ … … 301 330 options, NULL); 302 331 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 303 342 return status; 304 343 } -
pjproject/trunk/pjmedia/src/pjmedia/sound_port.c
r2748 r2755 20 20 #include <pjmedia/sound_port.h> 21 21 #include <pjmedia/alaw_ulaw.h> 22 #include <pjmedia/echo_port.h> 22 #include <pjmedia/delaybuf.h> 23 #include <pjmedia/echo.h> 23 24 #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 */ 31 32 32 33 #define THIS_FILE "sound_port.c" 33 34 35 //#define TEST_OVERFLOW_UNDERFLOW 36 34 37 struct pjmedia_snd_port 35 38 { 36 pj_pool_t *pool;37 39 int rec_id; 38 40 int play_id; … … 42 44 pjmedia_dir dir; 43 45 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_ port *echo_port;53 pjmedia_echo_state *ec_state; 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; 56 59 }; 57 60 … … 67 70 pj_status_t status; 68 71 69 port = snd_port-> dn_port;72 port = snd_port->port; 70 73 if (port == NULL) 71 74 goto no_frame; … … 80 83 /* Must supply the required samples */ 81 84 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 } 82 95 83 96 … … 89 102 pj_bzero(frame->buf, frame->size); 90 103 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 91 116 return PJ_SUCCESS; 92 117 } … … 102 127 pjmedia_port *port; 103 128 104 port = snd_port-> dn_port;129 port = snd_port->port; 105 130 if (port == NULL) 106 131 return PJ_SUCCESS; 132 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 } 107 137 108 138 pjmedia_port_put_frame(port, frame); … … 153 183 * This may be called even when the sound stream has already been started. 154 184 */ 155 static pj_status_t start_sound_device( pjmedia_snd_port *snd_port ) 185 static pj_status_t start_sound_device( pj_pool_t *pool, 186 pjmedia_snd_port *snd_port ) 156 187 { 157 188 pjmedia_aud_rec_cb snd_rec_cb; 158 189 pjmedia_aud_play_cb snd_play_cb; 159 pjmedia_aud_param *param;190 pjmedia_aud_param param_copy; 160 191 pj_status_t status; 161 192 … … 169 200 PJ_EBUG); 170 201 171 param = &snd_port->aud_param;172 173 202 /* Get device caps */ 174 if ( param->dir & PJMEDIA_DIR_CAPTURE) {203 if (snd_port->aud_param.dir & PJMEDIA_DIR_CAPTURE) { 175 204 pjmedia_aud_dev_info dev_info; 176 205 177 status = pjmedia_aud_dev_get_info(param->rec_id, &dev_info); 206 status = pjmedia_aud_dev_get_info(snd_port->aud_param.rec_id, 207 &dev_info); 178 208 if (status != PJ_SUCCESS) 179 209 return status; … … 184 214 } 185 215 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 from 225 * device parameters 226 */ 227 param_copy.flags &= ~(PJMEDIA_AUD_DEV_CAP_EC | 228 PJMEDIA_AUD_DEV_CAP_EC_TAIL); 229 } 230 } 231 186 232 /* Use different callback if format is not PCM */ 187 if ( param->ext_fmt.id == PJMEDIA_FORMAT_L16) {233 if (snd_port->aud_param.ext_fmt.id == PJMEDIA_FORMAT_L16) { 188 234 snd_rec_cb = &rec_cb; 189 235 snd_play_cb = &play_cb; … … 194 240 195 241 /* Open the device */ 196 status = pjmedia_aud_stream_create( param,242 status = pjmedia_aud_stream_create(¶m_copy, 197 243 snd_rec_cb, 198 244 snd_play_cb, … … 202 248 if (status != PJ_SUCCESS) 203 249 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 device 257 * 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 } 204 278 205 279 /* Start sound stream. */ … … 226 300 pjmedia_aud_stream_destroy(snd_port->aud_stream); 227 301 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; 228 308 } 229 309 … … 341 421 PJ_ASSERT_RETURN(pool && prm && p_port, PJ_EINVAL); 342 422 343 pool = pj_pool_create(pool->factory, pool->obj_name, 256, 256, NULL);344 423 snd_port = PJ_POOL_ZALLOC_T(pool, pjmedia_snd_port); 345 424 PJ_ASSERT_RETURN(snd_port, PJ_ENOMEM); 346 425 347 snd_port->pool = pool;348 426 snd_port->dir = prm->dir; 349 427 snd_port->rec_id = prm->rec_id; … … 360 438 * empty signal. 361 439 */ 362 status = start_sound_device( snd_port );440 status = start_sound_device( pool, snd_port ); 363 441 if (status != PJ_SUCCESS) { 364 442 pjmedia_snd_port_destroy(snd_port); … … 376 454 PJ_DEF(pj_status_t) pjmedia_snd_port_destroy(pjmedia_snd_port *snd_port) 377 455 { 378 pj_status_t status;379 380 456 PJ_ASSERT_RETURN(snd_port, PJ_EINVAL); 381 457 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; 458 return stop_sound_device(snd_port); 391 459 } 392 460 … … 484 552 485 553 /* Destroy AEC */ 486 if (snd_port->ec ho_port) {487 pjmedia_ port_destroy(snd_port->echo_port);488 snd_port->ec ho_port= NULL;554 if (snd_port->ec_state) { 555 pjmedia_echo_destroy(snd_port->ec_state); 556 snd_port->ec_state = NULL; 489 557 } 490 558 … … 497 565 // snd_port->clock_rate; 498 566 delay_ms = prm.output_latency_ms; 499 status = pjmedia_echo_port_create(pool, snd_port->port, 500 tail_ms, delay_ms, 501 options, &snd_port->echo_port); 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); 502 572 if (status != PJ_SUCCESS) 503 snd_port->echo_port = NULL; 573 snd_port->ec_state = NULL; 574 else 575 snd_port->ec_suspended = PJ_FALSE; 504 576 } else { 505 577 PJ_LOG(4,(THIS_FILE, "Echo canceller is now disabled in the " … … 551 623 } else { 552 624 /* We use software EC */ 553 *p_length = snd_port->ec ho_port? snd_port->ec_tail_len : 0;625 *p_length = snd_port->ec_state ? snd_port->ec_tail_len : 0; 554 626 } 555 627 return PJ_SUCCESS; … … 564 636 { 565 637 pjmedia_port_info *pinfo; 566 pjmedia_aud_param *param;567 pj_status_t status;568 638 569 639 PJ_ASSERT_RETURN(snd_port && port, PJ_EINVAL); … … 587 657 /* Port is okay. */ 588 658 snd_port->port = port; 589 590 /* Create software EC if parameter specifies EC but device591 * doesn't support EC. Only do this if the format is PCM!592 */593 param = &snd_port->aud_param;594 if ((param->flags & PJMEDIA_AUD_DEV_CAP_EC) &&595 (snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC)==0 &&596 param->ext_fmt.id == PJMEDIA_FORMAT_PCM)597 {598 if ((param->flags & PJMEDIA_AUD_DEV_CAP_EC_TAIL)==0) {599 param->flags |= PJMEDIA_AUD_DEV_CAP_EC_TAIL;600 param->ec_tail_ms = AEC_TAIL;601 PJ_LOG(4,(THIS_FILE, "AEC tail is set to default %u ms",602 param->ec_tail_ms));603 }604 605 status = pjmedia_snd_port_set_ec(snd_port, snd_port->pool,606 param->ec_tail_ms, 0);607 if (status != PJ_SUCCESS)608 return status;609 }610 611 /* Create sync port. Only do this if the format is PCM! */612 if (param->ext_fmt.id == PJMEDIA_FORMAT_PCM) {613 pjmedia_sync_param sync_param;614 615 pj_bzero(&sync_param, sizeof(sync_param));616 sync_param.options = PJMEDIA_SYNC_DONT_DESTROY_DN;617 status = pjmedia_sync_port_create(snd_port->pool,618 (snd_port->echo_port?619 snd_port->echo_port:snd_port->port),620 &sync_param, &snd_port->sync_port);621 if (status != PJ_SUCCESS)622 return status;623 624 /* Update down port of sound port */625 snd_port->dn_port = snd_port->sync_port;626 }627 628 659 return PJ_SUCCESS; 629 660 } … … 648 679 649 680 snd_port->port = NULL; 650 snd_port->dn_port = NULL; 651 652 /* Destroy sync port */ 653 if (snd_port->sync_port) { 654 pjmedia_port_destroy(snd_port->sync_port); 655 snd_port->sync_port = NULL; 656 } 657 658 /* Destroy EC port */ 659 if (snd_port->echo_port) { 660 pjmedia_port_destroy(snd_port->echo_port); 661 snd_port->echo_port = NULL; 662 snd_port->ec_tail_len = 0; 663 snd_port->ec_options = 0; 664 } 665 666 return PJ_SUCCESS; 667 } 668 669 681 682 return PJ_SUCCESS; 683 } 684 685
Note: See TracChangeset
for help on using the changeset viewer.