![(please configure the [header_logo] section in trac.ini)](/repos/chrome/site/pj.jpg)
- Timestamp:
- Dec 15, 2011 6:45:23 AM (13 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 4 added
- 8 edited
-
build.symbian/pjmedia.mmp (modified) (1 diff)
-
pjmedia/build/Makefile (modified) (1 diff)
-
pjmedia/build/pjmedia_codec.vcproj (modified) (10 diffs)
-
pjmedia/include/pjmedia-codec/amr_sdp_match.h (added)
-
pjmedia/include/pjmedia-codec/g7221_sdp_match.h (added)
-
pjmedia/src/pjmedia-codec/amr_sdp_match.c (added)
-
pjmedia/src/pjmedia-codec/g7221.c (modified) (3 diffs)
-
pjmedia/src/pjmedia-codec/g7221_sdp_match.c (added)
-
pjmedia/src/pjmedia-codec/ipp_codecs.c (modified) (3 diffs)
-
pjmedia/src/pjmedia-codec/opencore_amrnb.c (modified) (4 diffs)
-
pjmedia/src/pjmedia-codec/passthrough.c (modified) (4 diffs)
-
pjmedia/src/pjmedia/sdp_neg.c (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/build.symbian/pjmedia.mmp
r3671 r3911 92 92 SOURCEPATH ..\pjmedia\src\pjmedia-codec 93 93 SOURCE audio_codecs.c 94 SOURCE amr_sdp_match.c 95 SOURCE g7221_sdp_match.c 94 96 95 97 -
pjproject/trunk/pjmedia/build/Makefile
r3669 r3911 114 114 h263_packetizer.o h264_packetizer.o \ 115 115 $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ 116 ipp_codecs.o $(CODEC_OBJS) 116 ipp_codecs.o $(CODEC_OBJS) \ 117 g7221_sdp_match.o amr_sdp_match.o 117 118 export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \ 118 119 $(ILBC_CFLAGS) $(IPP_CFLAGS) $(G7221_CFLAGS) -
pjproject/trunk/pjmedia/build/pjmedia_codec.vcproj
r3841 r3911 224 224 </Configuration> 225 225 <Configuration 226 Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" 227 ConfigurationType="4" 228 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" 229 ATLMinimizesCRunTimeLibraryUsage="false" 230 CharacterSet="1" 231 > 232 <Tool 233 Name="VCPreBuildEventTool" 234 /> 235 <Tool 236 Name="VCCustomBuildTool" 237 /> 238 <Tool 239 Name="VCXMLDataGeneratorTool" 240 /> 241 <Tool 242 Name="VCWebServiceProxyGeneratorTool" 243 /> 244 <Tool 245 Name="VCMIDLTool" 246 /> 247 <Tool 248 Name="VCCLCompilerTool" 249 ExecutionBucket="7" 250 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 251 PreprocessorDefinitions="_LIB;" 252 PrecompiledHeaderFile="" 253 /> 254 <Tool 255 Name="VCManagedResourceCompilerTool" 256 /> 257 <Tool 258 Name="VCResourceCompilerTool" 259 /> 260 <Tool 261 Name="VCPreLinkEventTool" 262 /> 263 <Tool 264 Name="VCLibrarianTool" 265 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 266 /> 267 <Tool 268 Name="VCALinkTool" 269 /> 270 <Tool 271 Name="VCXDCMakeTool" 272 /> 273 <Tool 274 Name="VCBscMakeTool" 275 /> 276 <Tool 277 Name="VCCodeSignTool" 278 /> 279 <Tool 280 Name="VCPostBuildEventTool" 281 /> 282 <DeploymentTool 283 ForceDirty="-1" 284 RemoteDirectory="" 285 RegisterOutput="0" 286 AdditionalFiles="" 287 /> 288 <DebuggerTool 289 /> 290 </Configuration> 291 <Configuration 292 Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" 293 ConfigurationType="4" 294 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" 295 ATLMinimizesCRunTimeLibraryUsage="false" 296 CharacterSet="1" 297 > 298 <Tool 299 Name="VCPreBuildEventTool" 300 /> 301 <Tool 302 Name="VCCustomBuildTool" 303 /> 304 <Tool 305 Name="VCXMLDataGeneratorTool" 306 /> 307 <Tool 308 Name="VCWebServiceProxyGeneratorTool" 309 /> 310 <Tool 311 Name="VCMIDLTool" 312 /> 313 <Tool 314 Name="VCCLCompilerTool" 315 ExecutionBucket="7" 316 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 317 PreprocessorDefinitions="_LIB;" 318 PrecompiledHeaderFile="" 319 /> 320 <Tool 321 Name="VCManagedResourceCompilerTool" 322 /> 323 <Tool 324 Name="VCResourceCompilerTool" 325 /> 326 <Tool 327 Name="VCPreLinkEventTool" 328 /> 329 <Tool 330 Name="VCLibrarianTool" 331 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 332 /> 333 <Tool 334 Name="VCALinkTool" 335 /> 336 <Tool 337 Name="VCXDCMakeTool" 338 /> 339 <Tool 340 Name="VCBscMakeTool" 341 /> 342 <Tool 343 Name="VCCodeSignTool" 344 /> 345 <Tool 346 Name="VCPostBuildEventTool" 347 /> 348 <DeploymentTool 349 ForceDirty="-1" 350 RemoteDirectory="" 351 RegisterOutput="0" 352 AdditionalFiles="" 353 /> 354 <DebuggerTool 355 /> 356 </Configuration> 357 <Configuration 358 Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 359 ConfigurationType="4" 360 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 361 ATLMinimizesCRunTimeLibraryUsage="false" 362 CharacterSet="1" 363 > 364 <Tool 365 Name="VCPreBuildEventTool" 366 /> 367 <Tool 368 Name="VCCustomBuildTool" 369 /> 370 <Tool 371 Name="VCXMLDataGeneratorTool" 372 /> 373 <Tool 374 Name="VCWebServiceProxyGeneratorTool" 375 /> 376 <Tool 377 Name="VCMIDLTool" 378 /> 379 <Tool 380 Name="VCCLCompilerTool" 381 ExecutionBucket="7" 382 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 383 PreprocessorDefinitions="_LIB;" 384 PrecompiledHeaderFile="" 385 /> 386 <Tool 387 Name="VCManagedResourceCompilerTool" 388 /> 389 <Tool 390 Name="VCResourceCompilerTool" 391 /> 392 <Tool 393 Name="VCPreLinkEventTool" 394 /> 395 <Tool 396 Name="VCLibrarianTool" 397 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 398 /> 399 <Tool 400 Name="VCALinkTool" 401 /> 402 <Tool 403 Name="VCXDCMakeTool" 404 /> 405 <Tool 406 Name="VCBscMakeTool" 407 /> 408 <Tool 409 Name="VCCodeSignTool" 410 /> 411 <Tool 412 Name="VCPostBuildEventTool" 413 /> 414 <DeploymentTool 415 ForceDirty="-1" 416 RemoteDirectory="" 417 RegisterOutput="0" 418 AdditionalFiles="" 419 /> 420 <DebuggerTool 421 /> 422 </Configuration> 423 <Configuration 424 Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 425 ConfigurationType="4" 426 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 427 ATLMinimizesCRunTimeLibraryUsage="false" 428 CharacterSet="1" 429 > 430 <Tool 431 Name="VCPreBuildEventTool" 432 /> 433 <Tool 434 Name="VCCustomBuildTool" 435 /> 436 <Tool 437 Name="VCXMLDataGeneratorTool" 438 /> 439 <Tool 440 Name="VCWebServiceProxyGeneratorTool" 441 /> 442 <Tool 443 Name="VCMIDLTool" 444 /> 445 <Tool 446 Name="VCCLCompilerTool" 447 ExecutionBucket="7" 448 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 449 PreprocessorDefinitions="_LIB;" 450 PrecompiledHeaderFile="" 451 /> 452 <Tool 453 Name="VCManagedResourceCompilerTool" 454 /> 455 <Tool 456 Name="VCResourceCompilerTool" 457 /> 458 <Tool 459 Name="VCPreLinkEventTool" 460 /> 461 <Tool 462 Name="VCLibrarianTool" 463 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 464 /> 465 <Tool 466 Name="VCALinkTool" 467 /> 468 <Tool 469 Name="VCXDCMakeTool" 470 /> 471 <Tool 472 Name="VCBscMakeTool" 473 /> 474 <Tool 475 Name="VCCodeSignTool" 476 /> 477 <Tool 478 Name="VCPostBuildEventTool" 479 /> 480 <DeploymentTool 481 ForceDirty="-1" 482 RemoteDirectory="" 483 RegisterOutput="0" 484 AdditionalFiles="" 485 /> 486 <DebuggerTool 487 /> 488 </Configuration> 489 <Configuration 226 490 Name="Release|Win32" 227 491 ConfigurationType="4" … … 414 678 </Configuration> 415 679 <Configuration 680 Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" 681 ConfigurationType="4" 682 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" 683 ATLMinimizesCRunTimeLibraryUsage="false" 684 CharacterSet="1" 685 > 686 <Tool 687 Name="VCPreBuildEventTool" 688 /> 689 <Tool 690 Name="VCCustomBuildTool" 691 /> 692 <Tool 693 Name="VCXMLDataGeneratorTool" 694 /> 695 <Tool 696 Name="VCWebServiceProxyGeneratorTool" 697 /> 698 <Tool 699 Name="VCMIDLTool" 700 /> 701 <Tool 702 Name="VCCLCompilerTool" 703 ExecutionBucket="7" 704 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 705 PreprocessorDefinitions="_LIB;" 706 PrecompiledHeaderFile="" 707 /> 708 <Tool 709 Name="VCManagedResourceCompilerTool" 710 /> 711 <Tool 712 Name="VCResourceCompilerTool" 713 /> 714 <Tool 715 Name="VCPreLinkEventTool" 716 /> 717 <Tool 718 Name="VCLibrarianTool" 719 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 720 /> 721 <Tool 722 Name="VCALinkTool" 723 /> 724 <Tool 725 Name="VCXDCMakeTool" 726 /> 727 <Tool 728 Name="VCBscMakeTool" 729 /> 730 <Tool 731 Name="VCCodeSignTool" 732 /> 733 <Tool 734 Name="VCPostBuildEventTool" 735 /> 736 <DeploymentTool 737 ForceDirty="-1" 738 RemoteDirectory="" 739 RegisterOutput="0" 740 AdditionalFiles="" 741 /> 742 <DebuggerTool 743 /> 744 </Configuration> 745 <Configuration 746 Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" 747 ConfigurationType="4" 748 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" 749 ATLMinimizesCRunTimeLibraryUsage="false" 750 CharacterSet="1" 751 > 752 <Tool 753 Name="VCPreBuildEventTool" 754 /> 755 <Tool 756 Name="VCCustomBuildTool" 757 /> 758 <Tool 759 Name="VCXMLDataGeneratorTool" 760 /> 761 <Tool 762 Name="VCWebServiceProxyGeneratorTool" 763 /> 764 <Tool 765 Name="VCMIDLTool" 766 /> 767 <Tool 768 Name="VCCLCompilerTool" 769 ExecutionBucket="7" 770 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 771 PreprocessorDefinitions="_LIB;" 772 PrecompiledHeaderFile="" 773 /> 774 <Tool 775 Name="VCManagedResourceCompilerTool" 776 /> 777 <Tool 778 Name="VCResourceCompilerTool" 779 /> 780 <Tool 781 Name="VCPreLinkEventTool" 782 /> 783 <Tool 784 Name="VCLibrarianTool" 785 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 786 /> 787 <Tool 788 Name="VCALinkTool" 789 /> 790 <Tool 791 Name="VCXDCMakeTool" 792 /> 793 <Tool 794 Name="VCBscMakeTool" 795 /> 796 <Tool 797 Name="VCCodeSignTool" 798 /> 799 <Tool 800 Name="VCPostBuildEventTool" 801 /> 802 <DeploymentTool 803 ForceDirty="-1" 804 RemoteDirectory="" 805 RegisterOutput="0" 806 AdditionalFiles="" 807 /> 808 <DebuggerTool 809 /> 810 </Configuration> 811 <Configuration 812 Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 813 ConfigurationType="4" 814 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 815 ATLMinimizesCRunTimeLibraryUsage="false" 816 CharacterSet="1" 817 > 818 <Tool 819 Name="VCPreBuildEventTool" 820 /> 821 <Tool 822 Name="VCCustomBuildTool" 823 /> 824 <Tool 825 Name="VCXMLDataGeneratorTool" 826 /> 827 <Tool 828 Name="VCWebServiceProxyGeneratorTool" 829 /> 830 <Tool 831 Name="VCMIDLTool" 832 /> 833 <Tool 834 Name="VCCLCompilerTool" 835 ExecutionBucket="7" 836 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 837 PreprocessorDefinitions="_LIB;" 838 PrecompiledHeaderFile="" 839 /> 840 <Tool 841 Name="VCManagedResourceCompilerTool" 842 /> 843 <Tool 844 Name="VCResourceCompilerTool" 845 /> 846 <Tool 847 Name="VCPreLinkEventTool" 848 /> 849 <Tool 850 Name="VCLibrarianTool" 851 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 852 /> 853 <Tool 854 Name="VCALinkTool" 855 /> 856 <Tool 857 Name="VCXDCMakeTool" 858 /> 859 <Tool 860 Name="VCBscMakeTool" 861 /> 862 <Tool 863 Name="VCCodeSignTool" 864 /> 865 <Tool 866 Name="VCPostBuildEventTool" 867 /> 868 <DeploymentTool 869 ForceDirty="-1" 870 RemoteDirectory="" 871 RegisterOutput="0" 872 AdditionalFiles="" 873 /> 874 <DebuggerTool 875 /> 876 </Configuration> 877 <Configuration 878 Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 879 ConfigurationType="4" 880 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 881 ATLMinimizesCRunTimeLibraryUsage="false" 882 CharacterSet="1" 883 > 884 <Tool 885 Name="VCPreBuildEventTool" 886 /> 887 <Tool 888 Name="VCCustomBuildTool" 889 /> 890 <Tool 891 Name="VCXMLDataGeneratorTool" 892 /> 893 <Tool 894 Name="VCWebServiceProxyGeneratorTool" 895 /> 896 <Tool 897 Name="VCMIDLTool" 898 /> 899 <Tool 900 Name="VCCLCompilerTool" 901 ExecutionBucket="7" 902 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 903 PreprocessorDefinitions="_LIB;" 904 PrecompiledHeaderFile="" 905 /> 906 <Tool 907 Name="VCManagedResourceCompilerTool" 908 /> 909 <Tool 910 Name="VCResourceCompilerTool" 911 /> 912 <Tool 913 Name="VCPreLinkEventTool" 914 /> 915 <Tool 916 Name="VCLibrarianTool" 917 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 918 /> 919 <Tool 920 Name="VCALinkTool" 921 /> 922 <Tool 923 Name="VCXDCMakeTool" 924 /> 925 <Tool 926 Name="VCBscMakeTool" 927 /> 928 <Tool 929 Name="VCCodeSignTool" 930 /> 931 <Tool 932 Name="VCPostBuildEventTool" 933 /> 934 <DeploymentTool 935 ForceDirty="-1" 936 RemoteDirectory="" 937 RegisterOutput="0" 938 AdditionalFiles="" 939 /> 940 <DebuggerTool 941 /> 942 </Configuration> 943 <Configuration 416 944 Name="Debug-Static|Win32" 417 945 ConfigurationType="4" … … 604 1132 </Configuration> 605 1133 <Configuration 1134 Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)" 1135 ConfigurationType="4" 1136 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" 1137 ATLMinimizesCRunTimeLibraryUsage="false" 1138 CharacterSet="1" 1139 > 1140 <Tool 1141 Name="VCPreBuildEventTool" 1142 /> 1143 <Tool 1144 Name="VCCustomBuildTool" 1145 /> 1146 <Tool 1147 Name="VCXMLDataGeneratorTool" 1148 /> 1149 <Tool 1150 Name="VCWebServiceProxyGeneratorTool" 1151 /> 1152 <Tool 1153 Name="VCMIDLTool" 1154 /> 1155 <Tool 1156 Name="VCCLCompilerTool" 1157 ExecutionBucket="7" 1158 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 1159 PreprocessorDefinitions="_LIB;" 1160 PrecompiledHeaderFile="" 1161 /> 1162 <Tool 1163 Name="VCManagedResourceCompilerTool" 1164 /> 1165 <Tool 1166 Name="VCResourceCompilerTool" 1167 /> 1168 <Tool 1169 Name="VCPreLinkEventTool" 1170 /> 1171 <Tool 1172 Name="VCLibrarianTool" 1173 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 1174 /> 1175 <Tool 1176 Name="VCALinkTool" 1177 /> 1178 <Tool 1179 Name="VCXDCMakeTool" 1180 /> 1181 <Tool 1182 Name="VCBscMakeTool" 1183 /> 1184 <Tool 1185 Name="VCCodeSignTool" 1186 /> 1187 <Tool 1188 Name="VCPostBuildEventTool" 1189 /> 1190 <DeploymentTool 1191 ForceDirty="-1" 1192 RemoteDirectory="" 1193 RegisterOutput="0" 1194 AdditionalFiles="" 1195 /> 1196 <DebuggerTool 1197 /> 1198 </Configuration> 1199 <Configuration 1200 Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)" 1201 ConfigurationType="4" 1202 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" 1203 ATLMinimizesCRunTimeLibraryUsage="false" 1204 CharacterSet="1" 1205 > 1206 <Tool 1207 Name="VCPreBuildEventTool" 1208 /> 1209 <Tool 1210 Name="VCCustomBuildTool" 1211 /> 1212 <Tool 1213 Name="VCXMLDataGeneratorTool" 1214 /> 1215 <Tool 1216 Name="VCWebServiceProxyGeneratorTool" 1217 /> 1218 <Tool 1219 Name="VCMIDLTool" 1220 /> 1221 <Tool 1222 Name="VCCLCompilerTool" 1223 ExecutionBucket="7" 1224 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 1225 PreprocessorDefinitions="_LIB;" 1226 PrecompiledHeaderFile="" 1227 /> 1228 <Tool 1229 Name="VCManagedResourceCompilerTool" 1230 /> 1231 <Tool 1232 Name="VCResourceCompilerTool" 1233 /> 1234 <Tool 1235 Name="VCPreLinkEventTool" 1236 /> 1237 <Tool 1238 Name="VCLibrarianTool" 1239 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 1240 /> 1241 <Tool 1242 Name="VCALinkTool" 1243 /> 1244 <Tool 1245 Name="VCXDCMakeTool" 1246 /> 1247 <Tool 1248 Name="VCBscMakeTool" 1249 /> 1250 <Tool 1251 Name="VCCodeSignTool" 1252 /> 1253 <Tool 1254 Name="VCPostBuildEventTool" 1255 /> 1256 <DeploymentTool 1257 ForceDirty="-1" 1258 RemoteDirectory="" 1259 RegisterOutput="0" 1260 AdditionalFiles="" 1261 /> 1262 <DebuggerTool 1263 /> 1264 </Configuration> 1265 <Configuration 1266 Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 1267 ConfigurationType="4" 1268 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 1269 ATLMinimizesCRunTimeLibraryUsage="false" 1270 CharacterSet="1" 1271 > 1272 <Tool 1273 Name="VCPreBuildEventTool" 1274 /> 1275 <Tool 1276 Name="VCCustomBuildTool" 1277 /> 1278 <Tool 1279 Name="VCXMLDataGeneratorTool" 1280 /> 1281 <Tool 1282 Name="VCWebServiceProxyGeneratorTool" 1283 /> 1284 <Tool 1285 Name="VCMIDLTool" 1286 /> 1287 <Tool 1288 Name="VCCLCompilerTool" 1289 ExecutionBucket="7" 1290 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 1291 PreprocessorDefinitions="_LIB;" 1292 PrecompiledHeaderFile="" 1293 /> 1294 <Tool 1295 Name="VCManagedResourceCompilerTool" 1296 /> 1297 <Tool 1298 Name="VCResourceCompilerTool" 1299 /> 1300 <Tool 1301 Name="VCPreLinkEventTool" 1302 /> 1303 <Tool 1304 Name="VCLibrarianTool" 1305 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 1306 /> 1307 <Tool 1308 Name="VCALinkTool" 1309 /> 1310 <Tool 1311 Name="VCXDCMakeTool" 1312 /> 1313 <Tool 1314 Name="VCBscMakeTool" 1315 /> 1316 <Tool 1317 Name="VCCodeSignTool" 1318 /> 1319 <Tool 1320 Name="VCPostBuildEventTool" 1321 /> 1322 <DeploymentTool 1323 ForceDirty="-1" 1324 RemoteDirectory="" 1325 RegisterOutput="0" 1326 AdditionalFiles="" 1327 /> 1328 <DebuggerTool 1329 /> 1330 </Configuration> 1331 <Configuration 1332 Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 1333 ConfigurationType="4" 1334 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 1335 ATLMinimizesCRunTimeLibraryUsage="false" 1336 CharacterSet="1" 1337 > 1338 <Tool 1339 Name="VCPreBuildEventTool" 1340 /> 1341 <Tool 1342 Name="VCCustomBuildTool" 1343 /> 1344 <Tool 1345 Name="VCXMLDataGeneratorTool" 1346 /> 1347 <Tool 1348 Name="VCWebServiceProxyGeneratorTool" 1349 /> 1350 <Tool 1351 Name="VCMIDLTool" 1352 /> 1353 <Tool 1354 Name="VCCLCompilerTool" 1355 ExecutionBucket="7" 1356 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 1357 PreprocessorDefinitions="_LIB;" 1358 PrecompiledHeaderFile="" 1359 /> 1360 <Tool 1361 Name="VCManagedResourceCompilerTool" 1362 /> 1363 <Tool 1364 Name="VCResourceCompilerTool" 1365 /> 1366 <Tool 1367 Name="VCPreLinkEventTool" 1368 /> 1369 <Tool 1370 Name="VCLibrarianTool" 1371 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 1372 /> 1373 <Tool 1374 Name="VCALinkTool" 1375 /> 1376 <Tool 1377 Name="VCXDCMakeTool" 1378 /> 1379 <Tool 1380 Name="VCBscMakeTool" 1381 /> 1382 <Tool 1383 Name="VCCodeSignTool" 1384 /> 1385 <Tool 1386 Name="VCPostBuildEventTool" 1387 /> 1388 <DeploymentTool 1389 ForceDirty="-1" 1390 RemoteDirectory="" 1391 RegisterOutput="0" 1392 AdditionalFiles="" 1393 /> 1394 <DebuggerTool 1395 /> 1396 </Configuration> 1397 <Configuration 606 1398 Name="Release-Dynamic|Win32" 607 1399 ConfigurationType="4" … … 794 1586 </Configuration> 795 1587 <Configuration 1588 Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)" 1589 ConfigurationType="4" 1590 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" 1591 ATLMinimizesCRunTimeLibraryUsage="false" 1592 CharacterSet="1" 1593 > 1594 <Tool 1595 Name="VCPreBuildEventTool" 1596 /> 1597 <Tool 1598 Name="VCCustomBuildTool" 1599 /> 1600 <Tool 1601 Name="VCXMLDataGeneratorTool" 1602 /> 1603 <Tool 1604 Name="VCWebServiceProxyGeneratorTool" 1605 /> 1606 <Tool 1607 Name="VCMIDLTool" 1608 /> 1609 <Tool 1610 Name="VCCLCompilerTool" 1611 ExecutionBucket="7" 1612 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 1613 PreprocessorDefinitions="_LIB;" 1614 PrecompiledHeaderFile="" 1615 /> 1616 <Tool 1617 Name="VCManagedResourceCompilerTool" 1618 /> 1619 <Tool 1620 Name="VCResourceCompilerTool" 1621 /> 1622 <Tool 1623 Name="VCPreLinkEventTool" 1624 /> 1625 <Tool 1626 Name="VCLibrarianTool" 1627 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 1628 /> 1629 <Tool 1630 Name="VCALinkTool" 1631 /> 1632 <Tool 1633 Name="VCXDCMakeTool" 1634 /> 1635 <Tool 1636 Name="VCBscMakeTool" 1637 /> 1638 <Tool 1639 Name="VCCodeSignTool" 1640 /> 1641 <Tool 1642 Name="VCPostBuildEventTool" 1643 /> 1644 <DeploymentTool 1645 ForceDirty="-1" 1646 RemoteDirectory="" 1647 RegisterOutput="0" 1648 AdditionalFiles="" 1649 /> 1650 <DebuggerTool 1651 /> 1652 </Configuration> 1653 <Configuration 1654 Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)" 1655 ConfigurationType="4" 1656 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" 1657 ATLMinimizesCRunTimeLibraryUsage="false" 1658 CharacterSet="1" 1659 > 1660 <Tool 1661 Name="VCPreBuildEventTool" 1662 /> 1663 <Tool 1664 Name="VCCustomBuildTool" 1665 /> 1666 <Tool 1667 Name="VCXMLDataGeneratorTool" 1668 /> 1669 <Tool 1670 Name="VCWebServiceProxyGeneratorTool" 1671 /> 1672 <Tool 1673 Name="VCMIDLTool" 1674 /> 1675 <Tool 1676 Name="VCCLCompilerTool" 1677 ExecutionBucket="7" 1678 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 1679 PreprocessorDefinitions="_LIB;" 1680 PrecompiledHeaderFile="" 1681 /> 1682 <Tool 1683 Name="VCManagedResourceCompilerTool" 1684 /> 1685 <Tool 1686 Name="VCResourceCompilerTool" 1687 /> 1688 <Tool 1689 Name="VCPreLinkEventTool" 1690 /> 1691 <Tool 1692 Name="VCLibrarianTool" 1693 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 1694 /> 1695 <Tool 1696 Name="VCALinkTool" 1697 /> 1698 <Tool 1699 Name="VCXDCMakeTool" 1700 /> 1701 <Tool 1702 Name="VCBscMakeTool" 1703 /> 1704 <Tool 1705 Name="VCCodeSignTool" 1706 /> 1707 <Tool 1708 Name="VCPostBuildEventTool" 1709 /> 1710 <DeploymentTool 1711 ForceDirty="-1" 1712 RemoteDirectory="" 1713 RegisterOutput="0" 1714 AdditionalFiles="" 1715 /> 1716 <DebuggerTool 1717 /> 1718 </Configuration> 1719 <Configuration 1720 Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 1721 ConfigurationType="4" 1722 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 1723 ATLMinimizesCRunTimeLibraryUsage="false" 1724 CharacterSet="1" 1725 > 1726 <Tool 1727 Name="VCPreBuildEventTool" 1728 /> 1729 <Tool 1730 Name="VCCustomBuildTool" 1731 /> 1732 <Tool 1733 Name="VCXMLDataGeneratorTool" 1734 /> 1735 <Tool 1736 Name="VCWebServiceProxyGeneratorTool" 1737 /> 1738 <Tool 1739 Name="VCMIDLTool" 1740 /> 1741 <Tool 1742 Name="VCCLCompilerTool" 1743 ExecutionBucket="7" 1744 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 1745 PreprocessorDefinitions="_LIB;" 1746 PrecompiledHeaderFile="" 1747 /> 1748 <Tool 1749 Name="VCManagedResourceCompilerTool" 1750 /> 1751 <Tool 1752 Name="VCResourceCompilerTool" 1753 /> 1754 <Tool 1755 Name="VCPreLinkEventTool" 1756 /> 1757 <Tool 1758 Name="VCLibrarianTool" 1759 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 1760 /> 1761 <Tool 1762 Name="VCALinkTool" 1763 /> 1764 <Tool 1765 Name="VCXDCMakeTool" 1766 /> 1767 <Tool 1768 Name="VCBscMakeTool" 1769 /> 1770 <Tool 1771 Name="VCCodeSignTool" 1772 /> 1773 <Tool 1774 Name="VCPostBuildEventTool" 1775 /> 1776 <DeploymentTool 1777 ForceDirty="-1" 1778 RemoteDirectory="" 1779 RegisterOutput="0" 1780 AdditionalFiles="" 1781 /> 1782 <DebuggerTool 1783 /> 1784 </Configuration> 1785 <Configuration 1786 Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 1787 ConfigurationType="4" 1788 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" 1789 ATLMinimizesCRunTimeLibraryUsage="false" 1790 CharacterSet="1" 1791 > 1792 <Tool 1793 Name="VCPreBuildEventTool" 1794 /> 1795 <Tool 1796 Name="VCCustomBuildTool" 1797 /> 1798 <Tool 1799 Name="VCXMLDataGeneratorTool" 1800 /> 1801 <Tool 1802 Name="VCWebServiceProxyGeneratorTool" 1803 /> 1804 <Tool 1805 Name="VCMIDLTool" 1806 /> 1807 <Tool 1808 Name="VCCLCompilerTool" 1809 ExecutionBucket="7" 1810 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 1811 PreprocessorDefinitions="_LIB;" 1812 PrecompiledHeaderFile="" 1813 /> 1814 <Tool 1815 Name="VCManagedResourceCompilerTool" 1816 /> 1817 <Tool 1818 Name="VCResourceCompilerTool" 1819 /> 1820 <Tool 1821 Name="VCPreLinkEventTool" 1822 /> 1823 <Tool 1824 Name="VCLibrarianTool" 1825 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 1826 /> 1827 <Tool 1828 Name="VCALinkTool" 1829 /> 1830 <Tool 1831 Name="VCXDCMakeTool" 1832 /> 1833 <Tool 1834 Name="VCBscMakeTool" 1835 /> 1836 <Tool 1837 Name="VCCodeSignTool" 1838 /> 1839 <Tool 1840 Name="VCPostBuildEventTool" 1841 /> 1842 <DeploymentTool 1843 ForceDirty="-1" 1844 RemoteDirectory="" 1845 RegisterOutput="0" 1846 AdditionalFiles="" 1847 /> 1848 <DebuggerTool 1849 /> 1850 </Configuration> 1851 <Configuration 796 1852 Name="Debug-Dynamic|Win32" 797 1853 ConfigurationType="4" … … 984 2040 </Configuration> 985 2041 <Configuration 2042 Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)" 2043 ConfigurationType="4" 2044 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" 2045 ATLMinimizesCRunTimeLibraryUsage="false" 2046 CharacterSet="1" 2047 > 2048 <Tool 2049 Name="VCPreBuildEventTool" 2050 /> 2051 <Tool 2052 Name="VCCustomBuildTool" 2053 /> 2054 <Tool 2055 Name="VCXMLDataGeneratorTool" 2056 /> 2057 <Tool 2058 Name="VCWebServiceProxyGeneratorTool" 2059 /> 2060 <Tool 2061 Name="VCMIDLTool" 2062 /> 2063 <Tool 2064 Name="VCCLCompilerTool" 2065 ExecutionBucket="7" 2066 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 2067 PreprocessorDefinitions="_LIB;" 2068 PrecompiledHeaderFile="" 2069 /> 2070 <Tool 2071 Name="VCManagedResourceCompilerTool" 2072 /> 2073 <Tool 2074 Name="VCResourceCompilerTool" 2075 /> 2076 <Tool 2077 Name="VCPreLinkEventTool" 2078 /> 2079 <Tool 2080 Name="VCLibrarianTool" 2081 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" 2082 /> 2083 <Tool 2084 Name="VCALinkTool" 2085 /> 2086 <Tool 2087 Name="VCXDCMakeTool" 2088 /> 2089 <Tool 2090 Name="VCBscMakeTool" 2091 /> 2092 <Tool 2093 Name="VCCodeSignTool" 2094 /> 2095 <Tool 2096 Name="VCPostBuildEventTool" 2097 /> 2098 <DeploymentTool 2099 ForceDirty="-1" 2100 RemoteDirectory="" 2101 RegisterOutput="0" 2102 AdditionalFiles="" 2103 /> 2104 <DebuggerTool 2105 /> 2106 </Configuration> 2107 <Configuration 2108 Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)" 2109 ConfigurationType="4" 2110 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" 2111 ATLMinimizesCRunTimeLibraryUsage="false" 2112 CharacterSet="1" 2113 > 2114 <Tool 2115 Name="VCPreBuildEventTool" 2116 /> 2117 <Tool 2118 Name="VCCustomBuildTool" 2119 /> 2120 <Tool 2121 Name="VCXMLDataGeneratorTool" 2122 /> 2123 <Tool 2124 Name="VCWebServiceProxyGeneratorTool" 2125 /> 2126 <Tool 2127 Name="VCMIDLTool" 2128 /> 2129 <Tool 2130 Name="VCCLCompilerTool" 2131 ExecutionBucket="7" 2132 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 2133 PreprocessorDefinitions="_LIB;" 2134 PrecompiledHeaderFile="" 2135 /> 2136 <Tool 2137 Name="VCManagedResourceCompilerTool" 2138 /> 2139 <Tool 2140 Name="VCResourceCompilerTool" 2141 /> 2142 <Tool 2143 Name="VCPreLinkEventTool" 2144 /> 2145 <Tool 2146 Name="VCLibrarianTool" 2147 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" 2148 /> 2149 <Tool 2150 Name="VCALinkTool" 2151 /> 2152 <Tool 2153 Name="VCXDCMakeTool" 2154 /> 2155 <Tool 2156 Name="VCBscMakeTool" 2157 /> 2158 <Tool 2159 Name="VCCodeSignTool" 2160 /> 2161 <Tool 2162 Name="VCPostBuildEventTool" 2163 /> 2164 <DeploymentTool 2165 ForceDirty="-1" 2166 RemoteDirectory="" 2167 RegisterOutput="0" 2168 AdditionalFiles="" 2169 /> 2170 <DebuggerTool 2171 /> 2172 </Configuration> 2173 <Configuration 2174 Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" 2175 ConfigurationType="4" 2176 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 2177 ATLMinimizesCRunTimeLibraryUsage="false" 2178 CharacterSet="1" 2179 > 2180 <Tool 2181 Name="VCPreBuildEventTool" 2182 /> 2183 <Tool 2184 Name="VCCustomBuildTool" 2185 /> 2186 <Tool 2187 Name="VCXMLDataGeneratorTool" 2188 /> 2189 <Tool 2190 Name="VCWebServiceProxyGeneratorTool" 2191 /> 2192 <Tool 2193 Name="VCMIDLTool" 2194 /> 2195 <Tool 2196 Name="VCCLCompilerTool" 2197 ExecutionBucket="7" 2198 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 2199 PreprocessorDefinitions="_LIB;" 2200 PrecompiledHeaderFile="" 2201 /> 2202 <Tool 2203 Name="VCManagedResourceCompilerTool" 2204 /> 2205 <Tool 2206 Name="VCResourceCompilerTool" 2207 /> 2208 <Tool 2209 Name="VCPreLinkEventTool" 2210 /> 2211 <Tool 2212 Name="VCLibrarianTool" 2213 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" 2214 /> 2215 <Tool 2216 Name="VCALinkTool" 2217 /> 2218 <Tool 2219 Name="VCXDCMakeTool" 2220 /> 2221 <Tool 2222 Name="VCBscMakeTool" 2223 /> 2224 <Tool 2225 Name="VCCodeSignTool" 2226 /> 2227 <Tool 2228 Name="VCPostBuildEventTool" 2229 /> 2230 <DeploymentTool 2231 ForceDirty="-1" 2232 RemoteDirectory="" 2233 RegisterOutput="0" 2234 AdditionalFiles="" 2235 /> 2236 <DebuggerTool 2237 /> 2238 </Configuration> 2239 <Configuration 2240 Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" 2241 ConfigurationType="4" 2242 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" 2243 ATLMinimizesCRunTimeLibraryUsage="false" 2244 CharacterSet="1" 2245 > 2246 <Tool 2247 Name="VCPreBuildEventTool" 2248 /> 2249 <Tool 2250 Name="VCCustomBuildTool" 2251 /> 2252 <Tool 2253 Name="VCXMLDataGeneratorTool" 2254 /> 2255 <Tool 2256 Name="VCWebServiceProxyGeneratorTool" 2257 /> 2258 <Tool 2259 Name="VCMIDLTool" 2260 /> 2261 <Tool 2262 Name="VCCLCompilerTool" 2263 ExecutionBucket="7" 2264 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party" 2265 PreprocessorDefinitions="_LIB;" 2266 PrecompiledHeaderFile="" 2267 /> 2268 <Tool 2269 Name="VCManagedResourceCompilerTool" 2270 /> 2271 <Tool 2272 Name="VCResourceCompilerTool" 2273 /> 2274 <Tool 2275 Name="VCPreLinkEventTool" 2276 /> 2277 <Tool 2278 Name="VCLibrarianTool" 2279 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" 2280 /> 2281 <Tool 2282 Name="VCALinkTool" 2283 /> 2284 <Tool 2285 Name="VCXDCMakeTool" 2286 /> 2287 <Tool 2288 Name="VCBscMakeTool" 2289 /> 2290 <Tool 2291 Name="VCCodeSignTool" 2292 /> 2293 <Tool 2294 Name="VCPostBuildEventTool" 2295 /> 2296 <DeploymentTool 2297 ForceDirty="-1" 2298 RemoteDirectory="" 2299 RegisterOutput="0" 2300 AdditionalFiles="" 2301 /> 2302 <DebuggerTool 2303 /> 2304 </Configuration> 2305 <Configuration 986 2306 Name="Release-Static|Win32" 987 2307 ConfigurationType="4" … … 1148 2468 Name="VCLibrarianTool" 1149 2469 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" 1150 />1151 <Tool1152 Name="VCALinkTool"1153 />1154 <Tool1155 Name="VCXDCMakeTool"1156 />1157 <Tool1158 Name="VCBscMakeTool"1159 />1160 <Tool1161 Name="VCCodeSignTool"1162 />1163 <Tool1164 Name="VCPostBuildEventTool"1165 />1166 <DeploymentTool1167 ForceDirty="-1"1168 RemoteDirectory=""1169 RegisterOutput="0"1170 AdditionalFiles=""1171 />1172 <DebuggerTool1173 />1174 </Configuration>1175 <Configuration1176 Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"1177 ConfigurationType="4"1178 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"1179 ATLMinimizesCRunTimeLibraryUsage="false"1180 CharacterSet="1"1181 >1182 <Tool1183 Name="VCPreBuildEventTool"1184 />1185 <Tool1186 Name="VCCustomBuildTool"1187 />1188 <Tool1189 Name="VCXMLDataGeneratorTool"1190 />1191 <Tool1192 Name="VCWebServiceProxyGeneratorTool"1193 />1194 <Tool1195 Name="VCMIDLTool"1196 />1197 <Tool1198 Name="VCCLCompilerTool"1199 ExecutionBucket="7"1200 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"1201 PreprocessorDefinitions="_LIB;"1202 PrecompiledHeaderFile=""1203 />1204 <Tool1205 Name="VCManagedResourceCompilerTool"1206 />1207 <Tool1208 Name="VCResourceCompilerTool"1209 />1210 <Tool1211 Name="VCPreLinkEventTool"1212 />1213 <Tool1214 Name="VCLibrarianTool"1215 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"1216 />1217 <Tool1218 Name="VCALinkTool"1219 />1220 <Tool1221 Name="VCXDCMakeTool"1222 />1223 <Tool1224 Name="VCBscMakeTool"1225 />1226 <Tool1227 Name="VCCodeSignTool"1228 />1229 <Tool1230 Name="VCPostBuildEventTool"1231 />1232 <DeploymentTool1233 ForceDirty="-1"1234 RemoteDirectory=""1235 RegisterOutput="0"1236 AdditionalFiles=""1237 />1238 <DebuggerTool1239 />1240 </Configuration>1241 <Configuration1242 Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"1243 ConfigurationType="4"1244 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"1245 ATLMinimizesCRunTimeLibraryUsage="false"1246 CharacterSet="1"1247 >1248 <Tool1249 Name="VCPreBuildEventTool"1250 />1251 <Tool1252 Name="VCCustomBuildTool"1253 />1254 <Tool1255 Name="VCXMLDataGeneratorTool"1256 />1257 <Tool1258 Name="VCWebServiceProxyGeneratorTool"1259 />1260 <Tool1261 Name="VCMIDLTool"1262 />1263 <Tool1264 Name="VCCLCompilerTool"1265 ExecutionBucket="7"1266 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"1267 PreprocessorDefinitions="_LIB;"1268 PrecompiledHeaderFile=""1269 />1270 <Tool1271 Name="VCManagedResourceCompilerTool"1272 />1273 <Tool1274 Name="VCResourceCompilerTool"1275 />1276 <Tool1277 Name="VCPreLinkEventTool"1278 />1279 <Tool1280 Name="VCLibrarianTool"1281 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"1282 />1283 <Tool1284 Name="VCALinkTool"1285 />1286 <Tool1287 Name="VCXDCMakeTool"1288 />1289 <Tool1290 Name="VCBscMakeTool"1291 />1292 <Tool1293 Name="VCCodeSignTool"1294 />1295 <Tool1296 Name="VCPostBuildEventTool"1297 />1298 <DeploymentTool1299 ForceDirty="-1"1300 RemoteDirectory=""1301 RegisterOutput="0"1302 AdditionalFiles=""1303 />1304 <DebuggerTool1305 />1306 </Configuration>1307 <Configuration1308 Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"1309 ConfigurationType="4"1310 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"1311 ATLMinimizesCRunTimeLibraryUsage="false"1312 CharacterSet="1"1313 >1314 <Tool1315 Name="VCPreBuildEventTool"1316 />1317 <Tool1318 Name="VCCustomBuildTool"1319 />1320 <Tool1321 Name="VCXMLDataGeneratorTool"1322 />1323 <Tool1324 Name="VCWebServiceProxyGeneratorTool"1325 />1326 <Tool1327 Name="VCMIDLTool"1328 />1329 <Tool1330 Name="VCCLCompilerTool"1331 ExecutionBucket="7"1332 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"1333 PreprocessorDefinitions="_LIB;"1334 PrecompiledHeaderFile=""1335 />1336 <Tool1337 Name="VCManagedResourceCompilerTool"1338 />1339 <Tool1340 Name="VCResourceCompilerTool"1341 />1342 <Tool1343 Name="VCPreLinkEventTool"1344 />1345 <Tool1346 Name="VCLibrarianTool"1347 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"1348 />1349 <Tool1350 Name="VCALinkTool"1351 />1352 <Tool1353 Name="VCXDCMakeTool"1354 />1355 <Tool1356 Name="VCBscMakeTool"1357 />1358 <Tool1359 Name="VCCodeSignTool"1360 />1361 <Tool1362 Name="VCPostBuildEventTool"1363 />1364 <DeploymentTool1365 ForceDirty="-1"1366 RemoteDirectory=""1367 RegisterOutput="0"1368 AdditionalFiles=""1369 />1370 <DebuggerTool1371 />1372 </Configuration>1373 <Configuration1374 Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"1375 ConfigurationType="4"1376 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"1377 ATLMinimizesCRunTimeLibraryUsage="false"1378 CharacterSet="1"1379 >1380 <Tool1381 Name="VCPreBuildEventTool"1382 />1383 <Tool1384 Name="VCCustomBuildTool"1385 />1386 <Tool1387 Name="VCXMLDataGeneratorTool"1388 />1389 <Tool1390 Name="VCWebServiceProxyGeneratorTool"1391 />1392 <Tool1393 Name="VCMIDLTool"1394 />1395 <Tool1396 Name="VCCLCompilerTool"1397 ExecutionBucket="7"1398 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"1399 PreprocessorDefinitions="_LIB;"1400 PrecompiledHeaderFile=""1401 />1402 <Tool1403 Name="VCManagedResourceCompilerTool"1404 />1405 <Tool1406 Name="VCResourceCompilerTool"1407 />1408 <Tool1409 Name="VCPreLinkEventTool"1410 />1411 <Tool1412 Name="VCLibrarianTool"1413 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"1414 />1415 <Tool1416 Name="VCALinkTool"1417 />1418 <Tool1419 Name="VCXDCMakeTool"1420 />1421 <Tool1422 Name="VCBscMakeTool"1423 />1424 <Tool1425 Name="VCCodeSignTool"1426 />1427 <Tool1428 Name="VCPostBuildEventTool"1429 />1430 <DeploymentTool1431 ForceDirty="-1"1432 RemoteDirectory=""1433 RegisterOutput="0"1434 AdditionalFiles=""1435 />1436 <DebuggerTool1437 />1438 </Configuration>1439 <Configuration1440 Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"1441 ConfigurationType="4"1442 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"1443 ATLMinimizesCRunTimeLibraryUsage="false"1444 CharacterSet="1"1445 >1446 <Tool1447 Name="VCPreBuildEventTool"1448 />1449 <Tool1450 Name="VCCustomBuildTool"1451 />1452 <Tool1453 Name="VCXMLDataGeneratorTool"1454 />1455 <Tool1456 Name="VCWebServiceProxyGeneratorTool"1457 />1458 <Tool1459 Name="VCMIDLTool"1460 />1461 <Tool1462 Name="VCCLCompilerTool"1463 ExecutionBucket="7"1464 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"1465 PreprocessorDefinitions="_LIB;"1466 PrecompiledHeaderFile=""1467 />1468 <Tool1469 Name="VCManagedResourceCompilerTool"1470 />1471 <Tool1472 Name="VCResourceCompilerTool"1473 />1474 <Tool1475 Name="VCPreLinkEventTool"1476 />1477 <Tool1478 Name="VCLibrarianTool"1479 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"1480 />1481 <Tool1482 Name="VCALinkTool"1483 />1484 <Tool1485 Name="VCXDCMakeTool"1486 />1487 <Tool1488 Name="VCBscMakeTool"1489 />1490 <Tool1491 Name="VCCodeSignTool"1492 />1493 <Tool1494 Name="VCPostBuildEventTool"1495 />1496 <DeploymentTool1497 ForceDirty="-1"1498 RemoteDirectory=""1499 RegisterOutput="0"1500 AdditionalFiles=""1501 />1502 <DebuggerTool1503 />1504 </Configuration>1505 <Configuration1506 Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"1507 ConfigurationType="4"1508 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"1509 ATLMinimizesCRunTimeLibraryUsage="false"1510 CharacterSet="1"1511 >1512 <Tool1513 Name="VCPreBuildEventTool"1514 />1515 <Tool1516 Name="VCCustomBuildTool"1517 />1518 <Tool1519 Name="VCXMLDataGeneratorTool"1520 />1521 <Tool1522 Name="VCWebServiceProxyGeneratorTool"1523 />1524 <Tool1525 Name="VCMIDLTool"1526 />1527 <Tool1528 Name="VCCLCompilerTool"1529 ExecutionBucket="7"1530 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"1531 PreprocessorDefinitions="_LIB;"1532 PrecompiledHeaderFile=""1533 />1534 <Tool1535 Name="VCManagedResourceCompilerTool"1536 />1537 <Tool1538 Name="VCResourceCompilerTool"1539 />1540 <Tool1541 Name="VCPreLinkEventTool"1542 />1543 <Tool1544 Name="VCLibrarianTool"1545 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"1546 />1547 <Tool1548 Name="VCALinkTool"1549 />1550 <Tool1551 Name="VCXDCMakeTool"1552 />1553 <Tool1554 Name="VCBscMakeTool"1555 />1556 <Tool1557 Name="VCCodeSignTool"1558 />1559 <Tool1560 Name="VCPostBuildEventTool"1561 />1562 <DeploymentTool1563 ForceDirty="-1"1564 RemoteDirectory=""1565 RegisterOutput="0"1566 AdditionalFiles=""1567 />1568 <DebuggerTool1569 />1570 </Configuration>1571 <Configuration1572 Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"1573 ConfigurationType="4"1574 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"1575 ATLMinimizesCRunTimeLibraryUsage="false"1576 CharacterSet="1"1577 >1578 <Tool1579 Name="VCPreBuildEventTool"1580 />1581 <Tool1582 Name="VCCustomBuildTool"1583 />1584 <Tool1585 Name="VCXMLDataGeneratorTool"1586 />1587 <Tool1588 Name="VCWebServiceProxyGeneratorTool"1589 />1590 <Tool1591 Name="VCMIDLTool"1592 />1593 <Tool1594 Name="VCCLCompilerTool"1595 ExecutionBucket="7"1596 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"1597 PreprocessorDefinitions="_LIB;"1598 PrecompiledHeaderFile=""1599 />1600 <Tool1601 Name="VCManagedResourceCompilerTool"1602 />1603 <Tool1604 Name="VCResourceCompilerTool"1605 />1606 <Tool1607 Name="VCPreLinkEventTool"1608 />1609 <Tool1610 Name="VCLibrarianTool"1611 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"1612 />1613 <Tool1614 Name="VCALinkTool"1615 />1616 <Tool1617 Name="VCXDCMakeTool"1618 />1619 <Tool1620 Name="VCBscMakeTool"1621 />1622 <Tool1623 Name="VCCodeSignTool"1624 />1625 <Tool1626 Name="VCPostBuildEventTool"1627 />1628 <DeploymentTool1629 ForceDirty="-1"1630 RemoteDirectory=""1631 RegisterOutput="0"1632 AdditionalFiles=""1633 />1634 <DebuggerTool1635 />1636 </Configuration>1637 <Configuration1638 Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"1639 ConfigurationType="4"1640 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"1641 ATLMinimizesCRunTimeLibraryUsage="false"1642 CharacterSet="1"1643 >1644 <Tool1645 Name="VCPreBuildEventTool"1646 />1647 <Tool1648 Name="VCCustomBuildTool"1649 />1650 <Tool1651 Name="VCXMLDataGeneratorTool"1652 />1653 <Tool1654 Name="VCWebServiceProxyGeneratorTool"1655 />1656 <Tool1657 Name="VCMIDLTool"1658 />1659 <Tool1660 Name="VCCLCompilerTool"1661 ExecutionBucket="7"1662 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"1663 PreprocessorDefinitions="_LIB;"1664 PrecompiledHeaderFile=""1665 />1666 <Tool1667 Name="VCManagedResourceCompilerTool"1668 />1669 <Tool1670 Name="VCResourceCompilerTool"1671 />1672 <Tool1673 Name="VCPreLinkEventTool"1674 />1675 <Tool1676 Name="VCLibrarianTool"1677 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"1678 />1679 <Tool1680 Name="VCALinkTool"1681 />1682 <Tool1683 Name="VCXDCMakeTool"1684 />1685 <Tool1686 Name="VCBscMakeTool"1687 />1688 <Tool1689 Name="VCCodeSignTool"1690 />1691 <Tool1692 Name="VCPostBuildEventTool"1693 />1694 <DeploymentTool1695 ForceDirty="-1"1696 RemoteDirectory=""1697 RegisterOutput="0"1698 AdditionalFiles=""1699 />1700 <DebuggerTool1701 />1702 </Configuration>1703 <Configuration1704 Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"1705 ConfigurationType="4"1706 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"1707 ATLMinimizesCRunTimeLibraryUsage="false"1708 CharacterSet="1"1709 >1710 <Tool1711 Name="VCPreBuildEventTool"1712 />1713 <Tool1714 Name="VCCustomBuildTool"1715 />1716 <Tool1717 Name="VCXMLDataGeneratorTool"1718 />1719 <Tool1720 Name="VCWebServiceProxyGeneratorTool"1721 />1722 <Tool1723 Name="VCMIDLTool"1724 />1725 <Tool1726 Name="VCCLCompilerTool"1727 ExecutionBucket="7"1728 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"1729 PreprocessorDefinitions="_LIB;"1730 PrecompiledHeaderFile=""1731 />1732 <Tool1733 Name="VCManagedResourceCompilerTool"1734 />1735 <Tool1736 Name="VCResourceCompilerTool"1737 />1738 <Tool1739 Name="VCPreLinkEventTool"1740 />1741 <Tool1742 Name="VCLibrarianTool"1743 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"1744 />1745 <Tool1746 Name="VCALinkTool"1747 />1748 <Tool1749 Name="VCXDCMakeTool"1750 />1751 <Tool1752 Name="VCBscMakeTool"1753 />1754 <Tool1755 Name="VCCodeSignTool"1756 />1757 <Tool1758 Name="VCPostBuildEventTool"1759 />1760 <DeploymentTool1761 ForceDirty="-1"1762 RemoteDirectory=""1763 RegisterOutput="0"1764 AdditionalFiles=""1765 />1766 <DebuggerTool1767 />1768 </Configuration>1769 <Configuration1770 Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"1771 ConfigurationType="4"1772 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"1773 ATLMinimizesCRunTimeLibraryUsage="false"1774 CharacterSet="1"1775 >1776 <Tool1777 Name="VCPreBuildEventTool"1778 />1779 <Tool1780 Name="VCCustomBuildTool"1781 />1782 <Tool1783 Name="VCXMLDataGeneratorTool"1784 />1785 <Tool1786 Name="VCWebServiceProxyGeneratorTool"1787 />1788 <Tool1789 Name="VCMIDLTool"1790 />1791 <Tool1792 Name="VCCLCompilerTool"1793 ExecutionBucket="7"1794 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"1795 PreprocessorDefinitions="_LIB;"1796 PrecompiledHeaderFile=""1797 />1798 <Tool1799 Name="VCManagedResourceCompilerTool"1800 />1801 <Tool1802 Name="VCResourceCompilerTool"1803 />1804 <Tool1805 Name="VCPreLinkEventTool"1806 />1807 <Tool1808 Name="VCLibrarianTool"1809 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"1810 />1811 <Tool1812 Name="VCALinkTool"1813 />1814 <Tool1815 Name="VCXDCMakeTool"1816 />1817 <Tool1818 Name="VCBscMakeTool"1819 />1820 <Tool1821 Name="VCCodeSignTool"1822 />1823 <Tool1824 Name="VCPostBuildEventTool"1825 />1826 <DeploymentTool1827 ForceDirty="-1"1828 RemoteDirectory=""1829 RegisterOutput="0"1830 AdditionalFiles=""1831 />1832 <DebuggerTool1833 />1834 </Configuration>1835 <Configuration1836 Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"1837 ConfigurationType="4"1838 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"1839 ATLMinimizesCRunTimeLibraryUsage="false"1840 CharacterSet="1"1841 >1842 <Tool1843 Name="VCPreBuildEventTool"1844 />1845 <Tool1846 Name="VCCustomBuildTool"1847 />1848 <Tool1849 Name="VCXMLDataGeneratorTool"1850 />1851 <Tool1852 Name="VCWebServiceProxyGeneratorTool"1853 />1854 <Tool1855 Name="VCMIDLTool"1856 />1857 <Tool1858 Name="VCCLCompilerTool"1859 ExecutionBucket="7"1860 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"1861 PreprocessorDefinitions="_LIB;"1862 PrecompiledHeaderFile=""1863 />1864 <Tool1865 Name="VCManagedResourceCompilerTool"1866 />1867 <Tool1868 Name="VCResourceCompilerTool"1869 />1870 <Tool1871 Name="VCPreLinkEventTool"1872 />1873 <Tool1874 Name="VCLibrarianTool"1875 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"1876 />1877 <Tool1878 Name="VCALinkTool"1879 />1880 <Tool1881 Name="VCXDCMakeTool"1882 />1883 <Tool1884 Name="VCBscMakeTool"1885 />1886 <Tool1887 Name="VCCodeSignTool"1888 />1889 <Tool1890 Name="VCPostBuildEventTool"1891 />1892 <DeploymentTool1893 ForceDirty="-1"1894 RemoteDirectory=""1895 RegisterOutput="0"1896 AdditionalFiles=""1897 />1898 <DebuggerTool1899 />1900 </Configuration>1901 <Configuration1902 Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"1903 ConfigurationType="4"1904 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"1905 ATLMinimizesCRunTimeLibraryUsage="false"1906 CharacterSet="1"1907 >1908 <Tool1909 Name="VCPreBuildEventTool"1910 />1911 <Tool1912 Name="VCCustomBuildTool"1913 />1914 <Tool1915 Name="VCXMLDataGeneratorTool"1916 />1917 <Tool1918 Name="VCWebServiceProxyGeneratorTool"1919 />1920 <Tool1921 Name="VCMIDLTool"1922 />1923 <Tool1924 Name="VCCLCompilerTool"1925 ExecutionBucket="7"1926 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"1927 PreprocessorDefinitions="_LIB;"1928 PrecompiledHeaderFile=""1929 />1930 <Tool1931 Name="VCManagedResourceCompilerTool"1932 />1933 <Tool1934 Name="VCResourceCompilerTool"1935 />1936 <Tool1937 Name="VCPreLinkEventTool"1938 />1939 <Tool1940 Name="VCLibrarianTool"1941 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"1942 />1943 <Tool1944 Name="VCALinkTool"1945 />1946 <Tool1947 Name="VCXDCMakeTool"1948 />1949 <Tool1950 Name="VCBscMakeTool"1951 />1952 <Tool1953 Name="VCCodeSignTool"1954 />1955 <Tool1956 Name="VCPostBuildEventTool"1957 />1958 <DeploymentTool1959 ForceDirty="-1"1960 RemoteDirectory=""1961 RegisterOutput="0"1962 AdditionalFiles=""1963 />1964 <DebuggerTool1965 />1966 </Configuration>1967 <Configuration1968 Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"1969 ConfigurationType="4"1970 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"1971 ATLMinimizesCRunTimeLibraryUsage="false"1972 CharacterSet="1"1973 >1974 <Tool1975 Name="VCPreBuildEventTool"1976 />1977 <Tool1978 Name="VCCustomBuildTool"1979 />1980 <Tool1981 Name="VCXMLDataGeneratorTool"1982 />1983 <Tool1984 Name="VCWebServiceProxyGeneratorTool"1985 />1986 <Tool1987 Name="VCMIDLTool"1988 />1989 <Tool1990 Name="VCCLCompilerTool"1991 ExecutionBucket="7"1992 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"1993 PreprocessorDefinitions="_LIB;"1994 PrecompiledHeaderFile=""1995 />1996 <Tool1997 Name="VCManagedResourceCompilerTool"1998 />1999 <Tool2000 Name="VCResourceCompilerTool"2001 />2002 <Tool2003 Name="VCPreLinkEventTool"2004 />2005 <Tool2006 Name="VCLibrarianTool"2007 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"2008 />2009 <Tool2010 Name="VCALinkTool"2011 />2012 <Tool2013 Name="VCXDCMakeTool"2014 />2015 <Tool2016 Name="VCBscMakeTool"2017 />2018 <Tool2019 Name="VCCodeSignTool"2020 />2021 <Tool2022 Name="VCPostBuildEventTool"2023 />2024 <DeploymentTool2025 ForceDirty="-1"2026 RemoteDirectory=""2027 RegisterOutput="0"2028 AdditionalFiles=""2029 />2030 <DebuggerTool2031 />2032 </Configuration>2033 <Configuration2034 Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"2035 ConfigurationType="4"2036 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"2037 ATLMinimizesCRunTimeLibraryUsage="false"2038 CharacterSet="1"2039 >2040 <Tool2041 Name="VCPreBuildEventTool"2042 />2043 <Tool2044 Name="VCCustomBuildTool"2045 />2046 <Tool2047 Name="VCXMLDataGeneratorTool"2048 />2049 <Tool2050 Name="VCWebServiceProxyGeneratorTool"2051 />2052 <Tool2053 Name="VCMIDLTool"2054 />2055 <Tool2056 Name="VCCLCompilerTool"2057 ExecutionBucket="7"2058 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"2059 PreprocessorDefinitions="_LIB;"2060 PrecompiledHeaderFile=""2061 />2062 <Tool2063 Name="VCManagedResourceCompilerTool"2064 />2065 <Tool2066 Name="VCResourceCompilerTool"2067 />2068 <Tool2069 Name="VCPreLinkEventTool"2070 />2071 <Tool2072 Name="VCLibrarianTool"2073 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"2074 />2075 <Tool2076 Name="VCALinkTool"2077 />2078 <Tool2079 Name="VCXDCMakeTool"2080 />2081 <Tool2082 Name="VCBscMakeTool"2083 />2084 <Tool2085 Name="VCCodeSignTool"2086 />2087 <Tool2088 Name="VCPostBuildEventTool"2089 />2090 <DeploymentTool2091 ForceDirty="-1"2092 RemoteDirectory=""2093 RegisterOutput="0"2094 AdditionalFiles=""2095 />2096 <DebuggerTool2097 />2098 </Configuration>2099 <Configuration2100 Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"2101 ConfigurationType="4"2102 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"2103 ATLMinimizesCRunTimeLibraryUsage="false"2104 CharacterSet="1"2105 >2106 <Tool2107 Name="VCPreBuildEventTool"2108 />2109 <Tool2110 Name="VCCustomBuildTool"2111 />2112 <Tool2113 Name="VCXMLDataGeneratorTool"2114 />2115 <Tool2116 Name="VCWebServiceProxyGeneratorTool"2117 />2118 <Tool2119 Name="VCMIDLTool"2120 />2121 <Tool2122 Name="VCCLCompilerTool"2123 ExecutionBucket="7"2124 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"2125 PreprocessorDefinitions="_LIB;"2126 PrecompiledHeaderFile=""2127 />2128 <Tool2129 Name="VCManagedResourceCompilerTool"2130 />2131 <Tool2132 Name="VCResourceCompilerTool"2133 />2134 <Tool2135 Name="VCPreLinkEventTool"2136 />2137 <Tool2138 Name="VCLibrarianTool"2139 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"2140 />2141 <Tool2142 Name="VCALinkTool"2143 />2144 <Tool2145 Name="VCXDCMakeTool"2146 />2147 <Tool2148 Name="VCBscMakeTool"2149 />2150 <Tool2151 Name="VCCodeSignTool"2152 />2153 <Tool2154 Name="VCPostBuildEventTool"2155 />2156 <DeploymentTool2157 ForceDirty="-1"2158 RemoteDirectory=""2159 RegisterOutput="0"2160 AdditionalFiles=""2161 />2162 <DebuggerTool2163 />2164 </Configuration>2165 <Configuration2166 Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"2167 ConfigurationType="4"2168 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"2169 ATLMinimizesCRunTimeLibraryUsage="false"2170 CharacterSet="1"2171 >2172 <Tool2173 Name="VCPreBuildEventTool"2174 />2175 <Tool2176 Name="VCCustomBuildTool"2177 />2178 <Tool2179 Name="VCXMLDataGeneratorTool"2180 />2181 <Tool2182 Name="VCWebServiceProxyGeneratorTool"2183 />2184 <Tool2185 Name="VCMIDLTool"2186 />2187 <Tool2188 Name="VCCLCompilerTool"2189 ExecutionBucket="7"2190 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"2191 PreprocessorDefinitions="_LIB;"2192 PrecompiledHeaderFile=""2193 />2194 <Tool2195 Name="VCManagedResourceCompilerTool"2196 />2197 <Tool2198 Name="VCResourceCompilerTool"2199 />2200 <Tool2201 Name="VCPreLinkEventTool"2202 />2203 <Tool2204 Name="VCLibrarianTool"2205 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"2206 />2207 <Tool2208 Name="VCALinkTool"2209 />2210 <Tool2211 Name="VCXDCMakeTool"2212 />2213 <Tool2214 Name="VCBscMakeTool"2215 />2216 <Tool2217 Name="VCCodeSignTool"2218 />2219 <Tool2220 Name="VCPostBuildEventTool"2221 />2222 <DeploymentTool2223 ForceDirty="-1"2224 RemoteDirectory=""2225 RegisterOutput="0"2226 AdditionalFiles=""2227 />2228 <DebuggerTool2229 />2230 </Configuration>2231 <Configuration2232 Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"2233 ConfigurationType="4"2234 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"2235 ATLMinimizesCRunTimeLibraryUsage="false"2236 CharacterSet="1"2237 >2238 <Tool2239 Name="VCPreBuildEventTool"2240 />2241 <Tool2242 Name="VCCustomBuildTool"2243 />2244 <Tool2245 Name="VCXMLDataGeneratorTool"2246 />2247 <Tool2248 Name="VCWebServiceProxyGeneratorTool"2249 />2250 <Tool2251 Name="VCMIDLTool"2252 />2253 <Tool2254 Name="VCCLCompilerTool"2255 ExecutionBucket="7"2256 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"2257 PreprocessorDefinitions="_LIB;"2258 PrecompiledHeaderFile=""2259 />2260 <Tool2261 Name="VCManagedResourceCompilerTool"2262 />2263 <Tool2264 Name="VCResourceCompilerTool"2265 />2266 <Tool2267 Name="VCPreLinkEventTool"2268 />2269 <Tool2270 Name="VCLibrarianTool"2271 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"2272 />2273 <Tool2274 Name="VCALinkTool"2275 />2276 <Tool2277 Name="VCXDCMakeTool"2278 />2279 <Tool2280 Name="VCBscMakeTool"2281 />2282 <Tool2283 Name="VCCodeSignTool"2284 />2285 <Tool2286 Name="VCPostBuildEventTool"2287 />2288 <DeploymentTool2289 ForceDirty="-1"2290 RemoteDirectory=""2291 RegisterOutput="0"2292 AdditionalFiles=""2293 />2294 <DebuggerTool2295 />2296 </Configuration>2297 <Configuration2298 Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"2299 ConfigurationType="4"2300 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"2301 ATLMinimizesCRunTimeLibraryUsage="false"2302 CharacterSet="1"2303 >2304 <Tool2305 Name="VCPreBuildEventTool"2306 />2307 <Tool2308 Name="VCCustomBuildTool"2309 />2310 <Tool2311 Name="VCXMLDataGeneratorTool"2312 />2313 <Tool2314 Name="VCWebServiceProxyGeneratorTool"2315 />2316 <Tool2317 Name="VCMIDLTool"2318 />2319 <Tool2320 Name="VCCLCompilerTool"2321 ExecutionBucket="7"2322 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"2323 PreprocessorDefinitions="_LIB;"2324 PrecompiledHeaderFile=""2325 />2326 <Tool2327 Name="VCManagedResourceCompilerTool"2328 />2329 <Tool2330 Name="VCResourceCompilerTool"2331 />2332 <Tool2333 Name="VCPreLinkEventTool"2334 />2335 <Tool2336 Name="VCLibrarianTool"2337 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"2338 />2339 <Tool2340 Name="VCALinkTool"2341 />2342 <Tool2343 Name="VCXDCMakeTool"2344 />2345 <Tool2346 Name="VCBscMakeTool"2347 />2348 <Tool2349 Name="VCCodeSignTool"2350 />2351 <Tool2352 Name="VCPostBuildEventTool"2353 />2354 <DeploymentTool2355 ForceDirty="-1"2356 RemoteDirectory=""2357 RegisterOutput="0"2358 AdditionalFiles=""2359 />2360 <DebuggerTool2361 />2362 </Configuration>2363 <Configuration2364 Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"2365 ConfigurationType="4"2366 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"2367 ATLMinimizesCRunTimeLibraryUsage="false"2368 CharacterSet="1"2369 >2370 <Tool2371 Name="VCPreBuildEventTool"2372 />2373 <Tool2374 Name="VCCustomBuildTool"2375 />2376 <Tool2377 Name="VCXMLDataGeneratorTool"2378 />2379 <Tool2380 Name="VCWebServiceProxyGeneratorTool"2381 />2382 <Tool2383 Name="VCMIDLTool"2384 />2385 <Tool2386 Name="VCCLCompilerTool"2387 ExecutionBucket="7"2388 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"2389 PreprocessorDefinitions="_LIB;"2390 PrecompiledHeaderFile=""2391 />2392 <Tool2393 Name="VCManagedResourceCompilerTool"2394 />2395 <Tool2396 Name="VCResourceCompilerTool"2397 />2398 <Tool2399 Name="VCPreLinkEventTool"2400 />2401 <Tool2402 Name="VCLibrarianTool"2403 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"2404 />2405 <Tool2406 Name="VCALinkTool"2407 />2408 <Tool2409 Name="VCXDCMakeTool"2410 />2411 <Tool2412 Name="VCBscMakeTool"2413 />2414 <Tool2415 Name="VCCodeSignTool"2416 />2417 <Tool2418 Name="VCPostBuildEventTool"2419 />2420 <DeploymentTool2421 ForceDirty="-1"2422 RemoteDirectory=""2423 RegisterOutput="0"2424 AdditionalFiles=""2425 />2426 <DebuggerTool2427 />2428 </Configuration>2429 <Configuration2430 Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"2431 ConfigurationType="4"2432 InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"2433 ATLMinimizesCRunTimeLibraryUsage="false"2434 CharacterSet="1"2435 >2436 <Tool2437 Name="VCPreBuildEventTool"2438 />2439 <Tool2440 Name="VCCustomBuildTool"2441 />2442 <Tool2443 Name="VCXMLDataGeneratorTool"2444 />2445 <Tool2446 Name="VCWebServiceProxyGeneratorTool"2447 />2448 <Tool2449 Name="VCMIDLTool"2450 />2451 <Tool2452 Name="VCCLCompilerTool"2453 ExecutionBucket="7"2454 AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"2455 PreprocessorDefinitions="_LIB;"2456 PrecompiledHeaderFile=""2457 />2458 <Tool2459 Name="VCManagedResourceCompilerTool"2460 />2461 <Tool2462 Name="VCResourceCompilerTool"2463 />2464 <Tool2465 Name="VCPreLinkEventTool"2466 />2467 <Tool2468 Name="VCLibrarianTool"2469 OutputFile="..\lib\pjmedia-codec-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"2470 2470 /> 2471 2471 <Tool … … 2766 2766 > 2767 2767 <File 2768 RelativePath="..\src\pjmedia-codec\amr_sdp_match.c" 2769 > 2770 </File> 2771 <File 2768 2772 RelativePath="..\src\pjmedia-codec\audio_codecs.c" 2769 2773 > … … 2779 2783 <File 2780 2784 RelativePath="..\src\pjmedia-codec\g7221.c" 2785 > 2786 </File> 2787 <File 2788 RelativePath="..\src\pjmedia-codec\g7221_sdp_match.c" 2781 2789 > 2782 2790 </File> … … 3063 3071 </File> 3064 3072 <File 3073 RelativePath="..\include\pjmedia-codec\amr_sdp_match.h" 3074 > 3075 </File> 3076 <File 3065 3077 RelativePath="..\include\pjmedia-codec\audio_codecs.h" 3066 3078 > … … 3080 3092 <File 3081 3093 RelativePath="..\include\pjmedia-codec\g7221.h" 3094 > 3095 </File> 3096 <File 3097 RelativePath="..\include\pjmedia-codec\g7221_sdp_match.h" 3082 3098 > 3083 3099 </File> -
pjproject/trunk/pjmedia/src/pjmedia-codec/g7221.c
r3664 r3911 19 19 */ 20 20 #include <pjmedia-codec/g7221.h> 21 #include <pjmedia-codec/g7221_sdp_match.h> 21 22 #include <pjmedia/codec.h> 22 23 #include <pjmedia/errno.h> … … 247 248 pjmedia_codec_mgr *codec_mgr; 248 249 codec_mode *mode; 250 pj_str_t codec_name; 249 251 pj_status_t status; 250 252 … … 337 339 goto on_error; 338 340 } 341 342 /* Register format match callback. */ 343 pj_cstr(&codec_name, CODEC_TAG); 344 status = pjmedia_sdp_neg_register_fmt_match_cb( 345 &codec_name, 346 &pjmedia_codec_g7221_match_sdp); 347 if (status != PJ_SUCCESS) 348 goto on_error; 339 349 340 350 /* Register codec factory to endpoint. */ -
pjproject/trunk/pjmedia/src/pjmedia-codec/ipp_codecs.c
r3878 r3911 19 19 */ 20 20 #include <pjmedia-codec/ipp_codecs.h> 21 #include <pjmedia-codec/amr_sdp_match.h> 22 #include <pjmedia-codec/g7221_sdp_match.h> 21 23 #include <pjmedia/codec.h> 22 24 #include <pjmedia/errno.h> … … 666 668 { 667 669 pjmedia_codec_mgr *codec_mgr; 670 pj_str_t codec_name; 668 671 pj_status_t status; 669 672 … … 695 698 goto on_error; 696 699 } 700 701 /* Register format match callback. */ 702 #if PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1 703 pj_cstr(&codec_name, "G7221"); 704 status = pjmedia_sdp_neg_register_fmt_match_cb( 705 &codec_name, 706 &pjmedia_codec_g7221_match_sdp); 707 if (status != PJ_SUCCESS) 708 goto on_error; 709 #endif 710 711 #if PJMEDIA_HAS_INTEL_IPP_CODEC_AMR 712 pj_cstr(&codec_name, "AMR"); 713 status = pjmedia_sdp_neg_register_fmt_match_cb( 714 &codec_name, 715 &pjmedia_codec_amr_match_sdp); 716 if (status != PJ_SUCCESS) 717 goto on_error; 718 #endif 719 720 #if PJMEDIA_HAS_INTEL_IPP_CODEC_AMRWB 721 pj_cstr(&codec_name, "AMR-WB"); 722 status = pjmedia_sdp_neg_register_fmt_match_cb( 723 &codec_name, 724 &pjmedia_codec_amr_match_sdp); 725 if (status != PJ_SUCCESS) 726 goto on_error; 727 #endif 728 729 /* Suppress compile warning */ 730 PJ_UNUSED_ARG(codec_name); 697 731 698 732 /* Register codec factory to endpoint. */ -
pjproject/trunk/pjmedia/src/pjmedia-codec/opencore_amrnb.c
r3841 r3911 1 /* $Id */1 /* $Id$ */ 2 2 /* 3 3 * Copyright (C) 2011 Teluu Inc. (http://www.teluu.com) … … 23 23 */ 24 24 #include <pjmedia-codec/g722.h> 25 #include <pjmedia-codec/amr_sdp_match.h> 25 26 #include <pjmedia/codec.h> 26 27 #include <pjmedia/errno.h> … … 167 168 { 168 169 pjmedia_codec_mgr *codec_mgr; 170 pj_str_t codec_name; 169 171 pj_status_t status; 170 172 … … 188 190 goto on_error; 189 191 } 192 193 /* Register format match callback. */ 194 pj_cstr(&codec_name, "AMR"); 195 status = pjmedia_sdp_neg_register_fmt_match_cb( 196 &codec_name, 197 &pjmedia_codec_amr_match_sdp); 198 if (status != PJ_SUCCESS) 199 goto on_error; 190 200 191 201 /* Register codec factory to endpoint. */ -
pjproject/trunk/pjmedia/src/pjmedia-codec/passthrough.c
r3841 r3911 19 19 */ 20 20 #include <pjmedia-codec/passthrough.h> 21 #include <pjmedia-codec/amr_sdp_match.h> 21 22 #include <pjmedia/codec.h> 22 23 #include <pjmedia/errno.h> … … 317 318 { 318 319 pjmedia_codec_mgr *codec_mgr; 320 pj_str_t codec_name; 319 321 pj_status_t status; 320 322 … … 347 349 } 348 350 351 /* Register format match callback. */ 352 #if PJMEDIA_HAS_PASSTROUGH_CODEC_AMR 353 pj_cstr(&codec_name, "AMR"); 354 status = pjmedia_sdp_neg_register_fmt_match_cb( 355 &codec_name, 356 &pjmedia_codec_amr_match_sdp); 357 if (status != PJ_SUCCESS) 358 goto on_error; 359 #endif 360 361 /* Suppress compile warning */ 362 PJ_UNUSED_ARG(codec_name); 363 349 364 /* Register codec factory to endpoint. */ 350 365 status = pjmedia_codec_mgr_register_factory(codec_mgr, … … 383 398 384 399 for (j = 0; j < setting->fmt_cnt && !enabled; ++j) { 385 if ( codec_desc[i].fmt_id == setting->fmts[j].id)400 if ((pj_uint32_t)codec_desc[i].fmt_id == setting->fmts[j].id) 386 401 enabled = PJ_TRUE; 387 402 } -
pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c
r3869 r3911 53 53 }; 54 54 55 #define GET_FMTP_IVAL_BASE(ival, base, fmtp, param, default_val) \56 do { \57 pj_str_t s; \58 char *p; \59 p = pj_stristr(&fmtp.fmt_param, ¶m); \60 if (!p) { \61 ival = default_val; \62 break; \63 } \64 pj_strset(&s, p + param.slen, fmtp.fmt_param.slen - \65 (p - fmtp.fmt_param.ptr) - param.slen); \66 ival = pj_strtoul2(&s, NULL, base); \67 } while (0)68 69 #define GET_FMTP_IVAL(ival, fmtp, param, default_val) \70 GET_FMTP_IVAL_BASE(ival, 10, fmtp, param, default_val)71 72 73 55 /* Definition of customized SDP format negotiation callback */ 74 56 struct fmt_match_cb_t … … 611 593 } 612 594 613 /* Matching G722.1 bitrates between offer and answer.614 */615 static pj_bool_t match_g7221( const pjmedia_sdp_media *offer,616 unsigned o_fmt_idx,617 const pjmedia_sdp_media *answer,618 unsigned a_fmt_idx)619 {620 const pjmedia_sdp_attr *attr_ans;621 const pjmedia_sdp_attr *attr_ofr;622 pjmedia_sdp_fmtp fmtp;623 unsigned a_bitrate, o_bitrate;624 const pj_str_t bitrate = {"bitrate=", 8};625 626 /* Parse offer */627 attr_ofr = pjmedia_sdp_media_find_attr2(offer, "fmtp",628 &offer->desc.fmt[o_fmt_idx]);629 if (!attr_ofr)630 return PJ_FALSE;631 632 if (pjmedia_sdp_attr_get_fmtp(attr_ofr, &fmtp) != PJ_SUCCESS)633 return PJ_FALSE;634 635 GET_FMTP_IVAL(o_bitrate, fmtp, bitrate, 0);636 637 /* Parse answer */638 attr_ans = pjmedia_sdp_media_find_attr2(answer, "fmtp",639 &answer->desc.fmt[a_fmt_idx]);640 if (!attr_ans)641 return PJ_FALSE;642 643 if (pjmedia_sdp_attr_get_fmtp(attr_ans, &fmtp) != PJ_SUCCESS)644 return PJ_FALSE;645 646 GET_FMTP_IVAL(a_bitrate, fmtp, bitrate, 0);647 648 /* Compare bitrate in answer and offer. */649 return (a_bitrate == o_bitrate);650 }651 652 /* Negotiate AMR format params between offer and answer. Format params653 * to be matched are: octet-align, crc, robust-sorting, interleaving,654 * and channels (channels is negotiated by rtpmap line negotiation).655 * Note: For answerer, octet-align mode setting is adaptable to offerer656 * setting. In the case that octet-align mode need to be adjusted,657 * pt_need_adapt will be set to the format ID.658 *659 */660 static pj_bool_t match_amr( const pjmedia_sdp_media *offer,661 unsigned o_fmt_idx,662 const pjmedia_sdp_media *answer,663 unsigned a_fmt_idx,664 pj_bool_t answerer,665 pj_str_t *pt_need_adapt)666 {667 /* Negotiated format-param field-names constants. */668 const pj_str_t STR_OCTET_ALIGN = {"octet-align=", 12};669 const pj_str_t STR_CRC = {"crc=", 4};670 const pj_str_t STR_ROBUST_SORTING = {"robust-sorting=", 15};671 const pj_str_t STR_INTERLEAVING = {"interleaving=", 13};672 673 /* Negotiated params and their default values. */674 unsigned a_octet_align = 0, o_octet_align = 0;675 unsigned a_crc = 0, o_crc = 0;676 unsigned a_robust_sorting = 0, o_robust_sorting = 0;677 unsigned a_interleaving = 0, o_interleaving = 0;678 679 const pjmedia_sdp_attr *attr_ans;680 const pjmedia_sdp_attr *attr_ofr;681 pjmedia_sdp_fmtp fmtp;682 pj_bool_t match;683 684 /* Parse offerer FMTP */685 attr_ofr = pjmedia_sdp_media_find_attr2(offer, "fmtp",686 &offer->desc.fmt[o_fmt_idx]);687 if (attr_ofr) {688 if (pjmedia_sdp_attr_get_fmtp(attr_ofr, &fmtp) != PJ_SUCCESS)689 /* Invalid fmtp format. */690 return PJ_FALSE;691 692 GET_FMTP_IVAL(o_octet_align, fmtp, STR_OCTET_ALIGN, 0);693 GET_FMTP_IVAL(o_crc, fmtp, STR_CRC, 0);694 GET_FMTP_IVAL(o_robust_sorting, fmtp, STR_ROBUST_SORTING, 0);695 GET_FMTP_IVAL(o_interleaving, fmtp, STR_INTERLEAVING, 0);696 }697 698 /* Parse answerer FMTP */699 attr_ans = pjmedia_sdp_media_find_attr2(answer, "fmtp",700 &answer->desc.fmt[a_fmt_idx]);701 if (attr_ans) {702 if (pjmedia_sdp_attr_get_fmtp(attr_ans, &fmtp) != PJ_SUCCESS)703 /* Invalid fmtp format. */704 return PJ_FALSE;705 706 GET_FMTP_IVAL(a_octet_align, fmtp, STR_OCTET_ALIGN, 0);707 GET_FMTP_IVAL(a_crc, fmtp, STR_CRC, 0);708 GET_FMTP_IVAL(a_robust_sorting, fmtp, STR_ROBUST_SORTING, 0);709 GET_FMTP_IVAL(a_interleaving, fmtp, STR_INTERLEAVING, 0);710 }711 712 if (answerer) {713 match = a_crc == o_crc &&714 a_robust_sorting == o_robust_sorting &&715 a_interleaving == o_interleaving;716 717 /* If answerer octet-align setting doesn't match to the offerer's,718 * set pt_need_adapt to this media format ID to signal the caller719 * that this format ID needs to be adjusted.720 */721 if (a_octet_align != o_octet_align && match) {722 pj_assert(pt_need_adapt != NULL);723 *pt_need_adapt = answer->desc.fmt[a_fmt_idx];724 }725 } else {726 match = (a_octet_align == o_octet_align &&727 a_crc == o_crc &&728 a_robust_sorting == o_robust_sorting &&729 a_interleaving == o_interleaving);730 }731 732 return match;733 }734 735 736 /* Toggle AMR octet-align setting in the fmtp.737 */738 static pj_status_t amr_toggle_octet_align(pj_pool_t *pool,739 pjmedia_sdp_media *media,740 unsigned fmt_idx)741 {742 pjmedia_sdp_attr *attr;743 pjmedia_sdp_fmtp fmtp;744 const pj_str_t STR_OCTET_ALIGN = {"octet-align=", 12};745 746 enum { MAX_FMTP_STR_LEN = 160 };747 748 attr = pjmedia_sdp_media_find_attr2(media, "fmtp",749 &media->desc.fmt[fmt_idx]);750 /* Check if the AMR media format has FMTP attribute */751 if (attr) {752 char *p;753 pj_status_t status;754 755 status = pjmedia_sdp_attr_get_fmtp(attr, &fmtp);756 if (status != PJ_SUCCESS)757 return status;758 759 /* Check if the fmtp has octet-align field. */760 p = pj_stristr(&fmtp.fmt_param, &STR_OCTET_ALIGN);761 if (p) {762 /* It has, just toggle the value */763 unsigned octet_align;764 pj_str_t s;765 766 pj_strset(&s, p + STR_OCTET_ALIGN.slen, fmtp.fmt_param.slen -767 (p - fmtp.fmt_param.ptr) - STR_OCTET_ALIGN.slen);768 octet_align = pj_strtoul(&s);769 *(p + STR_OCTET_ALIGN.slen) = (char)(octet_align? '0' : '1');770 } else {771 /* It doesn't, append octet-align field */772 char buf[MAX_FMTP_STR_LEN];773 774 pj_ansi_snprintf(buf, MAX_FMTP_STR_LEN, "%.*s;octet-align=1",775 (int)fmtp.fmt_param.slen, fmtp.fmt_param.ptr);776 attr->value = pj_strdup3(pool, buf);777 }778 } else {779 /* Add new attribute for the AMR media format with octet-align780 * field set.781 */782 char buf[MAX_FMTP_STR_LEN];783 784 attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);785 attr->name = pj_str("fmtp");786 pj_ansi_snprintf(buf, MAX_FMTP_STR_LEN, "%.*s octet-align=1",787 (int)media->desc.fmt[fmt_idx].slen,788 media->desc.fmt[fmt_idx].ptr);789 attr->value = pj_strdup3(pool, buf);790 media->attr[media->attr_count++] = attr;791 }792 793 return PJ_SUCCESS;794 }795 796 595 797 596 /* Update single local media description to after receiving answer … … 931 730 (ar.param.slen==1 && *ar.param.ptr=='1'))) 932 731 { 933 /* Further check for G7221, negotiate bitrate. */934 if (pj_stricmp2(&or_.enc_name, "G7221") == 0)935 {936 if (match_g7221(offer, i, answer, j))937 break;938 } else939 940 /* Further check for AMR, negotiate fmtp. */941 if (pj_stricmp2(&or_.enc_name, "AMR") == 0 ||942 pj_stricmp2(&or_.enc_name, "AMR-WB") == 0)943 {944 if (match_amr(offer, i, answer, j, PJ_FALSE,945 NULL))946 break;947 } else948 949 732 /* Call custom format matching callbacks */ 950 733 if (custom_fmt_match(pool, &or_.enc_name, … … 1218 1001 pjmedia_sdp_media *answer; 1219 1002 const pjmedia_sdp_media *master, *slave; 1220 pj_str_t pt_amr_need_adapt = {NULL, 0};1221 1003 1222 1004 /* If offer has zero port, just clone the offer */ … … 1355 1137 { 1356 1138 continue; 1357 } else1358 1359 /* Further check for G7221, negotiate bitrate */1360 if (pj_stricmp2(&or_.enc_name, "G7221") == 0 &&1361 !match_g7221(master, i, slave, j))1362 {1363 continue;1364 } else1365 1366 /* Further check for AMR, negotiate fmtp */1367 if (pj_stricmp2(&or_.enc_name, "AMR")==0 ||1368 pj_stricmp2(&or_.enc_name, "AMR-WB")==0)1369 {1370 unsigned o_med_idx, a_med_idx;1371 1372 o_med_idx = prefer_remote_codec_order? i:j;1373 a_med_idx = prefer_remote_codec_order? j:i;1374 if (!match_amr(offer, o_med_idx,1375 preanswer, a_med_idx,1376 PJ_TRUE, &pt_amr_need_adapt))1377 continue;1378 1139 } 1379 1380 1140 found_matching_codec = 1; 1381 1141 } else { … … 1454 1214 pj_assert(j != answer->desc.fmt_count); 1455 1215 str_swap(&answer->desc.fmt[i], &answer->desc.fmt[j]); 1456 1457 /* For AMR/AMRWB format, adapt octet-align setting if required. */1458 if (!pj_strcmp(&pt_amr_need_adapt, &pt_answer[i]))1459 amr_toggle_octet_align(pool, answer, i);1460 1216 } 1461 1217 … … 1784 1540 } 1785 1541 1786 /* Further check for G7221, negotiate bitrate. */1787 if (pj_stricmp2(&o_rtpmap.enc_name, "G7221") == 0) {1788 if (match_g7221(offer, o_fmt_idx, answer, a_fmt_idx))1789 return PJ_SUCCESS;1790 else1791 return PJMEDIA_SDP_EFORMATNOTEQUAL;1792 } else1793 /* Further check for AMR, negotiate fmtp. */1794 if (pj_stricmp2(&o_rtpmap.enc_name, "AMR") == 0 ||1795 pj_stricmp2(&o_rtpmap.enc_name, "AMR-WB") == 0)1796 {1797 if (match_amr(offer, o_fmt_idx, answer, a_fmt_idx, PJ_FALSE, NULL))1798 return PJ_SUCCESS;1799 else1800 return PJMEDIA_SDP_EFORMATNOTEQUAL;1801 }1802 PJ_TODO(replace_hardcoded_fmt_match_in_sdp_neg_with_custom_fmt_match_cb);1803 1804 1542 return custom_fmt_match(pool, &o_rtpmap.enc_name, 1805 1543 offer, o_fmt_idx, answer, a_fmt_idx, option);
Note: See TracChangeset
for help on using the changeset viewer.
