![(please configure the [header_logo] section in trac.ini)](/repos/chrome/site/pj.jpg)
Changeset 1177
- Timestamp:
- Apr 9, 2007 7:06:08 AM (17 years ago)
- Location:
- pjproject/branches/split-3rd-party
- Files:
-
- 10 added
- 1 deleted
- 31 edited
- 4 moved
-
pjlib-util/build/pjlib_util.vcproj (modified) (1 diff)
-
pjlib/build/pjlib.vcproj (modified) (1 diff)
-
pjmedia/build/pjmedia.dsp (modified) (6 diffs)
-
pjmedia/build/pjmedia.vcproj (modified) (9 diffs)
-
pjmedia/build/pjmedia_codec.vcproj (modified) (4 diffs)
-
pjmedia/include/pjmedia.h (modified) (1 diff)
-
pjmedia/include/pjmedia/config.h (modified) (3 diffs)
-
pjmedia/src/pjmedia-codec/gsm.c (modified) (11 diffs)
-
pjmedia/src/pjmedia/g711.c (modified) (13 diffs)
-
pjmedia/src/pjmedia/resample_resample.c (modified) (7 diffs)
-
pjmedia/src/pjmedia/resample_speex.c (modified) (3 diffs)
-
pjproject-vs8.sln (modified) (4 diffs)
-
pjproject.dsw (modified) (3 diffs)
-
pjsip-apps/build/Samples-vc.mak (modified) (1 diff)
-
pjsip-apps/build/pjsip_apps.dsw (modified) (4 diffs)
-
pjsip-apps/build/pjsua.vcproj (modified) (1 diff)
-
pjsip-apps/build/sample_debug.vcproj (modified) (1 diff)
-
pjsip-apps/build/samples.vcproj (modified) (1 diff)
-
pjsip-apps/src/samples/pjsip-perf.c (modified) (2 diffs)
-
pjsip/build/pjsip_core.vcproj (modified) (1 diff)
-
pjsip/build/pjsip_simple.vcproj (modified) (1 diff)
-
pjsip/build/pjsip_ua.vcproj (modified) (1 diff)
-
pjsip/build/pjsua_lib.vcproj (modified) (1 diff)
-
pjsip/build/test_pjsip.vcproj (modified) (1 diff)
-
pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
-
pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)
-
third_party/README.txt (modified) (1 diff)
-
third_party/build/gsm/libgsmcodec.dsp (modified) (4 diffs)
-
third_party/build/ilbc/libilbccodec.dsp (modified) (5 diffs)
-
third_party/build/portaudio/libportaudio.dsp (modified) (4 diffs)
-
third_party/build/resample (added)
-
third_party/build/resample/config.h (added)
-
third_party/build/resample/libresample.dsp (added)
-
third_party/build/resample/output (added)
-
third_party/build/speex/libspeex.dsp (modified) (4 diffs)
-
third_party/mp3/mp3_port.h (moved) (moved from pjproject/branches/split-3rd-party/pjmedia/include/pjmedia/mp3_port.h)
-
third_party/plc_steveu (deleted)
-
third_party/resample/COPYING (added)
-
third_party/resample/include (added)
-
third_party/resample/include/resamplesubs.h (added)
-
third_party/resample/src (added)
-
third_party/resample/src/largefilter.h (moved) (moved from pjproject/branches/split-3rd-party/third_party/resample/largefilter.h)
-
third_party/resample/src/resample.h (added)
-
third_party/resample/src/resamplesubs.c (moved) (moved from pjproject/branches/split-3rd-party/third_party/resample/resample.c) (5 diffs)
-
third_party/resample/src/smallfilter.h (moved) (moved from pjproject/branches/split-3rd-party/third_party/resample/smallfilter.h)
-
third_party/resample/src/stddefs.h (added)
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/split-3rd-party/pjlib-util/build/pjlib_util.vcproj
r1130 r1177 4 4 Version="8.00" 5 5 Name="pjlib_util" 6 ProjectGUID="{ D1823239-F34E-4134-8385-3C85FE23C7DD}"6 ProjectGUID="{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}" 7 7 RootNamespace="pjlib_util" 8 8 > -
pjproject/branches/split-3rd-party/pjlib/build/pjlib.vcproj
r1130 r1177 4 4 Version="8.00" 5 5 Name="pjlib" 6 ProjectGUID="{ 5D0985B4-DAA1-42DB-BDB6-30C2409EAE14}"6 ProjectGUID="{DA0E03ED-53A7-4050-8A85-90541C5509F8}" 7 7 RootNamespace="pjlib" 8 8 > -
pjproject/branches/split-3rd-party/pjmedia/build/pjmedia.dsp
r1175 r1177 43 43 F90=df.exe 44 44 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c 45 # ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../ src/pjmedia/portaudio" /I "../src/pjmedia-codec" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c45 # ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c 46 46 # SUBTRACT CPP /YX 47 47 # ADD BASE RSC /l 0x409 /d "NDEBUG" … … 68 68 F90=df.exe 69 69 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c 70 # ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../ src/pjmedia/portaudio" /I "../src/pjmedia-codec" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c70 # ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c 71 71 # SUBTRACT CPP /YX 72 72 # ADD BASE RSC /l 0x409 /d "_DEBUG" … … 162 162 # Begin Source File 163 163 164 SOURCE=..\src\pjmedia\mp3_writer.c165 # End Source File166 # Begin Source File167 168 164 SOURCE=..\src\pjmedia\null_port.c 169 165 # End Source File … … 182 178 # Begin Source File 183 179 184 SOURCE=..\src\pjmedia\plc_steveu.c185 # ADD CPP /W2186 # End Source File187 # Begin Source File188 189 SOURCE=..\src\pjmedia\plc_steveu.h190 # End Source File191 # Begin Source File192 193 180 SOURCE=..\src\pjmedia\port.c 194 181 # End Source File … … 204 191 205 192 SOURCE=..\src\pjmedia\resample_speex.c 206 # PROP Exclude_From_Build 1207 193 # End Source File 208 194 # Begin Source File … … 337 323 338 324 SOURCE=..\include\pjmedia\mem_port.h 339 # End Source File340 # Begin Source File341 342 SOURCE=..\include\pjmedia\mp3_port.h343 325 # End Source File 344 326 # Begin Source File -
pjproject/branches/split-3rd-party/pjmedia/build/pjmedia.vcproj
r1130 r1177 4 4 Version="8.00" 5 5 Name="pjmedia" 6 ProjectGUID="{ 1434FE6C-89C6-4E13-8150-D5A4B1038AAA}"6 ProjectGUID="{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}" 7 7 RootNamespace="pjmedia" 8 8 > … … 44 44 Optimization="2" 45 45 InlineFunctionExpansion="1" 46 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../ src/pjmedia/portaudio,../src/pjmedia-codec,../../pjnath/include"47 PreprocessorDefinitions="NDEBUG; PA_NO_ASIO;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1"46 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../.." 47 PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1" 48 48 StringPooling="true" 49 49 RuntimeLibrary="2" … … 120 120 Name="VCCLCompilerTool" 121 121 Optimization="0" 122 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../ src/pjmedia/portaudio,../src/pjmedia-codec,../../pjnath/include"123 PreprocessorDefinitions="_DEBUG; PA_NO_ASIO;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1"122 AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../.." 123 PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1" 124 124 MinimalRebuild="true" 125 125 BasicRuntimeChecks="3" … … 573 573 </File> 574 574 <File 575 RelativePath="..\src\pjmedia\mp3_writer.c"576 >577 <FileConfiguration578 Name="Release|Win32"579 >580 <Tool581 Name="VCCLCompilerTool"582 AdditionalIncludeDirectories=""583 PreprocessorDefinitions=""584 />585 </FileConfiguration>586 <FileConfiguration587 Name="Debug|Win32"588 >589 <Tool590 Name="VCCLCompilerTool"591 AdditionalIncludeDirectories=""592 PreprocessorDefinitions=""593 />594 </FileConfiguration>595 </File>596 <File597 575 RelativePath="..\src\pjmedia\null_port.c" 598 576 > … … 683 661 </File> 684 662 <File 685 RelativePath="..\src\pjmedia\plc_steveu.c"686 >687 <FileConfiguration688 Name="Release|Win32"689 >690 <Tool691 Name="VCCLCompilerTool"692 AdditionalIncludeDirectories=""693 PreprocessorDefinitions=""694 WarningLevel="2"695 />696 </FileConfiguration>697 <FileConfiguration698 Name="Debug|Win32"699 >700 <Tool701 Name="VCCLCompilerTool"702 AdditionalIncludeDirectories=""703 PreprocessorDefinitions=""704 WarningLevel="2"705 />706 </FileConfiguration>707 </File>708 <File709 RelativePath="..\src\pjmedia\plc_steveu.h"710 >711 </File>712 <File713 663 RelativePath="..\src\pjmedia\port.c" 714 664 > … … 733 683 </File> 734 684 <File 735 RelativePath="..\src\pjmedia\resample.c"736 >737 <FileConfiguration738 Name="Release|Win32"739 >740 <Tool741 Name="VCCLCompilerTool"742 AdditionalIncludeDirectories=""743 PreprocessorDefinitions=""744 />745 </FileConfiguration>746 <FileConfiguration747 Name="Debug|Win32"748 >749 <Tool750 Name="VCCLCompilerTool"751 AdditionalIncludeDirectories=""752 PreprocessorDefinitions=""753 />754 </FileConfiguration>755 </File>756 <File757 685 RelativePath="..\src\pjmedia\resample_port.c" 758 686 > … … 775 703 /> 776 704 </FileConfiguration> 705 </File> 706 <File 707 RelativePath="..\src\pjmedia\resample_resample.c" 708 > 709 </File> 710 <File 711 RelativePath="..\src\pjmedia\resample_speex.c" 712 > 777 713 </File> 778 714 <File … … 1198 1134 </File> 1199 1135 <File 1200 RelativePath="..\include\pjmedia\mp3_port.h"1201 >1202 </File>1203 <File1204 1136 RelativePath="..\include\pjmedia\null_port.h" 1205 1137 > … … 1291 1223 <File 1292 1224 RelativePath="..\include\pjmedia\wave.h" 1293 >1294 </File>1295 </Filter>1296 <Filter1297 Name="PortAudio Files"1298 >1299 <File1300 RelativePath="..\src\pjmedia\portaudio\dsound_wrapper.c"1301 >1302 <FileConfiguration1303 Name="Release|Win32"1304 >1305 <Tool1306 Name="VCCLCompilerTool"1307 AdditionalIncludeDirectories=""1308 PreprocessorDefinitions=""1309 WarningLevel="3"1310 />1311 </FileConfiguration>1312 <FileConfiguration1313 Name="Debug|Win32"1314 >1315 <Tool1316 Name="VCCLCompilerTool"1317 AdditionalIncludeDirectories=""1318 PreprocessorDefinitions=""1319 WarningLevel="3"1320 />1321 </FileConfiguration>1322 </File>1323 <File1324 RelativePath="..\src\pjmedia\portaudio\dsound_wrapper.h"1325 >1326 </File>1327 <File1328 RelativePath="..\src\pjmedia\portaudio\pa_allocation.c"1329 >1330 <FileConfiguration1331 Name="Release|Win32"1332 >1333 <Tool1334 Name="VCCLCompilerTool"1335 AdditionalIncludeDirectories=""1336 PreprocessorDefinitions=""1337 WarningLevel="3"1338 />1339 </FileConfiguration>1340 <FileConfiguration1341 Name="Debug|Win32"1342 >1343 <Tool1344 Name="VCCLCompilerTool"1345 AdditionalIncludeDirectories=""1346 PreprocessorDefinitions=""1347 WarningLevel="3"1348 />1349 </FileConfiguration>1350 </File>1351 <File1352 RelativePath="..\src\pjmedia\portaudio\pa_allocation.h"1353 >1354 </File>1355 <File1356 RelativePath="..\src\pjmedia\portaudio\pa_converters.c"1357 >1358 <FileConfiguration1359 Name="Release|Win32"1360 >1361 <Tool1362 Name="VCCLCompilerTool"1363 AdditionalIncludeDirectories=""1364 PreprocessorDefinitions=""1365 WarningLevel="3"1366 />1367 </FileConfiguration>1368 <FileConfiguration1369 Name="Debug|Win32"1370 >1371 <Tool1372 Name="VCCLCompilerTool"1373 AdditionalIncludeDirectories=""1374 PreprocessorDefinitions=""1375 WarningLevel="3"1376 />1377 </FileConfiguration>1378 </File>1379 <File1380 RelativePath="..\src\pjmedia\portaudio\pa_converters.h"1381 >1382 </File>1383 <File1384 RelativePath="..\src\pjmedia\portaudio\pa_cpuload.c"1385 >1386 <FileConfiguration1387 Name="Release|Win32"1388 >1389 <Tool1390 Name="VCCLCompilerTool"1391 AdditionalIncludeDirectories=""1392 PreprocessorDefinitions=""1393 WarningLevel="3"1394 />1395 </FileConfiguration>1396 <FileConfiguration1397 Name="Debug|Win32"1398 >1399 <Tool1400 Name="VCCLCompilerTool"1401 AdditionalIncludeDirectories=""1402 PreprocessorDefinitions=""1403 WarningLevel="3"1404 />1405 </FileConfiguration>1406 </File>1407 <File1408 RelativePath="..\src\pjmedia\portaudio\pa_cpuload.h"1409 >1410 </File>1411 <File1412 RelativePath="..\src\pjmedia\portaudio\pa_dither.c"1413 >1414 <FileConfiguration1415 Name="Release|Win32"1416 >1417 <Tool1418 Name="VCCLCompilerTool"1419 AdditionalIncludeDirectories=""1420 PreprocessorDefinitions=""1421 WarningLevel="3"1422 />1423 </FileConfiguration>1424 <FileConfiguration1425 Name="Debug|Win32"1426 >1427 <Tool1428 Name="VCCLCompilerTool"1429 AdditionalIncludeDirectories=""1430 PreprocessorDefinitions=""1431 WarningLevel="3"1432 />1433 </FileConfiguration>1434 </File>1435 <File1436 RelativePath="..\src\pjmedia\portaudio\pa_dither.h"1437 >1438 </File>1439 <File1440 RelativePath="..\src\pjmedia\portaudio\pa_endianness.h"1441 >1442 </File>1443 <File1444 RelativePath="..\src\pjmedia\portaudio\pa_front.c"1445 >1446 <FileConfiguration1447 Name="Release|Win32"1448 >1449 <Tool1450 Name="VCCLCompilerTool"1451 AdditionalIncludeDirectories=""1452 PreprocessorDefinitions=""1453 WarningLevel="3"1454 />1455 </FileConfiguration>1456 <FileConfiguration1457 Name="Debug|Win32"1458 >1459 <Tool1460 Name="VCCLCompilerTool"1461 AdditionalIncludeDirectories=""1462 PreprocessorDefinitions=""1463 WarningLevel="3"1464 />1465 </FileConfiguration>1466 </File>1467 <File1468 RelativePath="..\src\pjmedia\portaudio\pa_hostapi.h"1469 >1470 </File>1471 <File1472 RelativePath="..\src\pjmedia\portaudio\pa_process.c"1473 >1474 <FileConfiguration1475 Name="Release|Win32"1476 >1477 <Tool1478 Name="VCCLCompilerTool"1479 AdditionalIncludeDirectories=""1480 PreprocessorDefinitions=""1481 WarningLevel="3"1482 />1483 </FileConfiguration>1484 <FileConfiguration1485 Name="Debug|Win32"1486 >1487 <Tool1488 Name="VCCLCompilerTool"1489 AdditionalIncludeDirectories=""1490 PreprocessorDefinitions=""1491 WarningLevel="3"1492 />1493 </FileConfiguration>1494 </File>1495 <File1496 RelativePath="..\src\pjmedia\portaudio\pa_process.h"1497 >1498 </File>1499 <File1500 RelativePath="..\src\pjmedia\portaudio\pa_skeleton.c"1501 >1502 <FileConfiguration1503 Name="Release|Win32"1504 >1505 <Tool1506 Name="VCCLCompilerTool"1507 AdditionalIncludeDirectories=""1508 PreprocessorDefinitions=""1509 WarningLevel="3"1510 />1511 </FileConfiguration>1512 <FileConfiguration1513 Name="Debug|Win32"1514 >1515 <Tool1516 Name="VCCLCompilerTool"1517 AdditionalIncludeDirectories=""1518 PreprocessorDefinitions=""1519 WarningLevel="3"1520 />1521 </FileConfiguration>1522 </File>1523 <File1524 RelativePath="..\src\pjmedia\portaudio\pa_stream.c"1525 >1526 <FileConfiguration1527 Name="Release|Win32"1528 >1529 <Tool1530 Name="VCCLCompilerTool"1531 AdditionalIncludeDirectories=""1532 PreprocessorDefinitions=""1533 WarningLevel="3"1534 />1535 </FileConfiguration>1536 <FileConfiguration1537 Name="Debug|Win32"1538 >1539 <Tool1540 Name="VCCLCompilerTool"1541 AdditionalIncludeDirectories=""1542 PreprocessorDefinitions=""1543 WarningLevel="3"1544 />1545 </FileConfiguration>1546 </File>1547 <File1548 RelativePath="..\src\pjmedia\portaudio\pa_stream.h"1549 >1550 </File>1551 <File1552 RelativePath="..\src\pjmedia\portaudio\pa_trace.c"1553 >1554 <FileConfiguration1555 Name="Release|Win32"1556 >1557 <Tool1558 Name="VCCLCompilerTool"1559 AdditionalIncludeDirectories=""1560 PreprocessorDefinitions=""1561 WarningLevel="3"1562 />1563 </FileConfiguration>1564 <FileConfiguration1565 Name="Debug|Win32"1566 >1567 <Tool1568 Name="VCCLCompilerTool"1569 AdditionalIncludeDirectories=""1570 PreprocessorDefinitions=""1571 WarningLevel="3"1572 />1573 </FileConfiguration>1574 </File>1575 <File1576 RelativePath="..\src\pjmedia\portaudio\pa_trace.h"1577 >1578 </File>1579 <File1580 RelativePath="..\src\pjmedia\portaudio\pa_types.h"1581 >1582 </File>1583 <File1584 RelativePath="..\src\pjmedia\portaudio\pa_util.h"1585 >1586 </File>1587 <File1588 RelativePath="..\src\pjmedia\portaudio\pa_win_ds.c"1589 >1590 <FileConfiguration1591 Name="Release|Win32"1592 >1593 <Tool1594 Name="VCCLCompilerTool"1595 AdditionalIncludeDirectories=""1596 PreprocessorDefinitions=""1597 WarningLevel="3"1598 />1599 </FileConfiguration>1600 <FileConfiguration1601 Name="Debug|Win32"1602 >1603 <Tool1604 Name="VCCLCompilerTool"1605 AdditionalIncludeDirectories=""1606 PreprocessorDefinitions=""1607 WarningLevel="3"1608 />1609 </FileConfiguration>1610 </File>1611 <File1612 RelativePath="..\src\pjmedia\portaudio\pa_win_hostapis.c"1613 >1614 <FileConfiguration1615 Name="Release|Win32"1616 >1617 <Tool1618 Name="VCCLCompilerTool"1619 AdditionalIncludeDirectories=""1620 PreprocessorDefinitions=""1621 WarningLevel="3"1622 />1623 </FileConfiguration>1624 <FileConfiguration1625 Name="Debug|Win32"1626 >1627 <Tool1628 Name="VCCLCompilerTool"1629 AdditionalIncludeDirectories=""1630 PreprocessorDefinitions=""1631 WarningLevel="3"1632 />1633 </FileConfiguration>1634 </File>1635 <File1636 RelativePath="..\src\pjmedia\portaudio\pa_win_util.c"1637 >1638 <FileConfiguration1639 Name="Release|Win32"1640 >1641 <Tool1642 Name="VCCLCompilerTool"1643 AdditionalIncludeDirectories=""1644 PreprocessorDefinitions=""1645 WarningLevel="3"1646 />1647 </FileConfiguration>1648 <FileConfiguration1649 Name="Debug|Win32"1650 >1651 <Tool1652 Name="VCCLCompilerTool"1653 AdditionalIncludeDirectories=""1654 PreprocessorDefinitions=""1655 WarningLevel="3"1656 />1657 </FileConfiguration>1658 </File>1659 <File1660 RelativePath="..\src\pjmedia\portaudio\pa_win_wmme.c"1661 >1662 <FileConfiguration1663 Name="Release|Win32"1664 >1665 <Tool1666 Name="VCCLCompilerTool"1667 AdditionalIncludeDirectories=""1668 PreprocessorDefinitions=""1669 WarningLevel="3"1670 />1671 </FileConfiguration>1672 <FileConfiguration1673 Name="Debug|Win32"1674 >1675 <Tool1676 Name="VCCLCompilerTool"1677 AdditionalIncludeDirectories=""1678 PreprocessorDefinitions=""1679 WarningLevel="3"1680 />1681 </FileConfiguration>1682 </File>1683 <File1684 RelativePath="..\src\pjmedia\portaudio\pa_win_wmme.h"1685 >1686 </File>1687 <File1688 RelativePath="..\src\pjmedia\portaudio\pa_x86_plain_converters.c"1689 >1690 <FileConfiguration1691 Name="Release|Win32"1692 >1693 <Tool1694 Name="VCCLCompilerTool"1695 AdditionalIncludeDirectories=""1696 PreprocessorDefinitions=""1697 WarningLevel="3"1698 />1699 </FileConfiguration>1700 <FileConfiguration1701 Name="Debug|Win32"1702 >1703 <Tool1704 Name="VCCLCompilerTool"1705 AdditionalIncludeDirectories=""1706 PreprocessorDefinitions=""1707 WarningLevel="3"1708 />1709 </FileConfiguration>1710 </File>1711 <File1712 RelativePath="..\src\pjmedia\portaudio\pa_x86_plain_converters.h"1713 >1714 </File>1715 <File1716 RelativePath="..\src\pjmedia\portaudio\portaudio.h"1717 >1718 </File>1719 </Filter>1720 <Filter1721 Name="Resample Files"1722 >1723 <File1724 RelativePath="..\src\pjmedia\largefilter.h"1725 >1726 </File>1727 <File1728 RelativePath="..\src\pjmedia\smallfilter.h"1729 1225 > 1730 1226 </File> -
pjproject/branches/split-3rd-party/pjmedia/build/pjmedia_codec.vcproj
r1130 r1177 4 4 Version="8.00" 5 5 Name="pjmedia_codec" 6 ProjectGUID="{ 0545EB9B-CE7C-4EDC-86E8-FB46A8DC1236}"6 ProjectGUID="{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}" 7 7 > 8 8 <Platforms> … … 42 42 Name="VCCLCompilerTool" 43 43 Optimization="0" 44 AdditionalIncludeDirectories="../include,../../pjlib/include,../ src/pjmedia-codec"44 AdditionalIncludeDirectories="../include,../../pjlib/include,../../third_party/speex/include" 45 45 PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H" 46 46 MinimalRebuild="true" … … 119 119 Optimization="2" 120 120 InlineFunctionExpansion="1" 121 AdditionalIncludeDirectories="../include,../../pjlib/include,../ src/pjmedia-codec"121 AdditionalIncludeDirectories="../include,../../pjlib/include,../../third_party/speex/include" 122 122 PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H" 123 123 StringPooling="true" … … 297 297 </File> 298 298 </Filter> 299 <Filter300 Name="GSM 06.10 Library"301 >302 <File303 RelativePath="..\src\pjmedia-codec\gsm\add.c"304 >305 <FileConfiguration306 Name="Debug|Win32"307 >308 <Tool309 Name="VCCLCompilerTool"310 AdditionalIncludeDirectories=""311 PreprocessorDefinitions=""312 WarningLevel="2"313 />314 </FileConfiguration>315 <FileConfiguration316 Name="Release|Win32"317 >318 <Tool319 Name="VCCLCompilerTool"320 AdditionalIncludeDirectories=""321 PreprocessorDefinitions=""322 WarningLevel="2"323 />324 </FileConfiguration>325 </File>326 <File327 RelativePath="..\src\pjmedia-codec\gsm\code.c"328 >329 <FileConfiguration330 Name="Debug|Win32"331 >332 <Tool333 Name="VCCLCompilerTool"334 AdditionalIncludeDirectories=""335 PreprocessorDefinitions=""336 WarningLevel="2"337 />338 </FileConfiguration>339 <FileConfiguration340 Name="Release|Win32"341 >342 <Tool343 Name="VCCLCompilerTool"344 AdditionalIncludeDirectories=""345 PreprocessorDefinitions=""346 WarningLevel="2"347 />348 </FileConfiguration>349 </File>350 <File351 RelativePath="..\src\pjmedia-codec\gsm\config.h"352 >353 </File>354 <File355 RelativePath="..\src\pjmedia-codec\gsm\debug.c"356 >357 <FileConfiguration358 Name="Debug|Win32"359 >360 <Tool361 Name="VCCLCompilerTool"362 AdditionalIncludeDirectories=""363 PreprocessorDefinitions=""364 WarningLevel="2"365 />366 </FileConfiguration>367 <FileConfiguration368 Name="Release|Win32"369 >370 <Tool371 Name="VCCLCompilerTool"372 AdditionalIncludeDirectories=""373 PreprocessorDefinitions=""374 WarningLevel="2"375 />376 </FileConfiguration>377 </File>378 <File379 RelativePath="..\src\pjmedia-codec\gsm\decode.c"380 >381 <FileConfiguration382 Name="Debug|Win32"383 >384 <Tool385 Name="VCCLCompilerTool"386 AdditionalIncludeDirectories=""387 PreprocessorDefinitions=""388 WarningLevel="2"389 />390 </FileConfiguration>391 <FileConfiguration392 Name="Release|Win32"393 >394 <Tool395 Name="VCCLCompilerTool"396 AdditionalIncludeDirectories=""397 PreprocessorDefinitions=""398 WarningLevel="2"399 />400 </FileConfiguration>401 </File>402 <File403 RelativePath="..\src\pjmedia-codec\gsm\gsm.h"404 >405 </File>406 <File407 RelativePath="..\src\pjmedia-codec\gsm\gsm_create.c"408 >409 <FileConfiguration410 Name="Debug|Win32"411 >412 <Tool413 Name="VCCLCompilerTool"414 AdditionalIncludeDirectories=""415 PreprocessorDefinitions=""416 WarningLevel="2"417 />418 </FileConfiguration>419 <FileConfiguration420 Name="Release|Win32"421 >422 <Tool423 Name="VCCLCompilerTool"424 AdditionalIncludeDirectories=""425 PreprocessorDefinitions=""426 WarningLevel="2"427 />428 </FileConfiguration>429 </File>430 <File431 RelativePath="..\src\pjmedia-codec\gsm\gsm_decode.c"432 >433 <FileConfiguration434 Name="Debug|Win32"435 >436 <Tool437 Name="VCCLCompilerTool"438 AdditionalIncludeDirectories=""439 PreprocessorDefinitions=""440 WarningLevel="2"441 />442 </FileConfiguration>443 <FileConfiguration444 Name="Release|Win32"445 >446 <Tool447 Name="VCCLCompilerTool"448 AdditionalIncludeDirectories=""449 PreprocessorDefinitions=""450 WarningLevel="2"451 />452 </FileConfiguration>453 </File>454 <File455 RelativePath="..\src\pjmedia-codec\gsm\gsm_destroy.c"456 >457 <FileConfiguration458 Name="Debug|Win32"459 >460 <Tool461 Name="VCCLCompilerTool"462 AdditionalIncludeDirectories=""463 PreprocessorDefinitions=""464 WarningLevel="2"465 />466 </FileConfiguration>467 <FileConfiguration468 Name="Release|Win32"469 >470 <Tool471 Name="VCCLCompilerTool"472 AdditionalIncludeDirectories=""473 PreprocessorDefinitions=""474 WarningLevel="2"475 />476 </FileConfiguration>477 </File>478 <File479 RelativePath="..\src\pjmedia-codec\gsm\gsm_encode.c"480 >481 <FileConfiguration482 Name="Debug|Win32"483 >484 <Tool485 Name="VCCLCompilerTool"486 AdditionalIncludeDirectories=""487 PreprocessorDefinitions=""488 WarningLevel="2"489 />490 </FileConfiguration>491 <FileConfiguration492 Name="Release|Win32"493 >494 <Tool495 Name="VCCLCompilerTool"496 AdditionalIncludeDirectories=""497 PreprocessorDefinitions=""498 WarningLevel="2"499 />500 </FileConfiguration>501 </File>502 <File503 RelativePath="..\src\pjmedia-codec\gsm\gsm_option.c"504 >505 <FileConfiguration506 Name="Debug|Win32"507 >508 <Tool509 Name="VCCLCompilerTool"510 AdditionalIncludeDirectories=""511 PreprocessorDefinitions=""512 WarningLevel="2"513 />514 </FileConfiguration>515 <FileConfiguration516 Name="Release|Win32"517 >518 <Tool519 Name="VCCLCompilerTool"520 AdditionalIncludeDirectories=""521 PreprocessorDefinitions=""522 WarningLevel="2"523 />524 </FileConfiguration>525 </File>526 <File527 RelativePath="..\src\pjmedia-codec\gsm\gsm_print.c"528 >529 <FileConfiguration530 Name="Debug|Win32"531 >532 <Tool533 Name="VCCLCompilerTool"534 AdditionalIncludeDirectories=""535 PreprocessorDefinitions=""536 WarningLevel="2"537 />538 </FileConfiguration>539 <FileConfiguration540 Name="Release|Win32"541 >542 <Tool543 Name="VCCLCompilerTool"544 AdditionalIncludeDirectories=""545 PreprocessorDefinitions=""546 WarningLevel="2"547 />548 </FileConfiguration>549 </File>550 <File551 RelativePath="..\src\pjmedia-codec\gsm\long_term.c"552 >553 <FileConfiguration554 Name="Debug|Win32"555 >556 <Tool557 Name="VCCLCompilerTool"558 AdditionalIncludeDirectories=""559 PreprocessorDefinitions=""560 WarningLevel="2"561 />562 </FileConfiguration>563 <FileConfiguration564 Name="Release|Win32"565 >566 <Tool567 Name="VCCLCompilerTool"568 AdditionalIncludeDirectories=""569 PreprocessorDefinitions=""570 WarningLevel="2"571 />572 </FileConfiguration>573 </File>574 <File575 RelativePath="..\src\pjmedia-codec\gsm\lpc.c"576 >577 <FileConfiguration578 Name="Debug|Win32"579 >580 <Tool581 Name="VCCLCompilerTool"582 AdditionalIncludeDirectories=""583 PreprocessorDefinitions=""584 WarningLevel="2"585 />586 </FileConfiguration>587 <FileConfiguration588 Name="Release|Win32"589 >590 <Tool591 Name="VCCLCompilerTool"592 AdditionalIncludeDirectories=""593 PreprocessorDefinitions=""594 WarningLevel="2"595 />596 </FileConfiguration>597 </File>598 <File599 RelativePath="..\src\pjmedia-codec\gsm\preprocess.c"600 >601 <FileConfiguration602 Name="Debug|Win32"603 >604 <Tool605 Name="VCCLCompilerTool"606 AdditionalIncludeDirectories=""607 PreprocessorDefinitions=""608 WarningLevel="2"609 />610 </FileConfiguration>611 <FileConfiguration612 Name="Release|Win32"613 >614 <Tool615 Name="VCCLCompilerTool"616 AdditionalIncludeDirectories=""617 PreprocessorDefinitions=""618 WarningLevel="2"619 />620 </FileConfiguration>621 </File>622 <File623 RelativePath="..\src\pjmedia-codec\gsm\private.h"624 >625 </File>626 <File627 RelativePath="..\src\pjmedia-codec\gsm\proto.h"628 >629 </File>630 <File631 RelativePath="..\src\pjmedia-codec\gsm\rpe.c"632 >633 <FileConfiguration634 Name="Debug|Win32"635 >636 <Tool637 Name="VCCLCompilerTool"638 AdditionalIncludeDirectories=""639 PreprocessorDefinitions=""640 WarningLevel="2"641 />642 </FileConfiguration>643 <FileConfiguration644 Name="Release|Win32"645 >646 <Tool647 Name="VCCLCompilerTool"648 AdditionalIncludeDirectories=""649 PreprocessorDefinitions=""650 WarningLevel="2"651 />652 </FileConfiguration>653 </File>654 <File655 RelativePath="..\src\pjmedia-codec\gsm\short_term.c"656 >657 <FileConfiguration658 Name="Debug|Win32"659 >660 <Tool661 Name="VCCLCompilerTool"662 AdditionalIncludeDirectories=""663 PreprocessorDefinitions=""664 WarningLevel="2"665 />666 </FileConfiguration>667 <FileConfiguration668 Name="Release|Win32"669 >670 <Tool671 Name="VCCLCompilerTool"672 AdditionalIncludeDirectories=""673 PreprocessorDefinitions=""674 WarningLevel="2"675 />676 </FileConfiguration>677 </File>678 <File679 RelativePath="..\src\pjmedia-codec\gsm\table.c"680 >681 <FileConfiguration682 Name="Debug|Win32"683 >684 <Tool685 Name="VCCLCompilerTool"686 AdditionalIncludeDirectories=""687 PreprocessorDefinitions=""688 WarningLevel="2"689 />690 </FileConfiguration>691 <FileConfiguration692 Name="Release|Win32"693 >694 <Tool695 Name="VCCLCompilerTool"696 AdditionalIncludeDirectories=""697 PreprocessorDefinitions=""698 WarningLevel="2"699 />700 </FileConfiguration>701 </File>702 <File703 RelativePath="..\src\pjmedia-codec\gsm\toast.h"704 >705 </File>706 <File707 RelativePath="..\src\pjmedia-codec\gsm\unproto.h"708 >709 </File>710 </Filter>711 <Filter712 Name="Speex Codec"713 >714 <Filter715 Name="Speex Header Files"716 >717 <File718 RelativePath="..\src\pjmedia-codec\speex\_kiss_fft_guts.h"719 >720 </File>721 <File722 RelativePath="..\src\pjmedia-codec\speex\arch.h"723 >724 </File>725 <File726 RelativePath="..\src\pjmedia-codec\speex\cb_search.h"727 >728 </File>729 <File730 RelativePath="..\src\pjmedia-codec\speex\cb_search_arm4.h"731 >732 </File>733 <File734 RelativePath="..\src\pjmedia-codec\speex\cb_search_bfin.h"735 >736 </File>737 <File738 RelativePath="..\src\pjmedia-codec\speex\cb_search_sse.h"739 >740 </File>741 <File742 RelativePath="..\src\pjmedia-codec\speex\config.h"743 >744 </File>745 <File746 RelativePath="..\src\pjmedia-codec\speex\fftwrap.h"747 >748 </File>749 <File750 RelativePath="..\src\pjmedia-codec\speex\filterbank.h"751 >752 </File>753 <File754 RelativePath="..\src\pjmedia-codec\speex\filters.h"755 >756 </File>757 <File758 RelativePath="..\src\pjmedia-codec\speex\filters_arm4.h"759 >760 </File>761 <File762 RelativePath="..\src\pjmedia-codec\speex\filters_bfin.h"763 >764 </File>765 <File766 RelativePath="..\src\pjmedia-codec\speex\filters_sse.h"767 >768 </File>769 <File770 RelativePath="..\src\pjmedia-codec\speex\fixed_arm4.h"771 >772 </File>773 <File774 RelativePath="..\src\pjmedia-codec\speex\fixed_arm5e.h"775 >776 </File>777 <File778 RelativePath="..\src\pjmedia-codec\speex\fixed_bfin.h"779 >780 </File>781 <File782 RelativePath="..\src\pjmedia-codec\speex\fixed_debug.h"783 >784 </File>785 <File786 RelativePath="..\src\pjmedia-codec\speex\fixed_generic.h"787 >788 </File>789 <File790 RelativePath="..\src\pjmedia-codec\speex\kiss_fft.h"791 >792 </File>793 <File794 RelativePath="..\src\pjmedia-codec\speex\kiss_fftr.h"795 >796 </File>797 <File798 RelativePath="..\src\pjmedia-codec\speex\lpc.h"799 >800 </File>801 <File802 RelativePath="..\src\pjmedia-codec\speex\lpc_bfin.h"803 >804 </File>805 <File806 RelativePath="..\src\pjmedia-codec\speex\lsp.h"807 >808 </File>809 <File810 RelativePath="..\src\pjmedia-codec\speex\ltp.h"811 >812 </File>813 <File814 RelativePath="..\src\pjmedia-codec\speex\ltp_arm4.h"815 >816 </File>817 <File818 RelativePath="..\src\pjmedia-codec\speex\ltp_bfin.h"819 >820 </File>821 <File822 RelativePath="..\src\pjmedia-codec\speex\ltp_sse.h"823 >824 </File>825 <File826 RelativePath="..\src\pjmedia-codec\speex\math_approx.h"827 >828 </File>829 <File830 RelativePath="..\src\pjmedia-codec\speex\misc.h"831 >832 </File>833 <File834 RelativePath="..\src\pjmedia-codec\speex\misc_bfin.h"835 >836 </File>837 <File838 RelativePath="..\src\pjmedia-codec\speex\modes.h"839 >840 </File>841 <File842 RelativePath="..\src\pjmedia-codec\speex\nb_celp.h"843 >844 </File>845 <File846 RelativePath="..\src\pjmedia-codec\speex\pseudofloat.h"847 >848 </File>849 <File850 RelativePath="..\src\pjmedia-codec\speex\quant_lsp.h"851 >852 </File>853 <File854 RelativePath="..\src\pjmedia-codec\speex\sb_celp.h"855 >856 </File>857 <File858 RelativePath="..\src\pjmedia-codec\speex\smallft.h"859 >860 </File>861 <File862 RelativePath="..\src\pjmedia-codec\speex\speex.h"863 >864 </File>865 <File866 RelativePath="..\src\pjmedia-codec\speex\speex_bits.h"867 >868 </File>869 <File870 RelativePath="..\src\pjmedia-codec\speex\speex_callbacks.h"871 >872 </File>873 <File874 RelativePath="..\src\pjmedia-codec\speex\speex_echo.h"875 >876 </File>877 <File878 RelativePath="..\src\pjmedia-codec\speex\speex_header.h"879 >880 </File>881 <File882 RelativePath="..\src\pjmedia-codec\speex\speex_jitter.h"883 >884 </File>885 <File886 RelativePath="..\src\pjmedia-codec\speex\speex_preprocess.h"887 >888 </File>889 <File890 RelativePath="..\src\pjmedia-codec\speex\speex_stereo.h"891 >892 </File>893 <File894 RelativePath="..\src\pjmedia-codec\speex\speex_types.h"895 >896 </File>897 <File898 RelativePath="..\src\pjmedia-codec\speex\stack_alloc.h"899 >900 </File>901 <File902 RelativePath="..\src\pjmedia-codec\speex\vbr.h"903 >904 </File>905 <File906 RelativePath="..\src\pjmedia-codec\speex\vq.h"907 >908 </File>909 <File910 RelativePath="..\src\pjmedia-codec\speex\vq_arm4.h"911 >912 </File>913 <File914 RelativePath="..\src\pjmedia-codec\speex\vq_bfin.h"915 >916 </File>917 <File918 RelativePath="..\src\pjmedia-codec\speex\vq_sse.h"919 >920 </File>921 </Filter>922 <Filter923 Name="Speex Source Files"924 >925 <File926 RelativePath="..\src\pjmedia-codec\speex\bits.c"927 >928 <FileConfiguration929 Name="Debug|Win32"930 >931 <Tool932 Name="VCCLCompilerTool"933 AdditionalIncludeDirectories=""934 PreprocessorDefinitions=""935 WarningLevel="3"936 />937 </FileConfiguration>938 <FileConfiguration939 Name="Release|Win32"940 >941 <Tool942 Name="VCCLCompilerTool"943 AdditionalIncludeDirectories=""944 PreprocessorDefinitions=""945 WarningLevel="3"946 />947 </FileConfiguration>948 </File>949 <File950 RelativePath="..\src\pjmedia-codec\speex\cb_search.c"951 >952 <FileConfiguration953 Name="Debug|Win32"954 >955 <Tool956 Name="VCCLCompilerTool"957 AdditionalIncludeDirectories=""958 PreprocessorDefinitions=""959 WarningLevel="3"960 />961 </FileConfiguration>962 <FileConfiguration963 Name="Release|Win32"964 >965 <Tool966 Name="VCCLCompilerTool"967 AdditionalIncludeDirectories=""968 PreprocessorDefinitions=""969 WarningLevel="3"970 />971 </FileConfiguration>972 </File>973 <File974 RelativePath="..\src\pjmedia-codec\speex\exc_10_16_table.c"975 >976 <FileConfiguration977 Name="Debug|Win32"978 >979 <Tool980 Name="VCCLCompilerTool"981 AdditionalIncludeDirectories=""982 PreprocessorDefinitions=""983 WarningLevel="3"984 />985 </FileConfiguration>986 <FileConfiguration987 Name="Release|Win32"988 >989 <Tool990 Name="VCCLCompilerTool"991 AdditionalIncludeDirectories=""992 PreprocessorDefinitions=""993 WarningLevel="3"994 />995 </FileConfiguration>996 </File>997 <File998 RelativePath="..\src\pjmedia-codec\speex\exc_10_32_table.c"999 >1000 <FileConfiguration1001 Name="Debug|Win32"1002 >1003 <Tool1004 Name="VCCLCompilerTool"1005 AdditionalIncludeDirectories=""1006 PreprocessorDefinitions=""1007 WarningLevel="3"1008 />1009 </FileConfiguration>1010 <FileConfiguration1011 Name="Release|Win32"1012 >1013 <Tool1014 Name="VCCLCompilerTool"1015 AdditionalIncludeDirectories=""1016 PreprocessorDefinitions=""1017 WarningLevel="3"1018 />1019 </FileConfiguration>1020 </File>1021 <File1022 RelativePath="..\src\pjmedia-codec\speex\exc_20_32_table.c"1023 >1024 <FileConfiguration1025 Name="Debug|Win32"1026 >1027 <Tool1028 Name="VCCLCompilerTool"1029 AdditionalIncludeDirectories=""1030 PreprocessorDefinitions=""1031 WarningLevel="3"1032 />1033 </FileConfiguration>1034 <FileConfiguration1035 Name="Release|Win32"1036 >1037 <Tool1038 Name="VCCLCompilerTool"1039 AdditionalIncludeDirectories=""1040 PreprocessorDefinitions=""1041 WarningLevel="3"1042 />1043 </FileConfiguration>1044 </File>1045 <File1046 RelativePath="..\src\pjmedia-codec\speex\exc_5_256_table.c"1047 >1048 <FileConfiguration1049 Name="Debug|Win32"1050 >1051 <Tool1052 Name="VCCLCompilerTool"1053 AdditionalIncludeDirectories=""1054 PreprocessorDefinitions=""1055 WarningLevel="3"1056 />1057 </FileConfiguration>1058 <FileConfiguration1059 Name="Release|Win32"1060 >1061 <Tool1062 Name="VCCLCompilerTool"1063 AdditionalIncludeDirectories=""1064 PreprocessorDefinitions=""1065 WarningLevel="3"1066 />1067 </FileConfiguration>1068 </File>1069 <File1070 RelativePath="..\src\pjmedia-codec\speex\exc_5_64_table.c"1071 >1072 <FileConfiguration1073 Name="Debug|Win32"1074 >1075 <Tool1076 Name="VCCLCompilerTool"1077 AdditionalIncludeDirectories=""1078 PreprocessorDefinitions=""1079 WarningLevel="3"1080 />1081 </FileConfiguration>1082 <FileConfiguration1083 Name="Release|Win32"1084 >1085 <Tool1086 Name="VCCLCompilerTool"1087 AdditionalIncludeDirectories=""1088 PreprocessorDefinitions=""1089 WarningLevel="3"1090 />1091 </FileConfiguration>1092 </File>1093 <File1094 RelativePath="..\src\pjmedia-codec\speex\exc_8_128_table.c"1095 >1096 <FileConfiguration1097 Name="Debug|Win32"1098 >1099 <Tool1100 Name="VCCLCompilerTool"1101 AdditionalIncludeDirectories=""1102 PreprocessorDefinitions=""1103 WarningLevel="3"1104 />1105 </FileConfiguration>1106 <FileConfiguration1107 Name="Release|Win32"1108 >1109 <Tool1110 Name="VCCLCompilerTool"1111 AdditionalIncludeDirectories=""1112 PreprocessorDefinitions=""1113 WarningLevel="3"1114 />1115 </FileConfiguration>1116 </File>1117 <File1118 RelativePath="..\src\pjmedia-codec\speex\fftwrap.c"1119 >1120 <FileConfiguration1121 Name="Debug|Win32"1122 >1123 <Tool1124 Name="VCCLCompilerTool"1125 AdditionalIncludeDirectories=""1126 PreprocessorDefinitions=""1127 WarningLevel="3"1128 />1129 </FileConfiguration>1130 <FileConfiguration1131 Name="Release|Win32"1132 >1133 <Tool1134 Name="VCCLCompilerTool"1135 AdditionalIncludeDirectories=""1136 PreprocessorDefinitions=""1137 WarningLevel="3"1138 />1139 </FileConfiguration>1140 </File>1141 <File1142 RelativePath="..\src\pjmedia-codec\speex\filterbank.c"1143 >1144 <FileConfiguration1145 Name="Debug|Win32"1146 >1147 <Tool1148 Name="VCCLCompilerTool"1149 AdditionalIncludeDirectories=""1150 PreprocessorDefinitions=""1151 />1152 </FileConfiguration>1153 <FileConfiguration1154 Name="Release|Win32"1155 >1156 <Tool1157 Name="VCCLCompilerTool"1158 AdditionalIncludeDirectories=""1159 PreprocessorDefinitions=""1160 />1161 </FileConfiguration>1162 </File>1163 <File1164 RelativePath="..\src\pjmedia-codec\speex\filters.c"1165 >1166 <FileConfiguration1167 Name="Debug|Win32"1168 >1169 <Tool1170 Name="VCCLCompilerTool"1171 AdditionalIncludeDirectories=""1172 PreprocessorDefinitions=""1173 WarningLevel="3"1174 />1175 </FileConfiguration>1176 <FileConfiguration1177 Name="Release|Win32"1178 >1179 <Tool1180 Name="VCCLCompilerTool"1181 AdditionalIncludeDirectories=""1182 PreprocessorDefinitions=""1183 WarningLevel="3"1184 />1185 </FileConfiguration>1186 </File>1187 <File1188 RelativePath="..\src\pjmedia-codec\speex\gain_table.c"1189 >1190 <FileConfiguration1191 Name="Debug|Win32"1192 >1193 <Tool1194 Name="VCCLCompilerTool"1195 AdditionalIncludeDirectories=""1196 PreprocessorDefinitions=""1197 WarningLevel="3"1198 />1199 </FileConfiguration>1200 <FileConfiguration1201 Name="Release|Win32"1202 >1203 <Tool1204 Name="VCCLCompilerTool"1205 AdditionalIncludeDirectories=""1206 PreprocessorDefinitions=""1207 WarningLevel="3"1208 />1209 </FileConfiguration>1210 </File>1211 <File1212 RelativePath="..\src\pjmedia-codec\speex\gain_table_lbr.c"1213 >1214 <FileConfiguration1215 Name="Debug|Win32"1216 >1217 <Tool1218 Name="VCCLCompilerTool"1219 AdditionalIncludeDirectories=""1220 PreprocessorDefinitions=""1221 WarningLevel="3"1222 />1223 </FileConfiguration>1224 <FileConfiguration1225 Name="Release|Win32"1226 >1227 <Tool1228 Name="VCCLCompilerTool"1229 AdditionalIncludeDirectories=""1230 PreprocessorDefinitions=""1231 WarningLevel="3"1232 />1233 </FileConfiguration>1234 </File>1235 <File1236 RelativePath="..\src\pjmedia-codec\speex\hexc_10_32_table.c"1237 >1238 <FileConfiguration1239 Name="Debug|Win32"1240 >1241 <Tool1242 Name="VCCLCompilerTool"1243 AdditionalIncludeDirectories=""1244 PreprocessorDefinitions=""1245 WarningLevel="3"1246 />1247 </FileConfiguration>1248 <FileConfiguration1249 Name="Release|Win32"1250 >1251 <Tool1252 Name="VCCLCompilerTool"1253 AdditionalIncludeDirectories=""1254 PreprocessorDefinitions=""1255 WarningLevel="3"1256 />1257 </FileConfiguration>1258 </File>1259 <File1260 RelativePath="..\src\pjmedia-codec\speex\hexc_table.c"1261 >1262 <FileConfiguration1263 Name="Debug|Win32"1264 >1265 <Tool1266 Name="VCCLCompilerTool"1267 AdditionalIncludeDirectories=""1268 PreprocessorDefinitions=""1269 WarningLevel="3"1270 />1271 </FileConfiguration>1272 <FileConfiguration1273 Name="Release|Win32"1274 >1275 <Tool1276 Name="VCCLCompilerTool"1277 AdditionalIncludeDirectories=""1278 PreprocessorDefinitions=""1279 WarningLevel="3"1280 />1281 </FileConfiguration>1282 </File>1283 <File1284 RelativePath="..\src\pjmedia-codec\speex\high_lsp_tables.c"1285 >1286 <FileConfiguration1287 Name="Debug|Win32"1288 >1289 <Tool1290 Name="VCCLCompilerTool"1291 AdditionalIncludeDirectories=""1292 PreprocessorDefinitions=""1293 WarningLevel="3"1294 />1295 </FileConfiguration>1296 <FileConfiguration1297 Name="Release|Win32"1298 >1299 <Tool1300 Name="VCCLCompilerTool"1301 AdditionalIncludeDirectories=""1302 PreprocessorDefinitions=""1303 WarningLevel="3"1304 />1305 </FileConfiguration>1306 </File>1307 <File1308 RelativePath="..\src\pjmedia-codec\speex\jitter.c"1309 >1310 <FileConfiguration1311 Name="Debug|Win32"1312 >1313 <Tool1314 Name="VCCLCompilerTool"1315 AdditionalIncludeDirectories=""1316 PreprocessorDefinitions=""1317 WarningLevel="3"1318 />1319 </FileConfiguration>1320 <FileConfiguration1321 Name="Release|Win32"1322 >1323 <Tool1324 Name="VCCLCompilerTool"1325 AdditionalIncludeDirectories=""1326 PreprocessorDefinitions=""1327 WarningLevel="3"1328 />1329 </FileConfiguration>1330 </File>1331 <File1332 RelativePath="..\src\pjmedia-codec\speex\kiss_fft.c"1333 >1334 <FileConfiguration1335 Name="Debug|Win32"1336 >1337 <Tool1338 Name="VCCLCompilerTool"1339 AdditionalIncludeDirectories=""1340 PreprocessorDefinitions=""1341 WarningLevel="3"1342 />1343 </FileConfiguration>1344 <FileConfiguration1345 Name="Release|Win32"1346 >1347 <Tool1348 Name="VCCLCompilerTool"1349 AdditionalIncludeDirectories=""1350 PreprocessorDefinitions=""1351 WarningLevel="3"1352 />1353 </FileConfiguration>1354 </File>1355 <File1356 RelativePath="..\src\pjmedia-codec\speex\kiss_fftr.c"1357 >1358 <FileConfiguration1359 Name="Debug|Win32"1360 >1361 <Tool1362 Name="VCCLCompilerTool"1363 AdditionalIncludeDirectories=""1364 PreprocessorDefinitions=""1365 WarningLevel="3"1366 />1367 </FileConfiguration>1368 <FileConfiguration1369 Name="Release|Win32"1370 >1371 <Tool1372 Name="VCCLCompilerTool"1373 AdditionalIncludeDirectories=""1374 PreprocessorDefinitions=""1375 WarningLevel="3"1376 />1377 </FileConfiguration>1378 </File>1379 <File1380 RelativePath="..\src\pjmedia-codec\speex\lpc_spx.c"1381 >1382 <FileConfiguration1383 Name="Debug|Win32"1384 >1385 <Tool1386 Name="VCCLCompilerTool"1387 AdditionalIncludeDirectories=""1388 PreprocessorDefinitions=""1389 WarningLevel="3"1390 />1391 </FileConfiguration>1392 <FileConfiguration1393 Name="Release|Win32"1394 >1395 <Tool1396 Name="VCCLCompilerTool"1397 AdditionalIncludeDirectories=""1398 PreprocessorDefinitions=""1399 WarningLevel="3"1400 />1401 </FileConfiguration>1402 </File>1403 <File1404 RelativePath="..\src\pjmedia-codec\speex\lsp.c"1405 >1406 <FileConfiguration1407 Name="Debug|Win32"1408 >1409 <Tool1410 Name="VCCLCompilerTool"1411 AdditionalIncludeDirectories=""1412 PreprocessorDefinitions=""1413 WarningLevel="3"1414 />1415 </FileConfiguration>1416 <FileConfiguration1417 Name="Release|Win32"1418 >1419 <Tool1420 Name="VCCLCompilerTool"1421 AdditionalIncludeDirectories=""1422 PreprocessorDefinitions=""1423 WarningLevel="3"1424 />1425 </FileConfiguration>1426 </File>1427 <File1428 RelativePath="..\src\pjmedia-codec\speex\lsp_tables_nb.c"1429 >1430 <FileConfiguration1431 Name="Debug|Win32"1432 >1433 <Tool1434 Name="VCCLCompilerTool"1435 AdditionalIncludeDirectories=""1436 PreprocessorDefinitions=""1437 WarningLevel="3"1438 />1439 </FileConfiguration>1440 <FileConfiguration1441 Name="Release|Win32"1442 >1443 <Tool1444 Name="VCCLCompilerTool"1445 AdditionalIncludeDirectories=""1446 PreprocessorDefinitions=""1447 WarningLevel="3"1448 />1449 </FileConfiguration>1450 </File>1451 <File1452 RelativePath="..\src\pjmedia-codec\speex\ltp.c"1453 >1454 <FileConfiguration1455 Name="Debug|Win32"1456 >1457 <Tool1458 Name="VCCLCompilerTool"1459 AdditionalIncludeDirectories=""1460 PreprocessorDefinitions=""1461 WarningLevel="3"1462 />1463 </FileConfiguration>1464 <FileConfiguration1465 Name="Release|Win32"1466 >1467 <Tool1468 Name="VCCLCompilerTool"1469 AdditionalIncludeDirectories=""1470 PreprocessorDefinitions=""1471 WarningLevel="3"1472 />1473 </FileConfiguration>1474 </File>1475 <File1476 RelativePath="..\src\pjmedia-codec\speex\math_approx.c"1477 >1478 <FileConfiguration1479 Name="Debug|Win32"1480 >1481 <Tool1482 Name="VCCLCompilerTool"1483 AdditionalIncludeDirectories=""1484 PreprocessorDefinitions=""1485 WarningLevel="3"1486 />1487 </FileConfiguration>1488 <FileConfiguration1489 Name="Release|Win32"1490 >1491 <Tool1492 Name="VCCLCompilerTool"1493 AdditionalIncludeDirectories=""1494 PreprocessorDefinitions=""1495 WarningLevel="3"1496 />1497 </FileConfiguration>1498 </File>1499 <File1500 RelativePath="..\src\pjmedia-codec\speex\mdf.c"1501 >1502 <FileConfiguration1503 Name="Debug|Win32"1504 >1505 <Tool1506 Name="VCCLCompilerTool"1507 AdditionalIncludeDirectories=""1508 PreprocessorDefinitions=""1509 WarningLevel="3"1510 />1511 </FileConfiguration>1512 <FileConfiguration1513 Name="Release|Win32"1514 >1515 <Tool1516 Name="VCCLCompilerTool"1517 AdditionalIncludeDirectories=""1518 PreprocessorDefinitions=""1519 WarningLevel="3"1520 />1521 </FileConfiguration>1522 </File>1523 <File1524 RelativePath="..\src\pjmedia-codec\speex\misc.c"1525 >1526 <FileConfiguration1527 Name="Debug|Win32"1528 >1529 <Tool1530 Name="VCCLCompilerTool"1531 AdditionalIncludeDirectories=""1532 PreprocessorDefinitions=""1533 WarningLevel="3"1534 />1535 </FileConfiguration>1536 <FileConfiguration1537 Name="Release|Win32"1538 >1539 <Tool1540 Name="VCCLCompilerTool"1541 AdditionalIncludeDirectories=""1542 PreprocessorDefinitions=""1543 WarningLevel="3"1544 />1545 </FileConfiguration>1546 </File>1547 <File1548 RelativePath="..\src\pjmedia-codec\speex\modes.c"1549 >1550 <FileConfiguration1551 Name="Debug|Win32"1552 >1553 <Tool1554 Name="VCCLCompilerTool"1555 AdditionalIncludeDirectories=""1556 PreprocessorDefinitions=""1557 WarningLevel="3"1558 />1559 </FileConfiguration>1560 <FileConfiguration1561 Name="Release|Win32"1562 >1563 <Tool1564 Name="VCCLCompilerTool"1565 AdditionalIncludeDirectories=""1566 PreprocessorDefinitions=""1567 WarningLevel="3"1568 />1569 </FileConfiguration>1570 </File>1571 <File1572 RelativePath="..\src\pjmedia-codec\speex\nb_celp.c"1573 >1574 <FileConfiguration1575 Name="Debug|Win32"1576 >1577 <Tool1578 Name="VCCLCompilerTool"1579 AdditionalIncludeDirectories=""1580 PreprocessorDefinitions=""1581 WarningLevel="3"1582 />1583 </FileConfiguration>1584 <FileConfiguration1585 Name="Release|Win32"1586 >1587 <Tool1588 Name="VCCLCompilerTool"1589 AdditionalIncludeDirectories=""1590 PreprocessorDefinitions=""1591 WarningLevel="3"1592 />1593 </FileConfiguration>1594 </File>1595 <File1596 RelativePath="..\src\pjmedia-codec\speex\preprocess_spx.c"1597 >1598 <FileConfiguration1599 Name="Debug|Win32"1600 >1601 <Tool1602 Name="VCCLCompilerTool"1603 AdditionalIncludeDirectories=""1604 PreprocessorDefinitions=""1605 WarningLevel="3"1606 />1607 </FileConfiguration>1608 <FileConfiguration1609 Name="Release|Win32"1610 >1611 <Tool1612 Name="VCCLCompilerTool"1613 AdditionalIncludeDirectories=""1614 PreprocessorDefinitions=""1615 WarningLevel="3"1616 />1617 </FileConfiguration>1618 </File>1619 <File1620 RelativePath="..\src\pjmedia-codec\speex\quant_lsp.c"1621 >1622 <FileConfiguration1623 Name="Debug|Win32"1624 >1625 <Tool1626 Name="VCCLCompilerTool"1627 AdditionalIncludeDirectories=""1628 PreprocessorDefinitions=""1629 WarningLevel="3"1630 />1631 </FileConfiguration>1632 <FileConfiguration1633 Name="Release|Win32"1634 >1635 <Tool1636 Name="VCCLCompilerTool"1637 AdditionalIncludeDirectories=""1638 PreprocessorDefinitions=""1639 WarningLevel="3"1640 />1641 </FileConfiguration>1642 </File>1643 <File1644 RelativePath="..\src\pjmedia-codec\speex\sb_celp.c"1645 >1646 <FileConfiguration1647 Name="Debug|Win32"1648 >1649 <Tool1650 Name="VCCLCompilerTool"1651 AdditionalIncludeDirectories=""1652 PreprocessorDefinitions=""1653 WarningLevel="3"1654 />1655 </FileConfiguration>1656 <FileConfiguration1657 Name="Release|Win32"1658 >1659 <Tool1660 Name="VCCLCompilerTool"1661 AdditionalIncludeDirectories=""1662 PreprocessorDefinitions=""1663 WarningLevel="3"1664 />1665 </FileConfiguration>1666 </File>1667 <File1668 RelativePath="..\src\pjmedia-codec\speex\smallft.c"1669 >1670 <FileConfiguration1671 Name="Debug|Win32"1672 >1673 <Tool1674 Name="VCCLCompilerTool"1675 AdditionalIncludeDirectories=""1676 PreprocessorDefinitions=""1677 WarningLevel="3"1678 />1679 </FileConfiguration>1680 <FileConfiguration1681 Name="Release|Win32"1682 >1683 <Tool1684 Name="VCCLCompilerTool"1685 AdditionalIncludeDirectories=""1686 PreprocessorDefinitions=""1687 WarningLevel="3"1688 />1689 </FileConfiguration>1690 </File>1691 <File1692 RelativePath="..\src\pjmedia-codec\speex\speex.c"1693 >1694 <FileConfiguration1695 Name="Debug|Win32"1696 >1697 <Tool1698 Name="VCCLCompilerTool"1699 AdditionalIncludeDirectories=""1700 PreprocessorDefinitions=""1701 WarningLevel="3"1702 />1703 </FileConfiguration>1704 <FileConfiguration1705 Name="Release|Win32"1706 >1707 <Tool1708 Name="VCCLCompilerTool"1709 AdditionalIncludeDirectories=""1710 PreprocessorDefinitions=""1711 WarningLevel="3"1712 />1713 </FileConfiguration>1714 </File>1715 <File1716 RelativePath="..\src\pjmedia-codec\speex\speex_callbacks.c"1717 >1718 <FileConfiguration1719 Name="Debug|Win32"1720 >1721 <Tool1722 Name="VCCLCompilerTool"1723 AdditionalIncludeDirectories=""1724 PreprocessorDefinitions=""1725 WarningLevel="3"1726 />1727 </FileConfiguration>1728 <FileConfiguration1729 Name="Release|Win32"1730 >1731 <Tool1732 Name="VCCLCompilerTool"1733 AdditionalIncludeDirectories=""1734 PreprocessorDefinitions=""1735 WarningLevel="3"1736 />1737 </FileConfiguration>1738 </File>1739 <File1740 RelativePath="..\src\pjmedia-codec\speex\speex_header.c"1741 >1742 <FileConfiguration1743 Name="Debug|Win32"1744 >1745 <Tool1746 Name="VCCLCompilerTool"1747 AdditionalIncludeDirectories=""1748 PreprocessorDefinitions=""1749 WarningLevel="3"1750 />1751 </FileConfiguration>1752 <FileConfiguration1753 Name="Release|Win32"1754 >1755 <Tool1756 Name="VCCLCompilerTool"1757 AdditionalIncludeDirectories=""1758 PreprocessorDefinitions=""1759 WarningLevel="3"1760 />1761 </FileConfiguration>1762 </File>1763 <File1764 RelativePath="..\src\pjmedia-codec\speex\stereo.c"1765 >1766 <FileConfiguration1767 Name="Debug|Win32"1768 >1769 <Tool1770 Name="VCCLCompilerTool"1771 AdditionalIncludeDirectories=""1772 PreprocessorDefinitions=""1773 WarningLevel="3"1774 />1775 </FileConfiguration>1776 <FileConfiguration1777 Name="Release|Win32"1778 >1779 <Tool1780 Name="VCCLCompilerTool"1781 AdditionalIncludeDirectories=""1782 PreprocessorDefinitions=""1783 WarningLevel="3"1784 />1785 </FileConfiguration>1786 </File>1787 <File1788 RelativePath="..\src\pjmedia-codec\speex\vbr.c"1789 >1790 <FileConfiguration1791 Name="Debug|Win32"1792 >1793 <Tool1794 Name="VCCLCompilerTool"1795 AdditionalIncludeDirectories=""1796 PreprocessorDefinitions=""1797 WarningLevel="3"1798 />1799 </FileConfiguration>1800 <FileConfiguration1801 Name="Release|Win32"1802 >1803 <Tool1804 Name="VCCLCompilerTool"1805 AdditionalIncludeDirectories=""1806 PreprocessorDefinitions=""1807 WarningLevel="3"1808 />1809 </FileConfiguration>1810 </File>1811 <File1812 RelativePath="..\src\pjmedia-codec\speex\vq.c"1813 >1814 <FileConfiguration1815 Name="Debug|Win32"1816 >1817 <Tool1818 Name="VCCLCompilerTool"1819 AdditionalIncludeDirectories=""1820 PreprocessorDefinitions=""1821 WarningLevel="3"1822 />1823 </FileConfiguration>1824 <FileConfiguration1825 Name="Release|Win32"1826 >1827 <Tool1828 Name="VCCLCompilerTool"1829 AdditionalIncludeDirectories=""1830 PreprocessorDefinitions=""1831 WarningLevel="3"1832 />1833 </FileConfiguration>1834 </File>1835 <File1836 RelativePath="..\src\pjmedia-codec\speex\window.c"1837 >1838 <FileConfiguration1839 Name="Debug|Win32"1840 >1841 <Tool1842 Name="VCCLCompilerTool"1843 AdditionalIncludeDirectories=""1844 PreprocessorDefinitions=""1845 WarningLevel="3"1846 />1847 </FileConfiguration>1848 <FileConfiguration1849 Name="Release|Win32"1850 >1851 <Tool1852 Name="VCCLCompilerTool"1853 AdditionalIncludeDirectories=""1854 PreprocessorDefinitions=""1855 WarningLevel="3"1856 />1857 </FileConfiguration>1858 </File>1859 </Filter>1860 </Filter>1861 <Filter1862 Name="iLBC Codec"1863 >1864 <File1865 RelativePath="..\src\pjmedia-codec\ilbc\anaFilter.c"1866 >1867 <FileConfiguration1868 Name="Debug|Win32"1869 >1870 <Tool1871 Name="VCCLCompilerTool"1872 AdditionalIncludeDirectories=""1873 PreprocessorDefinitions=""1874 />1875 </FileConfiguration>1876 <FileConfiguration1877 Name="Release|Win32"1878 >1879 <Tool1880 Name="VCCLCompilerTool"1881 AdditionalIncludeDirectories=""1882 PreprocessorDefinitions=""1883 />1884 </FileConfiguration>1885 </File>1886 <File1887 RelativePath="..\src\pjmedia-codec\ilbc\anaFilter.h"1888 >1889 </File>1890 <File1891 RelativePath="..\src\pjmedia-codec\ilbc\constants.c"1892 >1893 <FileConfiguration1894 Name="Debug|Win32"1895 >1896 <Tool1897 Name="VCCLCompilerTool"1898 AdditionalIncludeDirectories=""1899 PreprocessorDefinitions=""1900 />1901 </FileConfiguration>1902 <FileConfiguration1903 Name="Release|Win32"1904 >1905 <Tool1906 Name="VCCLCompilerTool"1907 AdditionalIncludeDirectories=""1908 PreprocessorDefinitions=""1909 />1910 </FileConfiguration>1911 </File>1912 <File1913 RelativePath="..\src\pjmedia-codec\ilbc\constants.h"1914 >1915 </File>1916 <File1917 RelativePath="..\src\pjmedia-codec\ilbc\createCB.c"1918 >1919 <FileConfiguration1920 Name="Debug|Win32"1921 >1922 <Tool1923 Name="VCCLCompilerTool"1924 AdditionalIncludeDirectories=""1925 PreprocessorDefinitions=""1926 />1927 </FileConfiguration>1928 <FileConfiguration1929 Name="Release|Win32"1930 >1931 <Tool1932 Name="VCCLCompilerTool"1933 AdditionalIncludeDirectories=""1934 PreprocessorDefinitions=""1935 />1936 </FileConfiguration>1937 </File>1938 <File1939 RelativePath="..\src\pjmedia-codec\ilbc\createCB.h"1940 >1941 </File>1942 <File1943 RelativePath="..\src\pjmedia-codec\ilbc\doCPLC.c"1944 >1945 <FileConfiguration1946 Name="Debug|Win32"1947 >1948 <Tool1949 Name="VCCLCompilerTool"1950 AdditionalIncludeDirectories=""1951 PreprocessorDefinitions=""1952 />1953 </FileConfiguration>1954 <FileConfiguration1955 Name="Release|Win32"1956 >1957 <Tool1958 Name="VCCLCompilerTool"1959 AdditionalIncludeDirectories=""1960 PreprocessorDefinitions=""1961 />1962 </FileConfiguration>1963 </File>1964 <File1965 RelativePath="..\src\pjmedia-codec\ilbc\doCPLC.h"1966 >1967 </File>1968 <File1969 RelativePath="..\src\pjmedia-codec\ilbc\enhancer.c"1970 >1971 <FileConfiguration1972 Name="Debug|Win32"1973 >1974 <Tool1975 Name="VCCLCompilerTool"1976 AdditionalIncludeDirectories=""1977 PreprocessorDefinitions=""1978 />1979 </FileConfiguration>1980 <FileConfiguration1981 Name="Release|Win32"1982 >1983 <Tool1984 Name="VCCLCompilerTool"1985 AdditionalIncludeDirectories=""1986 PreprocessorDefinitions=""1987 />1988 </FileConfiguration>1989 </File>1990 <File1991 RelativePath="..\src\pjmedia-codec\ilbc\enhancer.h"1992 >1993 </File>1994 <File1995 RelativePath="..\src\pjmedia-codec\ilbc\filter.c"1996 >1997 <FileConfiguration1998 Name="Debug|Win32"1999 >2000 <Tool2001 Name="VCCLCompilerTool"2002 AdditionalIncludeDirectories=""2003 PreprocessorDefinitions=""2004 />2005 </FileConfiguration>2006 <FileConfiguration2007 Name="Release|Win32"2008 >2009 <Tool2010 Name="VCCLCompilerTool"2011 AdditionalIncludeDirectories=""2012 PreprocessorDefinitions=""2013 />2014 </FileConfiguration>2015 </File>2016 <File2017 RelativePath="..\src\pjmedia-codec\ilbc\filter.h"2018 >2019 </File>2020 <File2021 RelativePath="..\src\pjmedia-codec\ilbc\FrameClassify.c"2022 >2023 <FileConfiguration2024 Name="Debug|Win32"2025 >2026 <Tool2027 Name="VCCLCompilerTool"2028 AdditionalIncludeDirectories=""2029 PreprocessorDefinitions=""2030 />2031 </FileConfiguration>2032 <FileConfiguration2033 Name="Release|Win32"2034 >2035 <Tool2036 Name="VCCLCompilerTool"2037 AdditionalIncludeDirectories=""2038 PreprocessorDefinitions=""2039 />2040 </FileConfiguration>2041 </File>2042 <File2043 RelativePath="..\src\pjmedia-codec\ilbc\FrameClassify.h"2044 >2045 </File>2046 <File2047 RelativePath="..\src\pjmedia-codec\ilbc\gainquant.c"2048 >2049 <FileConfiguration2050 Name="Debug|Win32"2051 >2052 <Tool2053 Name="VCCLCompilerTool"2054 AdditionalIncludeDirectories=""2055 PreprocessorDefinitions=""2056 />2057 </FileConfiguration>2058 <FileConfiguration2059 Name="Release|Win32"2060 >2061 <Tool2062 Name="VCCLCompilerTool"2063 AdditionalIncludeDirectories=""2064 PreprocessorDefinitions=""2065 />2066 </FileConfiguration>2067 </File>2068 <File2069 RelativePath="..\src\pjmedia-codec\ilbc\gainquant.h"2070 >2071 </File>2072 <File2073 RelativePath="..\src\pjmedia-codec\ilbc\getCBvec.c"2074 >2075 <FileConfiguration2076 Name="Debug|Win32"2077 >2078 <Tool2079 Name="VCCLCompilerTool"2080 AdditionalIncludeDirectories=""2081 PreprocessorDefinitions=""2082 />2083 </FileConfiguration>2084 <FileConfiguration2085 Name="Release|Win32"2086 >2087 <Tool2088 Name="VCCLCompilerTool"2089 AdditionalIncludeDirectories=""2090 PreprocessorDefinitions=""2091 />2092 </FileConfiguration>2093 </File>2094 <File2095 RelativePath="..\src\pjmedia-codec\ilbc\getCBvec.h"2096 >2097 </File>2098 <File2099 RelativePath="..\src\pjmedia-codec\ilbc\helpfun.c"2100 >2101 <FileConfiguration2102 Name="Debug|Win32"2103 >2104 <Tool2105 Name="VCCLCompilerTool"2106 AdditionalIncludeDirectories=""2107 PreprocessorDefinitions=""2108 />2109 </FileConfiguration>2110 <FileConfiguration2111 Name="Release|Win32"2112 >2113 <Tool2114 Name="VCCLCompilerTool"2115 AdditionalIncludeDirectories=""2116 PreprocessorDefinitions=""2117 />2118 </FileConfiguration>2119 </File>2120 <File2121 RelativePath="..\src\pjmedia-codec\ilbc\helpfun.h"2122 >2123 </File>2124 <File2125 RelativePath="..\src\pjmedia-codec\ilbc\hpInput.c"2126 >2127 <FileConfiguration2128 Name="Debug|Win32"2129 >2130 <Tool2131 Name="VCCLCompilerTool"2132 AdditionalIncludeDirectories=""2133 PreprocessorDefinitions=""2134 />2135 </FileConfiguration>2136 <FileConfiguration2137 Name="Release|Win32"2138 >2139 <Tool2140 Name="VCCLCompilerTool"2141 AdditionalIncludeDirectories=""2142 PreprocessorDefinitions=""2143 />2144 </FileConfiguration>2145 </File>2146 <File2147 RelativePath="..\src\pjmedia-codec\ilbc\hpInput.h"2148 >2149 </File>2150 <File2151 RelativePath="..\src\pjmedia-codec\ilbc\hpOutput.c"2152 >2153 <FileConfiguration2154 Name="Debug|Win32"2155 >2156 <Tool2157 Name="VCCLCompilerTool"2158 AdditionalIncludeDirectories=""2159 PreprocessorDefinitions=""2160 />2161 </FileConfiguration>2162 <FileConfiguration2163 Name="Release|Win32"2164 >2165 <Tool2166 Name="VCCLCompilerTool"2167 AdditionalIncludeDirectories=""2168 PreprocessorDefinitions=""2169 />2170 </FileConfiguration>2171 </File>2172 <File2173 RelativePath="..\src\pjmedia-codec\ilbc\hpOutput.h"2174 >2175 </File>2176 <File2177 RelativePath="..\src\pjmedia-codec\ilbc\iCBConstruct.c"2178 >2179 <FileConfiguration2180 Name="Debug|Win32"2181 >2182 <Tool2183 Name="VCCLCompilerTool"2184 AdditionalIncludeDirectories=""2185 PreprocessorDefinitions=""2186 />2187 </FileConfiguration>2188 <FileConfiguration2189 Name="Release|Win32"2190 >2191 <Tool2192 Name="VCCLCompilerTool"2193 AdditionalIncludeDirectories=""2194 PreprocessorDefinitions=""2195 />2196 </FileConfiguration>2197 </File>2198 <File2199 RelativePath="..\src\pjmedia-codec\ilbc\iCBConstruct.h"2200 >2201 </File>2202 <File2203 RelativePath="..\src\pjmedia-codec\ilbc\iCBSearch.c"2204 >2205 <FileConfiguration2206 Name="Debug|Win32"2207 >2208 <Tool2209 Name="VCCLCompilerTool"2210 AdditionalIncludeDirectories=""2211 PreprocessorDefinitions=""2212 />2213 </FileConfiguration>2214 <FileConfiguration2215 Name="Release|Win32"2216 >2217 <Tool2218 Name="VCCLCompilerTool"2219 AdditionalIncludeDirectories=""2220 PreprocessorDefinitions=""2221 />2222 </FileConfiguration>2223 </File>2224 <File2225 RelativePath="..\src\pjmedia-codec\ilbc\iCBSearch.h"2226 >2227 </File>2228 <File2229 RelativePath="..\src\pjmedia-codec\ilbc\iLBC_decode.c"2230 >2231 <FileConfiguration2232 Name="Debug|Win32"2233 >2234 <Tool2235 Name="VCCLCompilerTool"2236 AdditionalIncludeDirectories=""2237 PreprocessorDefinitions=""2238 />2239 </FileConfiguration>2240 <FileConfiguration2241 Name="Release|Win32"2242 >2243 <Tool2244 Name="VCCLCompilerTool"2245 AdditionalIncludeDirectories=""2246 PreprocessorDefinitions=""2247 />2248 </FileConfiguration>2249 </File>2250 <File2251 RelativePath="..\src\pjmedia-codec\ilbc\iLBC_decode.h"2252 >2253 </File>2254 <File2255 RelativePath="..\src\pjmedia-codec\ilbc\iLBC_define.h"2256 >2257 </File>2258 <File2259 RelativePath="..\src\pjmedia-codec\ilbc\iLBC_encode.c"2260 >2261 <FileConfiguration2262 Name="Debug|Win32"2263 >2264 <Tool2265 Name="VCCLCompilerTool"2266 AdditionalIncludeDirectories=""2267 PreprocessorDefinitions=""2268 />2269 </FileConfiguration>2270 <FileConfiguration2271 Name="Release|Win32"2272 >2273 <Tool2274 Name="VCCLCompilerTool"2275 AdditionalIncludeDirectories=""2276 PreprocessorDefinitions=""2277 />2278 </FileConfiguration>2279 </File>2280 <File2281 RelativePath="..\src\pjmedia-codec\ilbc\iLBC_encode.h"2282 >2283 </File>2284 <File2285 RelativePath="..\src\pjmedia-codec\ilbc\iLBC_test.c"2286 >2287 <FileConfiguration2288 Name="Debug|Win32"2289 ExcludedFromBuild="true"2290 >2291 <Tool2292 Name="VCCLCompilerTool"2293 AdditionalIncludeDirectories=""2294 PreprocessorDefinitions=""2295 />2296 </FileConfiguration>2297 <FileConfiguration2298 Name="Release|Win32"2299 ExcludedFromBuild="true"2300 >2301 <Tool2302 Name="VCCLCompilerTool"2303 AdditionalIncludeDirectories=""2304 PreprocessorDefinitions=""2305 />2306 </FileConfiguration>2307 </File>2308 <File2309 RelativePath="..\src\pjmedia-codec\ilbc\LPCdecode.c"2310 >2311 <FileConfiguration2312 Name="Debug|Win32"2313 >2314 <Tool2315 Name="VCCLCompilerTool"2316 AdditionalIncludeDirectories=""2317 PreprocessorDefinitions=""2318 />2319 </FileConfiguration>2320 <FileConfiguration2321 Name="Release|Win32"2322 >2323 <Tool2324 Name="VCCLCompilerTool"2325 AdditionalIncludeDirectories=""2326 PreprocessorDefinitions=""2327 />2328 </FileConfiguration>2329 </File>2330 <File2331 RelativePath="..\src\pjmedia-codec\ilbc\LPCdecode.h"2332 >2333 </File>2334 <File2335 RelativePath="..\src\pjmedia-codec\ilbc\LPCencode.c"2336 >2337 <FileConfiguration2338 Name="Debug|Win32"2339 >2340 <Tool2341 Name="VCCLCompilerTool"2342 AdditionalIncludeDirectories=""2343 PreprocessorDefinitions=""2344 />2345 </FileConfiguration>2346 <FileConfiguration2347 Name="Release|Win32"2348 >2349 <Tool2350 Name="VCCLCompilerTool"2351 AdditionalIncludeDirectories=""2352 PreprocessorDefinitions=""2353 />2354 </FileConfiguration>2355 </File>2356 <File2357 RelativePath="..\src\pjmedia-codec\ilbc\LPCencode.h"2358 >2359 </File>2360 <File2361 RelativePath="..\src\pjmedia-codec\ilbc\lsf.c"2362 >2363 <FileConfiguration2364 Name="Debug|Win32"2365 >2366 <Tool2367 Name="VCCLCompilerTool"2368 AdditionalIncludeDirectories=""2369 PreprocessorDefinitions=""2370 />2371 </FileConfiguration>2372 <FileConfiguration2373 Name="Release|Win32"2374 >2375 <Tool2376 Name="VCCLCompilerTool"2377 AdditionalIncludeDirectories=""2378 PreprocessorDefinitions=""2379 />2380 </FileConfiguration>2381 </File>2382 <File2383 RelativePath="..\src\pjmedia-codec\ilbc\lsf.h"2384 >2385 </File>2386 <File2387 RelativePath="..\src\pjmedia-codec\ilbc\packing.c"2388 >2389 <FileConfiguration2390 Name="Debug|Win32"2391 >2392 <Tool2393 Name="VCCLCompilerTool"2394 AdditionalIncludeDirectories=""2395 PreprocessorDefinitions=""2396 />2397 </FileConfiguration>2398 <FileConfiguration2399 Name="Release|Win32"2400 >2401 <Tool2402 Name="VCCLCompilerTool"2403 AdditionalIncludeDirectories=""2404 PreprocessorDefinitions=""2405 />2406 </FileConfiguration>2407 </File>2408 <File2409 RelativePath="..\src\pjmedia-codec\ilbc\packing.h"2410 >2411 </File>2412 <File2413 RelativePath="..\src\pjmedia-codec\ilbc\StateConstructW.c"2414 >2415 <FileConfiguration2416 Name="Debug|Win32"2417 >2418 <Tool2419 Name="VCCLCompilerTool"2420 AdditionalIncludeDirectories=""2421 PreprocessorDefinitions=""2422 />2423 </FileConfiguration>2424 <FileConfiguration2425 Name="Release|Win32"2426 >2427 <Tool2428 Name="VCCLCompilerTool"2429 AdditionalIncludeDirectories=""2430 PreprocessorDefinitions=""2431 />2432 </FileConfiguration>2433 </File>2434 <File2435 RelativePath="..\src\pjmedia-codec\ilbc\StateConstructW.h"2436 >2437 </File>2438 <File2439 RelativePath="..\src\pjmedia-codec\ilbc\StateSearchW.c"2440 >2441 <FileConfiguration2442 Name="Debug|Win32"2443 >2444 <Tool2445 Name="VCCLCompilerTool"2446 AdditionalIncludeDirectories=""2447 PreprocessorDefinitions=""2448 />2449 </FileConfiguration>2450 <FileConfiguration2451 Name="Release|Win32"2452 >2453 <Tool2454 Name="VCCLCompilerTool"2455 AdditionalIncludeDirectories=""2456 PreprocessorDefinitions=""2457 />2458 </FileConfiguration>2459 </File>2460 <File2461 RelativePath="..\src\pjmedia-codec\ilbc\StateSearchW.h"2462 >2463 </File>2464 <File2465 RelativePath="..\src\pjmedia-codec\ilbc\syntFilter.c"2466 >2467 <FileConfiguration2468 Name="Debug|Win32"2469 >2470 <Tool2471 Name="VCCLCompilerTool"2472 AdditionalIncludeDirectories=""2473 PreprocessorDefinitions=""2474 />2475 </FileConfiguration>2476 <FileConfiguration2477 Name="Release|Win32"2478 >2479 <Tool2480 Name="VCCLCompilerTool"2481 AdditionalIncludeDirectories=""2482 PreprocessorDefinitions=""2483 />2484 </FileConfiguration>2485 </File>2486 <File2487 RelativePath="..\src\pjmedia-codec\ilbc\syntFilter.h"2488 >2489 </File>2490 </Filter>2491 299 </Files> 2492 300 <Globals> -
pjproject/branches/split-3rd-party/pjmedia/include/pjmedia.h
r1098 r1177 39 39 #include <pjmedia/master_port.h> 40 40 #include <pjmedia/mem_port.h> 41 #include <pjmedia/mp3_port.h>42 41 #include <pjmedia/null_port.h> 43 42 #include <pjmedia/plc.h> -
pjproject/branches/split-3rd-party/pjmedia/include/pjmedia/config.h
r1072 r1177 109 109 110 110 111 /** 111 /* 112 * ** THIS MACRO IS DEPRECATED in 0.6. ** 113 * ** See libresample for configuring this ** 114 * 112 115 * Include small filter table in resample. 113 116 * This adds about 9KB in rdata. 114 117 */ 118 /* 115 119 #ifndef PJMEDIA_HAS_SMALL_FILTER 116 120 # define PJMEDIA_HAS_SMALL_FILTER 1 117 121 #endif 118 119 120 /** 122 */ 123 124 /* 125 * ** THIS MACRO IS DEPRECATED in 0.6. ** 126 * ** See libresample for configuring this ** 127 * 121 128 * Include large filter table in resample. 122 129 * This adds about 32KB in rdata. 123 130 */ 131 /* 124 132 #ifndef PJMEDIA_HAS_LARGE_FILTER 125 133 # define PJMEDIA_HAS_LARGE_FILTER 1 126 134 #endif 135 */ 136 137 /** 138 * Specify whether libresample should be used for the sampling 139 * rate conversion. This macro and PJMEDIA_HAS_SPEEX_RESAMPLE 140 * are mutually exclusive. 141 * 142 * Default: 1 (Yes) 143 */ 144 #ifndef PJMEDIA_HAS_LIBRESAMPLE 145 # define PJMEDIA_HAS_LIBRESAMPLE 1 146 #endif 147 148 149 /** 150 * Specify whether Speex sample rate convertor should be used for the 151 * sampling rate conversion. This macro and PJMEDIA_HAS_LIBRESAMPLE 152 * are mutually exclusive. 153 * 154 * Default: 0 155 */ 156 #ifndef PJMEDIA_HAS_SPEEX_RESAMPLE 157 # define PJMEDIA_HAS_SPEEX_RESAMPLE 0 158 #endif 159 127 160 128 161 … … 244 277 /** 245 278 * Enable Steve Underwood's PLC. 279 * 280 * ** This has now been deprecated. If the codec does not have ** 281 * ** PLC, then no PLC will be used for that particular codec. ** 282 * 283 * Set this to zero, or other link error will occur. 246 284 */ 247 285 #ifndef PJMEDIA_HAS_STEVEU_PLC 248 # define PJMEDIA_HAS_STEVEU_PLC PJ_HAS_FLOATING_POINT286 # define PJMEDIA_HAS_STEVEU_PLC 0 249 287 #endif 250 288 … … 276 314 */ 277 315 #ifndef PJMEDIA_ECHO_SUPPRESS_FACTOR 278 # define PJMEDIA_ECHO_SUPPRESS_FACTOR 4316 # define PJMEDIA_ECHO_SUPPRESS_FACTOR 10 279 317 #endif 280 318 -
pjproject/branches/split-3rd-party/pjmedia/src/pjmedia-codec/gsm.c
r1168 r1177 34 34 */ 35 35 #if defined(PJMEDIA_HAS_GSM_CODEC) && PJMEDIA_HAS_GSM_CODEC != 0 36 37 /* We removed PLC in 0.6 */ 38 #define PLC_DISABLED 1 36 39 37 40 … … 73 76 unsigned output_buf_len, 74 77 struct pjmedia_frame *output); 78 #if !PLC_DISABLED 75 79 static pj_status_t gsm_codec_recover(pjmedia_codec *codec, 76 80 unsigned output_buf_len, 77 81 struct pjmedia_frame *output); 82 #endif 78 83 79 84 /* Definition for GSM codec operations. */ … … 87 92 &gsm_codec_encode, 88 93 &gsm_codec_decode, 94 #if !PLC_DISABLED 89 95 &gsm_codec_recover 96 #else 97 NULL 98 #endif 90 99 }; 91 100 … … 117 126 void *decoder; 118 127 pj_bool_t plc_enabled; 128 #if !PLC_DISABLED 119 129 pjmedia_plc *plc; 130 #endif 120 131 pj_bool_t vad_enabled; 121 132 pjmedia_silence_det *vad; … … 260 271 attr->setting.frm_per_pkt = 1; 261 272 attr->setting.vad = 1; 273 #if !PLC_DISABLED 262 274 attr->setting.plc = 1; 275 #endif 263 276 264 277 /* Default all other flag bits disabled. */ … … 321 334 codec->codec_data = gsm_data; 322 335 336 #if !PLC_DISABLED 323 337 /* Create PLC */ 324 338 status = pjmedia_plc_create(gsm_codec_factory.pool, 8000, … … 328 342 return status; 329 343 } 344 #endif 330 345 331 346 /* Create silence detector */ … … 352 367 { 353 368 struct gsm_data *gsm_data; 354 pj_int16_t frame[160];355 369 int i; 356 370 … … 363 377 gsm_codec_close(codec); 364 378 379 #if !PLC_DISABLED 365 380 /* Clear left samples in the PLC, since codec+plc will be reused 366 381 * next time. 367 382 */ 368 383 for (i=0; i<2; ++i) { 384 pj_int16_t frame[160]; 369 385 pjmedia_zero_samples(frame, PJ_ARRAY_SIZE(frame)); 370 386 pjmedia_plc_save(gsm_data->plc, frame); 371 387 } 388 #else 389 PJ_UNUSED_ARG(i); 390 #endif 372 391 373 392 /* Re-init silence_period */ … … 570 589 output->type = PJMEDIA_FRAME_TYPE_AUDIO; 571 590 591 #if !PLC_DISABLED 572 592 if (gsm_data->plc_enabled) 573 593 pjmedia_plc_save( gsm_data->plc, output->buf); 574 575 return PJ_SUCCESS; 576 } 577 578 594 #endif 595 596 return PJ_SUCCESS; 597 } 598 599 600 #if !PLC_DISABLED 579 601 /* 580 602 * Recover lost frame. … … 595 617 return PJ_SUCCESS; 596 618 } 619 #endif 597 620 598 621 -
pjproject/branches/split-3rd-party/pjmedia/src/pjmedia/g711.c
r974 r1177 33 33 #if defined(PJMEDIA_HAS_G711_CODEC) && PJMEDIA_HAS_G711_CODEC!=0 34 34 35 /* We removed PLC in 0.6 */ 36 #define PLC_DISABLED 1 37 35 38 36 39 #define G711_BPS 64000 … … 81 84 unsigned output_buf_len, 82 85 struct pjmedia_frame *output); 86 #if !PLC_DISABLED 83 87 static pj_status_t g711_recover( pjmedia_codec *codec, 84 88 unsigned output_buf_len, 85 89 struct pjmedia_frame *output); 90 #endif 86 91 87 92 /* Definition for G711 codec operations. */ … … 95 100 &g711_encode, 96 101 &g711_decode, 102 #if !PLC_DISABLED 97 103 &g711_recover 104 #else 105 NULL 106 #endif 98 107 }; 99 108 … … 122 131 { 123 132 unsigned pt; 133 #if !PLC_DISABLED 124 134 pj_bool_t plc_enabled; 125 135 pjmedia_plc *plc; 136 #endif 126 137 pj_bool_t vad_enabled; 127 138 pjmedia_silence_det *vad; … … 250 261 attr->setting.frm_per_pkt = 2; 251 262 263 #if !PLC_DISABLED 252 264 /* Enable plc by default. */ 253 265 attr->setting.plc = 1; 266 #endif 254 267 255 268 /* Enable VAD by default. */ … … 318 331 codec_priv->pt = id->pt; 319 332 333 #if !PLC_DISABLED 320 334 /* Create PLC, always with 10ms ptime */ 321 335 status = pjmedia_plc_create(g711_factory.pool, 8000, 80, … … 325 339 return status; 326 340 } 341 #endif 327 342 328 343 /* Create VAD */ … … 358 373 { 359 374 struct g711_private *priv = codec->codec_data; 360 pj_int16_t frame[SAMPLES_PER_FRAME];361 375 int i; 362 376 … … 369 383 } 370 384 385 #if !PLC_DISABLED 371 386 /* Clear left samples in the PLC, since codec+plc will be reused 372 387 * next time. 373 388 */ 374 389 for (i=0; i<2; ++i) { 390 pj_int16_t frame[SAMPLES_PER_FRAME]; 375 391 pjmedia_zero_samples(frame, PJ_ARRAY_SIZE(frame)); 376 392 pjmedia_plc_save(priv->plc, frame); 377 393 } 394 #else 395 PJ_UNUSED_ARG(i); 396 PJ_UNUSED_ARG(priv); 397 #endif 378 398 379 399 /* Lock mutex. */ … … 403 423 struct g711_private *priv = codec->codec_data; 404 424 priv->pt = attr->info.pt; 425 #if !PLC_DISABLED 405 426 priv->plc_enabled = (attr->setting.plc != 0); 427 #endif 406 428 priv->vad_enabled = (attr->setting.vad != 0); 407 429 return PJ_SUCCESS; … … 423 445 return PJMEDIA_EINVALIDPT; 424 446 447 #if !PLC_DISABLED 425 448 priv->plc_enabled = (attr->setting.plc != 0); 449 #endif 426 450 priv->vad_enabled = (attr->setting.vad != 0); 427 451 … … 562 586 output->size = (input->size << 1); 563 587 588 #if !PLC_DISABLED 564 589 if (priv->plc_enabled) 565 590 pjmedia_plc_save( priv->plc, output->buf); 566 567 return PJ_SUCCESS; 568 } 569 591 #endif 592 593 return PJ_SUCCESS; 594 } 595 596 #if !PLC_DISABLED 570 597 static pj_status_t g711_recover( pjmedia_codec *codec, 571 598 unsigned output_buf_len, … … 585 612 return PJ_SUCCESS; 586 613 } 614 #endif 587 615 588 616 #endif /* PJMEDIA_HAS_G711_CODEC */ -
pjproject/branches/split-3rd-party/pjmedia/src/pjmedia/resample_resample.c
r1174 r1177 18 18 */ 19 19 20 /*21 * Based on:22 * resample-1.8.tar.gz from the23 * Digital Audio Resampling Home Page located at24 * http://www-ccrma.stanford.edu/~jos/resample/.25 *26 * SOFTWARE FOR SAMPLING-RATE CONVERSION AND FIR DIGITAL FILTER DESIGN27 *28 * Snippet from the resample.1 man page:29 *30 * HISTORY31 *32 * The first version of this software was written by Julius O. Smith III33 * <jos@ccrma.stanford.edu> at CCRMA <http://www-ccrma.stanford.edu> in34 * 1981. It was called SRCONV and was written in SAIL for PDP-1035 * compatible machines. The algorithm was first published in36 *37 * Smith, Julius O. and Phil Gossett. ``A Flexible Sampling-Rate38 * Conversion Method,'' Proceedings (2): 19.4.1-19.4.4, IEEE Conference39 * on Acoustics, Speech, and Signal Processing, San Diego, March 1984.40 *41 * An expanded tutorial based on this paper is available at the Digital42 * Audio Resampling Home Page given above.43 *44 * Circa 1988, the SRCONV program was translated from SAIL to C by45 * Christopher Lee Fraley working with Roger Dannenberg at CMU.46 *47 * Since then, the C version has been maintained by jos.48 *49 * Sndlib support was added 6/99 by John Gibson <jgg9c@virginia.edu>.50 *51 * The resample program is free software distributed in accordance52 * with the Lesser GNU Public License (LGPL). There is NO warranty; not53 * even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.54 */55 56 /* PJMEDIA modification:57 * - remove resample(), just use SrcUp, SrcUD, and SrcLinear directly.58 * - move FilterUp() and FilterUD() from filterkit.c59 * - move stddefs.h and resample.h to this file.60 * - const correctness.61 */62 20 #include <pjmedia/resample.h> 21 63 22 #include <pjmedia/errno.h> 64 23 #include <pj/assert.h> … … 67 26 68 27 28 #if defined(PJMEDIA_HAS_LIBRESAMPLE) && PJMEDIA_HAS_LIBRESAMPLE != 0 29 30 #include <third_party/resample/include/resamplesubs.h> 31 69 32 #define THIS_FILE "resample.c" 70 33 71 34 72 /*73 * Taken from stddefs.h74 */75 #ifndef PI76 #define PI (3.14159265358979232846)77 #endif78 79 #ifndef PI280 #define PI2 (6.28318530717958465692)81 #endif82 83 #define D2R (0.01745329348) /* (2*pi)/360 */84 #define R2D (57.29577951) /* 360/(2*pi) */85 86 #ifndef MAX87 #define MAX(x,y) ((x)>(y) ?(x):(y))88 #endif89 #ifndef MIN90 #define MIN(x,y) ((x)<(y) ?(x):(y))91 #endif92 93 #ifndef ABS94 #define ABS(x) ((x)<0 ?(-(x)):(x))95 #endif96 97 #ifndef SGN98 #define SGN(x) ((x)<0 ?(-1):((x)==0?(0):(1)))99 #endif100 101 typedef char RES_BOOL;102 typedef short RES_HWORD;103 typedef int RES_WORD;104 typedef unsigned short RES_UHWORD;105 typedef unsigned int RES_UWORD;106 107 #define MAX_HWORD (32767)108 #define MIN_HWORD (-32768)109 110 #ifdef DEBUG111 #define INLINE112 #else113 #define INLINE inline114 #endif115 116 /*117 * Taken from resample.h118 *119 * The configuration constants below govern120 * the number of bits in the input sample and filter coefficients, the121 * number of bits to the right of the binary-point for fixed-point math, etc.122 *123 */124 125 /* Conversion constants */126 #define Nhc 8127 #define Na 7128 #define Np (Nhc+Na)129 #define Npc (1<<Nhc)130 #define Amask ((1<<Na)-1)131 #define Pmask ((1<<Np)-1)132 #define Nh 16133 #define Nb 16134 #define Nhxn 14135 #define Nhg (Nh-Nhxn)136 #define NLpScl 13137 138 /* Description of constants:139 *140 * Npc - is the number of look-up values available for the lowpass filter141 * between the beginning of its impulse response and the "cutoff time"142 * of the filter. The cutoff time is defined as the reciprocal of the143 * lowpass-filter cut off frequence in Hz. For example, if the144 * lowpass filter were a sinc function, Npc would be the index of the145 * impulse-response lookup-table corresponding to the first zero-146 * crossing of the sinc function. (The inverse first zero-crossing147 * time of a sinc function equals its nominal cutoff frequency in Hz.)148 * Npc must be a power of 2 due to the details of the current149 * implementation. The default value of 512 is sufficiently high that150 * using linear interpolation to fill in between the table entries151 * gives approximately 16-bit accuracy in filter coefficients.152 *153 * Nhc - is log base 2 of Npc.154 *155 * Na - is the number of bits devoted to linear interpolation of the156 * filter coefficients.157 *158 * Np - is Na + Nhc, the number of bits to the right of the binary point159 * in the integer "time" variable. To the left of the point, it indexes160 * the input array (X), and to the right, it is interpreted as a number161 * between 0 and 1 sample of the input X. Np must be less than 16 in162 * this implementation.163 *164 * Nh - is the number of bits in the filter coefficients. The sum of Nh and165 * the number of bits in the input data (typically 16) cannot exceed 32.166 * Thus Nh should be 16. The largest filter coefficient should nearly167 * fill 16 bits (32767).168 *169 * Nb - is the number of bits in the input data. The sum of Nb and Nh cannot170 * exceed 32.171 *172 * Nhxn - is the number of bits to right shift after multiplying each input173 * sample times a filter coefficient. It can be as great as Nh and as174 * small as 0. Nhxn = Nh-2 gives 2 guard bits in the multiply-add175 * accumulation. If Nhxn=0, the accumulation will soon overflow 32 bits.176 *177 * Nhg - is the number of guard bits in mpy-add accumulation (equal to Nh-Nhxn)178 *179 * NLpScl - is the number of bits allocated to the unity-gain normalization180 * factor. The output of the lowpass filter is multiplied by LpScl and181 * then right-shifted NLpScl bits. To avoid overflow, we must have182 * Nb+Nhg+NLpScl < 32.183 */184 185 186 #ifdef _MSC_VER187 # pragma warning(push, 3)188 //# pragma warning(disable: 4245) // Conversion from uint to ushort189 # pragma warning(disable: 4244) // Conversion from double to uint190 # pragma warning(disable: 4146) // unary minus operator applied to unsigned type, result still unsigned191 # pragma warning(disable: 4761) // integral size mismatch in argument; conversion supplied192 #endif193 194 #if defined(PJMEDIA_HAS_SMALL_FILTER) && PJMEDIA_HAS_SMALL_FILTER!=0195 # include "smallfilter.h"196 #else197 # define SMALL_FILTER_NMULT 0198 # define SMALL_FILTER_SCALE 0199 # define SMALL_FILTER_NWING 0200 # define SMALL_FILTER_IMP NULL201 # define SMALL_FILTER_IMPD NULL202 #endif203 204 #if defined(PJMEDIA_HAS_LARGE_FILTER) && PJMEDIA_HAS_LARGE_FILTER!=0205 # include "largefilter.h"206 #else207 # define LARGE_FILTER_NMULT 0208 # define LARGE_FILTER_SCALE 0209 # define LARGE_FILTER_NWING 0210 # define LARGE_FILTER_IMP NULL211 # define LARGE_FILTER_IMPD NULL212 #endif213 214 215 #undef INLINE216 #define INLINE217 #define HAVE_FILTER 0218 219 #ifndef NULL220 # define NULL 0221 #endif222 223 224 static INLINE RES_HWORD WordToHword(RES_WORD v, int scl)225 {226 RES_HWORD out;227 RES_WORD llsb = (1<<(scl-1));228 v += llsb; /* round */229 v >>= scl;230 if (v>MAX_HWORD) {231 v = MAX_HWORD;232 } else if (v < MIN_HWORD) {233 v = MIN_HWORD;234 }235 out = (RES_HWORD) v;236 return out;237 }238 239 /* Sampling rate conversion using linear interpolation for maximum speed.240 */241 static int242 SrcLinear(const RES_HWORD X[], RES_HWORD Y[], double pFactor, RES_UHWORD nx)243 {244 RES_HWORD iconst;245 RES_UWORD time = 0;246 const RES_HWORD *xp;247 RES_HWORD *Ystart, *Yend;248 RES_WORD v,x1,x2;249 250 double dt; /* Step through input signal */251 RES_UWORD dtb; /* Fixed-point version of Dt */252 RES_UWORD endTime; /* When time reaches EndTime, return to user */253 254 dt = 1.0/pFactor; /* Output sampling period */255 dtb = dt*(1<<Np) + 0.5; /* Fixed-point representation */256 257 Ystart = Y;258 Yend = Ystart + (unsigned)(nx * pFactor);259 endTime = time + (1<<Np)*(RES_WORD)nx;260 while (time < endTime)261 {262 iconst = (time) & Pmask;263 xp = &X[(time)>>Np]; /* Ptr to current input sample */264 x1 = *xp++;265 x2 = *xp;266 x1 *= ((1<<Np)-iconst);267 x2 *= iconst;268 v = x1 + x2;269 *Y++ = WordToHword(v,Np); /* Deposit output */270 time += dtb; /* Move to next sample by time increment */271 }272 return (Y - Ystart); /* Return number of output samples */273 }274 275 static RES_WORD FilterUp(const RES_HWORD Imp[], const RES_HWORD ImpD[],276 RES_UHWORD Nwing, RES_BOOL Interp,277 const RES_HWORD *Xp, RES_HWORD Ph, RES_HWORD Inc)278 {279 const RES_HWORD *Hp;280 const RES_HWORD *Hdp = NULL;281 const RES_HWORD *End;282 RES_HWORD a = 0;283 RES_WORD v, t;284 285 v=0;286 Hp = &Imp[Ph>>Na];287 End = &Imp[Nwing];288 if (Interp) {289 Hdp = &ImpD[Ph>>Na];290 a = Ph & Amask;291 }292 if (Inc == 1) /* If doing right wing... */293 { /* ...drop extra coeff, so when Ph is */294 End--; /* 0.5, we don't do too many mult's */295 if (Ph == 0) /* If the phase is zero... */296 { /* ...then we've already skipped the */297 Hp += Npc; /* first sample, so we must also */298 Hdp += Npc; /* skip ahead in Imp[] and ImpD[] */299 }300 }301 if (Interp)302 while (Hp < End) {303 t = *Hp; /* Get filter coeff */304 t += (((RES_WORD)*Hdp)*a)>>Na; /* t is now interp'd filter coeff */305 Hdp += Npc; /* Filter coeff differences step */306 t *= *Xp; /* Mult coeff by input sample */307 if (t & (1<<(Nhxn-1))) /* Round, if needed */308 t += (1<<(Nhxn-1));309 t >>= Nhxn; /* Leave some guard bits, but come back some */310 v += t; /* The filter output */311 Hp += Npc; /* Filter coeff step */312 313 Xp += Inc; /* Input signal step. NO CHECK ON BOUNDS */314 }315 else316 while (Hp < End) {317 t = *Hp; /* Get filter coeff */318 t *= *Xp; /* Mult coeff by input sample */319 if (t & (1<<(Nhxn-1))) /* Round, if needed */320 t += (1<<(Nhxn-1));321 t >>= Nhxn; /* Leave some guard bits, but come back some */322 v += t; /* The filter output */323 Hp += Npc; /* Filter coeff step */324 Xp += Inc; /* Input signal step. NO CHECK ON BOUNDS */325 }326 return(v);327 }328 329 330 static RES_WORD FilterUD(const RES_HWORD Imp[], const RES_HWORD ImpD[],331 RES_UHWORD Nwing, RES_BOOL Interp,332 const RES_HWORD *Xp, RES_HWORD Ph, RES_HWORD Inc, RES_UHWORD dhb)333 {334 RES_HWORD a;335 const RES_HWORD *Hp, *Hdp, *End;336 RES_WORD v, t;337 RES_UWORD Ho;338 339 v=0;340 Ho = (Ph*(RES_UWORD)dhb)>>Np;341 End = &Imp[Nwing];342 if (Inc == 1) /* If doing right wing... */343 { /* ...drop extra coeff, so when Ph is */344 End--; /* 0.5, we don't do too many mult's */345 if (Ph == 0) /* If the phase is zero... */346 Ho += dhb; /* ...then we've already skipped the */347 } /* first sample, so we must also */348 /* skip ahead in Imp[] and ImpD[] */349 if (Interp)350 while ((Hp = &Imp[Ho>>Na]) < End) {351 t = *Hp; /* Get IR sample */352 Hdp = &ImpD[Ho>>Na]; /* get interp (lower Na) bits from diff table*/353 a = Ho & Amask; /* a is logically between 0 and 1 */354 t += (((RES_WORD)*Hdp)*a)>>Na; /* t is now interp'd filter coeff */355 t *= *Xp; /* Mult coeff by input sample */356 if (t & 1<<(Nhxn-1)) /* Round, if needed */357 t += 1<<(Nhxn-1);358 t >>= Nhxn; /* Leave some guard bits, but come back some */359 v += t; /* The filter output */360 Ho += dhb; /* IR step */361 Xp += Inc; /* Input signal step. NO CHECK ON BOUNDS */362 }363 else364 while ((Hp = &Imp[Ho>>Na]) < End) {365 t = *Hp; /* Get IR sample */366 t *= *Xp; /* Mult coeff by input sample */367 if (t & 1<<(Nhxn-1)) /* Round, if needed */368 t += 1<<(Nhxn-1);369 t >>= Nhxn; /* Leave some guard bits, but come back some */370 v += t; /* The filter output */371 Ho += dhb; /* IR step */372 Xp += Inc; /* Input signal step. NO CHECK ON BOUNDS */373 }374 return(v);375 }376 377 /* Sampling rate up-conversion only subroutine;378 * Slightly faster than down-conversion;379 */380 static int SrcUp(const RES_HWORD X[], RES_HWORD Y[], double pFactor,381 RES_UHWORD nx, RES_UHWORD pNwing, RES_UHWORD pLpScl,382 const RES_HWORD pImp[], const RES_HWORD pImpD[], RES_BOOL Interp)383 {384 const RES_HWORD *xp;385 RES_HWORD *Ystart, *Yend;386 RES_WORD v;387 388 double dt; /* Step through input signal */389 RES_UWORD dtb; /* Fixed-point version of Dt */390 RES_UWORD time = 0;391 RES_UWORD endTime; /* When time reaches EndTime, return to user */392 393 dt = 1.0/pFactor; /* Output sampling period */394 dtb = dt*(1<<Np) + 0.5; /* Fixed-point representation */395 396 Ystart = Y;397 Yend = Ystart + (unsigned)(nx * pFactor);398 endTime = time + (1<<Np)*(RES_WORD)nx;399 while (time < endTime)400 {401 xp = &X[time>>Np]; /* Ptr to current input sample */402 /* Perform left-wing inner product */403 v = 0;404 v = FilterUp(pImp, pImpD, pNwing, Interp, xp, (RES_HWORD)(time&Pmask),-1);405 406 /* Perform right-wing inner product */407 v += FilterUp(pImp, pImpD, pNwing, Interp, xp+1, (RES_HWORD)((-time)&Pmask),1);408 409 v >>= Nhg; /* Make guard bits */410 v *= pLpScl; /* Normalize for unity filter gain */411 *Y++ = WordToHword(v,NLpScl); /* strip guard bits, deposit output */412 time += dtb; /* Move to next sample by time increment */413 }414 return (Y - Ystart); /* Return the number of output samples */415 }416 417 418 /* Sampling rate conversion subroutine */419 420 static int SrcUD(const RES_HWORD X[], RES_HWORD Y[], double pFactor,421 RES_UHWORD nx, RES_UHWORD pNwing, RES_UHWORD pLpScl,422 const RES_HWORD pImp[], const RES_HWORD pImpD[], RES_BOOL Interp)423 {424 const RES_HWORD *xp;425 RES_HWORD *Ystart, *Yend;426 RES_WORD v;427 428 double dh; /* Step through filter impulse response */429 double dt; /* Step through input signal */430 RES_UWORD time = 0;431 RES_UWORD endTime; /* When time reaches EndTime, return to user */432 RES_UWORD dhb, dtb; /* Fixed-point versions of Dh,Dt */433 434 dt = 1.0/pFactor; /* Output sampling period */435 dtb = dt*(1<<Np) + 0.5; /* Fixed-point representation */436 437 dh = MIN(Npc, pFactor*Npc); /* Filter sampling period */438 dhb = dh*(1<<Na) + 0.5; /* Fixed-point representation */439 440 Ystart = Y;441 Yend = Ystart + (unsigned)(nx * pFactor);442 endTime = time + (1<<Np)*(RES_WORD)nx;443 while (time < endTime)444 {445 xp = &X[time>>Np]; /* Ptr to current input sample */446 v = FilterUD(pImp, pImpD, pNwing, Interp, xp, (RES_HWORD)(time&Pmask),447 -1, dhb); /* Perform left-wing inner product */448 v += FilterUD(pImp, pImpD, pNwing, Interp, xp+1, (RES_HWORD)((-time)&Pmask),449 1, dhb); /* Perform right-wing inner product */450 v >>= Nhg; /* Make guard bits */451 v *= pLpScl; /* Normalize for unity filter gain */452 *Y++ = WordToHword(v,NLpScl); /* strip guard bits, deposit output */453 time += dtb; /* Move to next sample by time increment */454 }455 return (Y - Ystart); /* Return the number of output samples */456 }457 458 459 /* ***************************************************************************460 *461 * PJMEDIA RESAMPLE462 *463 * ***************************************************************************464 */465 35 466 36 struct pjmedia_resample … … 504 74 } 505 75 506 #if !defined(PJMEDIA_HAS_LARGE_FILTER) || PJMEDIA_HAS_LARGE_FILTER==0507 /*508 * If large filter is excluded in the build, then prevent application509 * from using it.510 */511 if (high_quality && large_filter) {512 large_filter = PJ_FALSE;513 PJ_LOG(5,(THIS_FILE,514 "Resample uses small filter because large filter is "515 "disabled"));516 }517 #endif518 519 #if !defined(PJMEDIA_HAS_SMALL_FILTER) || PJMEDIA_HAS_SMALL_FILTER==0520 /*521 * If small filter is excluded in the build and application wants to522 * use it, then drop to linear conversion.523 */524 if (high_quality && large_filter == 0) {525 high_quality = PJ_FALSE;526 PJ_LOG(4,(THIS_FILE,527 "Resample uses linear because small filter is disabled"));528 }529 #endif530 531 76 resample->factor = rate_out * 1.0 / rate_in; 532 77 resample->large_filter = large_filter; … … 541 86 * resample->xoff = large_filter ? 32 : 6; 542 87 */ 543 if (large_filter) 544 resample->xoff = (LARGE_FILTER_NMULT + 1) / 2.0 * 545 MAX(1.0, 1.0/resample->factor); 546 else 547 resample->xoff = (SMALL_FILTER_NMULT + 1) / 2.0 * 548 MAX(1.0, 1.0/resample->factor); 549 88 resample->xoff = res_GetXOFF(resample->factor, (char)large_filter); 550 89 551 90 size = (samples_per_frame + 2*resample->xoff) * sizeof(pj_int16_t); … … 650 189 dst_buf = resample->buffer + resample->xoff*2; 651 190 pjmedia_copy_samples(dst_buf, input, resample->frame_size); 652 653 if (resample->factor >= 1) { 654 655 if (resample->large_filter) { 656 SrcUp(resample->buffer + resample->xoff, output, 657 resample->factor, resample->frame_size, 658 LARGE_FILTER_NWING, LARGE_FILTER_SCALE, 659 LARGE_FILTER_IMP, LARGE_FILTER_IMPD, 660 PJ_TRUE); 661 } else { 662 SrcUp(resample->buffer + resample->xoff, output, 663 resample->factor, resample->frame_size, 664 SMALL_FILTER_NWING, SMALL_FILTER_SCALE, 665 SMALL_FILTER_IMP, SMALL_FILTER_IMPD, 666 PJ_TRUE); 667 } 668 669 } else { 670 671 if (resample->large_filter) { 672 673 SrcUD( resample->buffer + resample->xoff, output, 674 resample->factor, resample->frame_size, 675 LARGE_FILTER_NWING, 676 LARGE_FILTER_SCALE * resample->factor + 0.5, 677 LARGE_FILTER_IMP, LARGE_FILTER_IMPD, 678 PJ_TRUE); 679 680 } else { 681 682 SrcUD( resample->buffer + resample->xoff, output, 683 resample->factor, resample->frame_size, 684 SMALL_FILTER_NWING, 685 SMALL_FILTER_SCALE * resample->factor + 0.5, 686 SMALL_FILTER_IMP, SMALL_FILTER_IMPD, 687 PJ_TRUE); 688 689 } 690 691 } 191 192 res_Resample(resample->buffer + resample->xoff, output, 193 resample->factor, (pj_uint16_t)resample->frame_size, 194 (char)resample->large_filter, (char)PJ_TRUE); 692 195 693 196 dst_buf = resample->buffer; … … 696 199 697 200 } else { 698 SrcLinear( input, output, resample->factor, resample->frame_size); 201 res_SrcLinear( input, output, resample->factor, 202 (pj_uint16_t)resample->frame_size); 699 203 } 700 204 } … … 710 214 PJ_UNUSED_ARG(resample); 711 215 } 216 217 218 #else /* PJMEDIA_HAS_LIBRESAMPLE */ 219 220 int pjmedia_resample_resample_excluded; 221 222 #endif /* PJMEDIA_HAS_LIBRESAMPLE */ 223 -
pjproject/branches/split-3rd-party/pjmedia/src/pjmedia/resample_speex.c
r1174 r1177 17 17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 18 */ 19 20 19 #include <pjmedia/resample.h> 21 20 #include <pjmedia/errno.h> … … 24 23 #include <pj/pool.h> 25 24 25 #if defined(PJMEDIA_HAS_SPEEX_RESAMPLE) && PJMEDIA_HAS_SPEEX_RESAMPLE != 0 26 26 27 #include <speex/speex_resampler.h> 27 28 28 #define THIS_FILE "resample .c"29 #define THIS_FILE "resample_speex.c" 29 30 30 31 … … 118 119 } 119 120 121 #else /* PJMEDIA_HAS_SPEEX_RESAMPLE */ 122 123 int pjmedia_resample_speex_excluded; 124 125 #endif /* PJMEDIA_HAS_SPEEX_RESAMPLE */ 126 -
pjproject/branches/split-3rd-party/pjproject-vs8.sln
r1100 r1177 29 29 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjsua", "pjsip-apps\build\pjsua.vcproj", "{8310649E-A25E-4AF0-91E8-9E3CC659BB89}" 30 30 ProjectSection(ProjectDependencies) = postProject 31 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031} 32 {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} 31 {E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D} 33 32 {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} 33 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} 34 34 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8} 35 35 {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21} 36 36 {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} 37 37 {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} 38 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} 39 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} 38 40 {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} 41 {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E} 39 42 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} 43 {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} 44 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031} 40 45 EndProjectSection 41 46 EndProject … … 44 49 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_debug", "pjsip-apps\build\sample_debug.vcproj", "{A0F1AA62-0F6F-420D-B09A-AC04B6862821}" 45 50 ProjectSection(ProjectDependencies) = postProject 51 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031} 52 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} 53 {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} 54 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} 55 {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E} 56 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} 57 {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} 58 {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} 59 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} 60 {E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D} 46 61 {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} 47 62 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8} 48 63 {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21} 49 {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}50 {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}51 {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}52 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}53 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}54 64 EndProjectSection 55 65 EndProject … … 79 89 EndProject 80 90 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjnath", "pjnath\build\pjnath.vcproj", "{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}" 91 EndProject 92 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgsmcodec", "third_party\build\gsm\libgsmcodec.vcproj", "{E53AA5FF-B737-40AA-BD13-387EFA99023D}" 93 EndProject 94 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbccodec", "third_party\build\ilbc\libilbccodec.vcproj", "{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}" 95 EndProject 96 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libportaudio", "third_party\build\portaudio\libportaudio.vcproj", "{3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}" 97 EndProject 98 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresample", "third_party\build\resample\libresample.vcproj", "{6794B975-4E84-4F49-B2DC-C31F2224E03E}" 99 EndProject 100 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "third_party\build\speex\libspeex.vcproj", "{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}" 81 101 EndProject 82 102 Global … … 146 166 {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release|Win32.ActiveCfg = Release|Win32 147 167 {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release|Win32.Build.0 = Release|Win32 168 {E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug|Win32.ActiveCfg = Debug|Win32 169 {E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug|Win32.Build.0 = Debug|Win32 170 {E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release|Win32.ActiveCfg = Release|Win32 171 {E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release|Win32.Build.0 = Release|Win32 172 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug|Win32.ActiveCfg = Debug|Win32 173 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug|Win32.Build.0 = Debug|Win32 174 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release|Win32.ActiveCfg = Release|Win32 175 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release|Win32.Build.0 = Release|Win32 176 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Win32.ActiveCfg = Debug|Win32 177 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Win32.Build.0 = Debug|Win32 178 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Win32.ActiveCfg = Release|Win32 179 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Win32.Build.0 = Release|Win32 180 {6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|Win32.ActiveCfg = Debug|Win32 181 {6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|Win32.Build.0 = Debug|Win32 182 {6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release|Win32.ActiveCfg = Release|Win32 183 {6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release|Win32.Build.0 = Release|Win32 184 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug|Win32.ActiveCfg = Debug|Win32 185 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug|Win32.Build.0 = Debug|Win32 186 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release|Win32.ActiveCfg = Release|Win32 187 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release|Win32.Build.0 = Release|Win32 148 188 EndGlobalSection 149 189 GlobalSection(SolutionProperties) = preSolution -
pjproject/branches/split-3rd-party/pjproject.dsw
r1171 r1177 40 40 ############################################################################### 41 41 42 Project: "libresample"=".\THIRD_PARTY\BUILD\RESAMPLE\libresample.dsp" - Package Owner=<4> 43 44 Package=<5> 45 {{{ 46 }}} 47 48 Package=<4> 49 {{{ 50 }}} 51 52 ############################################################################### 53 42 54 Project: "libspeex"=".\third_party\build\speex\libspeex.dsp" - Package Owner=<4> 43 55 … … 228 240 Project_Dep_Name libspeex 229 241 End Project Dependency 242 Begin Project Dependency 243 Project_Dep_Name libresample 244 End Project Dependency 230 245 }}} 231 246 … … 276 291 Project_Dep_Name pjsua_lib 277 292 End Project Dependency 293 Begin Project Dependency 294 Project_Dep_Name libgsmcodec 295 End Project Dependency 296 Begin Project Dependency 297 Project_Dep_Name libilbccodec 298 End Project Dependency 299 Begin Project Dependency 300 Project_Dep_Name libportaudio 301 End Project Dependency 302 Begin Project Dependency 303 Project_Dep_Name libresample 304 End Project Dependency 305 Begin Project Dependency 306 Project_Dep_Name libspeex 307 End Project Dependency 278 308 }}} 279 309 -
pjproject/branches/split-3rd-party/pjsip-apps/build/Samples-vc.mak
r1127 r1177 19 19 PJSUA_LIB_LIB = ..\..\pjsip\lib\pjsua-lib-$(TARGET)$(LIBEXT) 20 20 21 GSM_LIB = ..\..\third_party\lib\libgsmcodec-$(TARGET)$(LIBEXT) 22 ILBC_LIB = ..\..\third_party\lib\libilbccodec-$(TARGET)$(LIBEXT) 23 PORTAUDIO_LIB = ..\..\third_party\lib\libportaudio-$(TARGET)$(LIBEXT) 24 RESAMPLE_LIB = ..\..\third_party\lib\libresample-$(TARGET)$(LIBEXT) 25 SPEEX_LIB = ..\..\third_party\lib\libspeex-$(TARGET)$(LIBEXT) 26 27 THIRD_PARTY_LIBS = $(GSM_LIB) $(ILBC_LIB) $(PORTAUDIO_LIB) $(RESAMPLE_LIB) \ 28 $(SPEEX_LIB) 29 21 30 LIBS = $(PJSUA_LIB_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) \ 22 31 $(PJSIP_LIB) $(PJMEDIA_CODEC_LIB) $(PJMEDIA_LIB) $(PJNATH_LIB) \ 23 $(PJLIB_UTIL_LIB) $(PJLIB_LIB) 32 $(PJLIB_UTIL_LIB) $(PJLIB_LIB) \ 33 $(THIRD_PARTY_LIBS) 24 34 25 35 CFLAGS = /DPJ_WIN32=1 /DPJ_M_I386=1 \ -
pjproject/branches/split-3rd-party/pjsip-apps/build/pjsip_apps.dsw
r1130 r1177 4 4 ############################################################################### 5 5 6 Project: "libgsmcodec"="..\..\third_party\build\gsm\libgsmcodec.dsp" - Package Owner=<4> 7 8 Package=<5> 9 {{{ 10 }}} 11 12 Package=<4> 13 {{{ 14 }}} 15 16 ############################################################################### 17 18 Project: "libilbccodec"="..\..\third_party\build\ilbc\libilbccodec.dsp" - Package Owner=<4> 19 20 Package=<5> 21 {{{ 22 }}} 23 24 Package=<4> 25 {{{ 26 }}} 27 28 ############################################################################### 29 30 Project: "libportaudio"="..\..\third_party\build\portaudio\libportaudio.dsp" - Package Owner=<4> 31 32 Package=<5> 33 {{{ 34 }}} 35 36 Package=<4> 37 {{{ 38 }}} 39 40 ############################################################################### 41 42 Project: "libresample"="..\..\third_party\build\resample\libresample.dsp" - Package Owner=<4> 43 44 Package=<5> 45 {{{ 46 }}} 47 48 Package=<4> 49 {{{ 50 }}} 51 52 ############################################################################### 53 54 Project: "libspeex"="..\..\third_party\build\speex\libspeex.dsp" - Package Owner=<4> 55 56 Package=<5> 57 {{{ 58 }}} 59 60 Package=<4> 61 {{{ 62 }}} 63 64 ############################################################################### 65 6 66 Project: "pjlib"="..\..\pjlib\build\pjlib.dsp" - Package Owner=<4> 7 67 … … 135 195 Project_Dep_Name pjnath 136 196 End Project Dependency 197 Begin Project Dependency 198 Project_Dep_Name libgsmcodec 199 End Project Dependency 200 Begin Project Dependency 201 Project_Dep_Name libilbccodec 202 End Project Dependency 203 Begin Project Dependency 204 Project_Dep_Name libportaudio 205 End Project Dependency 206 Begin Project Dependency 207 Project_Dep_Name libresample 208 End Project Dependency 209 Begin Project Dependency 210 Project_Dep_Name libspeex 211 End Project Dependency 137 212 }}} 138 213 … … 186 261 Project_Dep_Name pjnath 187 262 End Project Dependency 263 Begin Project Dependency 264 Project_Dep_Name libgsmcodec 265 End Project Dependency 266 Begin Project Dependency 267 Project_Dep_Name libilbccodec 268 End Project Dependency 269 Begin Project Dependency 270 Project_Dep_Name libportaudio 271 End Project Dependency 272 Begin Project Dependency 273 Project_Dep_Name libresample 274 End Project Dependency 275 Begin Project Dependency 276 Project_Dep_Name libspeex 277 End Project Dependency 188 278 }}} 189 279 … … 222 312 Project_Dep_Name pjsua_lib 223 313 End Project Dependency 314 Begin Project Dependency 315 Project_Dep_Name libgsmcodec 316 End Project Dependency 317 Begin Project Dependency 318 Project_Dep_Name libilbccodec 319 End Project Dependency 320 Begin Project Dependency 321 Project_Dep_Name libportaudio 322 End Project Dependency 323 Begin Project Dependency 324 Project_Dep_Name libresample 325 End Project Dependency 326 Begin Project Dependency 327 Project_Dep_Name libspeex 328 End Project Dependency 224 329 }}} 225 330 -
pjproject/branches/split-3rd-party/pjsip-apps/build/pjsua.vcproj
r1130 r1177 4 4 Version="8.00" 5 5 Name="pjsua" 6 ProjectGUID="{ 19EBB464-60E7-47C5-96D8-E012B8CF3A41}"6 ProjectGUID="{8310649E-A25E-4AF0-91E8-9E3CC659BB89}" 7 7 RootNamespace="pjsua" 8 8 > -
pjproject/branches/split-3rd-party/pjsip-apps/build/sample_debug.vcproj
r1130 r1177 4 4 Version="8.00" 5 5 Name="sample_debug" 6 ProjectGUID="{ E13CECAA-8A8E-48CC-841F-5C4B845F0ECB}"6 ProjectGUID="{A0F1AA62-0F6F-420D-B09A-AC04B6862821}" 7 7 RootNamespace="sample_debug" 8 8 > -
pjproject/branches/split-3rd-party/pjsip-apps/build/samples.vcproj
r1130 r1177 4 4 Version="8.00" 5 5 Name="samples" 6 ProjectGUID="{ 3CE5B675-EF25-434E-8AC2-23F0D76D1719}"6 ProjectGUID="{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}" 7 7 RootNamespace="samples" 8 8 Keyword="MakeFileProj" -
pjproject/branches/split-3rd-party/pjsip-apps/src/samples/pjsip-perf.c
r1159 r1177 752 752 static pj_status_t init_sip() 753 753 { 754 pj_status_t status ;754 pj_status_t status = -1; 755 755 756 756 /* Add UDP/TCP transport. */ … … 758 758 pj_sockaddr_in addr; 759 759 pjsip_host_port addrname; 760 const char *transport_type ;760 const char *transport_type = NULL; 761 761 762 762 pj_bzero(&addr, sizeof(addr)); -
pjproject/branches/split-3rd-party/pjsip/build/pjsip_core.vcproj
r1130 r1177 4 4 Version="8.00" 5 5 Name="pjsip_core" 6 ProjectGUID="{ 98E41390-0F17-4501-BB27-B7A933D06806}"6 ProjectGUID="{2BB84911-C1B4-4747-B93D-36AA82CC5031}" 7 7 > 8 8 <Platforms> -
pjproject/branches/split-3rd-party/pjsip/build/pjsip_simple.vcproj
r1130 r1177 4 4 Version="8.00" 5 5 Name="pjsip_simple" 6 ProjectGUID="{ F40BFAB7-A013-4B6F-9AC4-676199004F0F}"6 ProjectGUID="{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}" 7 7 > 8 8 <Platforms> -
pjproject/branches/split-3rd-party/pjsip/build/pjsip_ua.vcproj
r1130 r1177 4 4 Version="8.00" 5 5 Name="pjsip_ua" 6 ProjectGUID="{ 5672ED37-5A78-4393-94D0-7CFED60DCC44}"6 ProjectGUID="{B8719FD5-E8A6-4A36-943C-891D07F5DD21}" 7 7 > 8 8 <Platforms> -
pjproject/branches/split-3rd-party/pjsip/build/pjsua_lib.vcproj
r1130 r1177 4 4 Version="8.00" 5 5 Name="pjsua_lib" 6 ProjectGUID="{ 8D13F110-93F9-4AE7-A717-DF25111B05DA}"6 ProjectGUID="{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}" 7 7 RootNamespace="pjsua_lib" 8 8 > -
pjproject/branches/split-3rd-party/pjsip/build/test_pjsip.vcproj
r1130 r1177 4 4 Version="8.00" 5 5 Name="test_pjsip" 6 ProjectGUID="{ AF5815F7-AACB-4798-8FBD-37BF18CAC15C}"6 ProjectGUID="{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}" 7 7 > 8 8 <Platforms> -
pjproject/branches/split-3rd-party/pjsip/include/pjsua-lib/pjsua.h
r1135 r1177 3917 3917 /** 3918 3918 * Create a file recorder, and automatically connect this recorder to 3919 * the conference bridge. The recorder currently supports recording WAV file ,3920 * and on Windows, MP3 file. The type of the recorder to use is determined3921 * by the extension of the file (e.g. ".wav" or ".mp3").3919 * the conference bridge. The recorder currently supports recording WAV file. 3920 * The type of the recorder to use is determined by the extension of the file 3921 * (e.g. ".wav"). 3922 3922 * 3923 3923 * @param filename Output file name. The function will determine the 3924 3924 * default format to be used based on the file extension. 3925 * Currently ".wav" is supported on all platforms, and 3926 * also ".mp3" is support on Windows. 3925 * Currently ".wav" is supported on all platforms. 3927 3926 * @param enc_type Optionally specify the type of encoder to be used to 3928 3927 * compress the media, if the file can support different 3929 3928 * encodings. This value must be zero for now. 3930 3929 * @param enc_param Optionally specify codec specific parameter to be 3931 * passed to the file writer. For .MP3 recorder, this 3932 * can point to pjmedia_mp3_encoder_option structure to 3933 * specify additional settings for the .mp3 recorder. 3930 * passed to the file writer. 3934 3931 * For .WAV recorder, this value must be NULL. 3935 3932 * @param max_size Maximum file size. Specify zero or -1 to remove size -
pjproject/branches/split-3rd-party/pjsip/src/pjsua-lib/pjsua_media.c
r1156 r1177 1371 1371 pjsua_var.mconf_cfg.bits_per_sample, 1372 1372 options, 0, &port); 1373 } else if (file_format == FMT_MP3) {1374 status = pjmedia_mp3_writer_port_create(pjsua_var.pool, path,1375 pjsua_var.media_cfg.clock_rate,1376 pjsua_var.mconf_cfg.channel_count,1377 pjsua_var.mconf_cfg.samples_per_frame,1378 pjsua_var.mconf_cfg.bits_per_sample,1379 enc_param, &port);1380 1373 } else { 1374 PJ_UNUSED_ARG(enc_param); 1381 1375 port = NULL; 1382 1376 status = PJ_ENOTSUP; -
pjproject/branches/split-3rd-party/third_party/README.txt
r1175 r1177 17 17 ilbc: from RFC 18 18 plc_steveu: Steve Underwood's PLC 19 resample: lib-resample, I think version 1.7 -
pjproject/branches/split-3rd-party/third_party/build/gsm/libgsmcodec.dsp
r1169 r1177 33 33 # PROP BASE Use_MFC 0 34 34 # PROP BASE Use_Debug_Libraries 0 35 # PROP BASE Output_Dir "output\gsm-i386- vc6-release"36 # PROP BASE Intermediate_Dir "output\gsm-i386- vc6-release"35 # PROP BASE Output_Dir "output\gsm-i386-win32-vc6-release" 36 # PROP BASE Intermediate_Dir "output\gsm-i386-win32-vc6-release" 37 37 # PROP BASE Target_Dir "" 38 38 # PROP Use_MFC 0 39 39 # PROP Use_Debug_Libraries 0 40 # PROP Output_Dir "output\gsm-i386- vc6-release"41 # PROP Intermediate_Dir "output\gsm-i386- vc6-release"40 # PROP Output_Dir "output\gsm-i386-win32-vc6-release" 41 # PROP Intermediate_Dir "output\gsm-i386-win32-vc6-release" 42 42 # PROP Target_Dir "" 43 43 F90=df.exe 44 44 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c 45 # ADD CPP /nologo /M T/GX /O2 /I "." /I "../../gsm/inc" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c45 # ADD CPP /nologo /MD /GX /O2 /I "." /I "../../gsm/inc" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c 46 46 # ADD BASE RSC /l 0x409 /d "NDEBUG" 47 47 # ADD RSC /l 0x409 /d "NDEBUG" … … 51 51 LIB32=link.exe -lib 52 52 # ADD BASE LIB32 /nologo 53 # ADD LIB32 /nologo /out:"..\..\lib\libgsmcodec-i386- vc6-release.lib"53 # ADD LIB32 /nologo /out:"..\..\lib\libgsmcodec-i386-win32-vc6-release.lib" 54 54 55 55 !ELSEIF "$(CFG)" == "libgsmcodec - Win32 Debug" … … 57 57 # PROP BASE Use_MFC 0 58 58 # PROP BASE Use_Debug_Libraries 1 59 # PROP BASE Output_Dir "output\gsm-i386- vc6-debug"60 # PROP BASE Intermediate_Dir "output\gsm-i386- vc6-debug"59 # PROP BASE Output_Dir "output\gsm-i386-win32-vc6-debug" 60 # PROP BASE Intermediate_Dir "output\gsm-i386-win32-vc6-debug" 61 61 # PROP BASE Target_Dir "" 62 62 # PROP Use_MFC 0 63 63 # PROP Use_Debug_Libraries 1 64 # PROP Output_Dir "output\gsm-i386- vc6-debug"65 # PROP Intermediate_Dir "output\gsm-i386- vc6-debug"64 # PROP Output_Dir "output\gsm-i386-win32-vc6-debug" 65 # PROP Intermediate_Dir "output\gsm-i386-win32-vc6-debug" 66 66 # PROP Target_Dir "" 67 67 F90=df.exe … … 75 75 LIB32=link.exe -lib 76 76 # ADD BASE LIB32 /nologo 77 # ADD LIB32 /nologo /out:"..\..\lib\libgsmcodec-i386- vc6-debug.lib"77 # ADD LIB32 /nologo /out:"..\..\lib\libgsmcodec-i386-win32-vc6-debug.lib" 78 78 79 79 !ENDIF -
pjproject/branches/split-3rd-party/third_party/build/ilbc/libilbccodec.dsp
r1169 r1177 33 33 # PROP BASE Use_MFC 0 34 34 # PROP BASE Use_Debug_Libraries 0 35 # PROP BASE Output_Dir "output\ilbc-i386- vc6-release"36 # PROP BASE Intermediate_Dir "output\ilbc-i386- vc6-release"35 # PROP BASE Output_Dir "output\ilbc-i386-win32-vc6-release" 36 # PROP BASE Intermediate_Dir "output\ilbc-i386-win32-vc6-release" 37 37 # PROP BASE Target_Dir "" 38 38 # PROP Use_MFC 0 39 39 # PROP Use_Debug_Libraries 0 40 # PROP Output_Dir "output\ilbc-i386- vc6-release"41 # PROP Intermediate_Dir "output\ilbc-i386- vc6-release"40 # PROP Output_Dir "output\ilbc-i386-win32-vc6-release" 41 # PROP Intermediate_Dir "output\ilbc-i386-win32-vc6-release" 42 42 # PROP Target_Dir "" 43 43 F90=df.exe 44 44 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c 45 # ADD CPP /nologo /M T/W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c45 # ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c 46 46 # ADD BASE RSC /l 0x409 /d "NDEBUG" 47 47 # ADD RSC /l 0x409 /d "NDEBUG" … … 51 51 LIB32=link.exe -lib 52 52 # ADD BASE LIB32 /nologo 53 # ADD LIB32 /nologo /out:"..\..\lib\libilbccodec-i386- vc6-release.lib"53 # ADD LIB32 /nologo /out:"..\..\lib\libilbccodec-i386-win32-vc6-release.lib" 54 54 55 55 !ELSEIF "$(CFG)" == "libilbccodec - Win32 Debug" … … 57 57 # PROP BASE Use_MFC 0 58 58 # PROP BASE Use_Debug_Libraries 1 59 # PROP BASE Output_Dir "output\ilbc-i386- vc6-debug"60 # PROP BASE Intermediate_Dir "output\ilbc-i386- vc6-debug"59 # PROP BASE Output_Dir "output\ilbc-i386-win32-vc6-debug" 60 # PROP BASE Intermediate_Dir "output\ilbc-i386-win32-vc6-debug" 61 61 # PROP BASE Target_Dir "" 62 62 # PROP Use_MFC 0 63 63 # PROP Use_Debug_Libraries 1 64 # PROP Output_Dir "output\ilbc-i386- vc6-debug"65 # PROP Intermediate_Dir "output\ilbc-i386- vc6-debug"64 # PROP Output_Dir "output\ilbc-i386-win32-vc6-debug" 65 # PROP Intermediate_Dir "output\ilbc-i386-win32-vc6-debug" 66 66 # PROP Target_Dir "" 67 67 F90=df.exe … … 75 75 LIB32=link.exe -lib 76 76 # ADD BASE LIB32 /nologo 77 # ADD LIB32 /nologo /out:"..\..\lib\libilbccodec-i386- vc6-debug.lib"77 # ADD LIB32 /nologo /out:"..\..\lib\libilbccodec-i386-win32-vc6-debug.lib" 78 78 79 79 !ENDIF … … 152 152 # Begin Source File 153 153 154 SOURCE=..\..\ilbc\iLBC_test.c155 # End Source File156 # Begin Source File157 158 154 SOURCE=..\..\ilbc\LPCdecode.c 159 155 # End Source File -
pjproject/branches/split-3rd-party/third_party/build/portaudio/libportaudio.dsp
r1169 r1177 33 33 # PROP BASE Use_MFC 0 34 34 # PROP BASE Use_Debug_Libraries 0 35 # PROP BASE Output_Dir "output\pa-i386- vc6-release"36 # PROP BASE Intermediate_Dir "output\pa-i386- vc6-release"35 # PROP BASE Output_Dir "output\pa-i386-win32-vc6-release" 36 # PROP BASE Intermediate_Dir "output\pa-i386-win32-vc6-release" 37 37 # PROP BASE Target_Dir "" 38 38 # PROP Use_MFC 0 39 39 # PROP Use_Debug_Libraries 0 40 # PROP Output_Dir "output\pa-i386- vc6-release"41 # PROP Intermediate_Dir "output\pa-i386- vc6-release"40 # PROP Output_Dir "output\pa-i386-win32-vc6-release" 41 # PROP Intermediate_Dir "output\pa-i386-win32-vc6-release" 42 42 # PROP Target_Dir "" 43 43 F90=df.exe 44 44 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c 45 # ADD CPP /nologo /M T/W3 /GX /O2 /I "..\..\portaudio\src\common" /I "..\..\portaudio\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PA_ENABLE_DEBUG_OUTPUT" /D "_CRT_SECURE_NO_DEPRECATE" /D "PA_NO_ASIO" /YX /FD /c45 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\portaudio\src\common" /I "..\..\portaudio\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PA_ENABLE_DEBUG_OUTPUT" /D "_CRT_SECURE_NO_DEPRECATE" /D "PA_NO_ASIO" /YX /FD /c 46 46 # ADD BASE RSC /l 0x409 /d "NDEBUG" 47 47 # ADD RSC /l 0x409 /d "NDEBUG" … … 51 51 LIB32=link.exe -lib 52 52 # ADD BASE LIB32 /nologo 53 # ADD LIB32 /nologo /out:"..\..\lib\libportaudio-i386- vc6-release.lib"53 # ADD LIB32 /nologo /out:"..\..\lib\libportaudio-i386-win32-vc6-release.lib" 54 54 55 55 !ELSEIF "$(CFG)" == "libportaudio - Win32 Debug" … … 57 57 # PROP BASE Use_MFC 0 58 58 # PROP BASE Use_Debug_Libraries 1 59 # PROP BASE Output_Dir "output\pa-i386- vc6-debug"60 # PROP BASE Intermediate_Dir "output\pa-i386- vc6-debug"59 # PROP BASE Output_Dir "output\pa-i386-win32-vc6-debug" 60 # PROP BASE Intermediate_Dir "output\pa-i386-win32-vc6-debug" 61 61 # PROP BASE Target_Dir "" 62 62 # PROP Use_MFC 0 63 63 # PROP Use_Debug_Libraries 1 64 # PROP Output_Dir "output\pa-i386- vc6-debug"65 # PROP Intermediate_Dir "output\pa-i386- vc6-debug"64 # PROP Output_Dir "output\pa-i386-win32-vc6-debug" 65 # PROP Intermediate_Dir "output\pa-i386-win32-vc6-debug" 66 66 # PROP Target_Dir "" 67 67 F90=df.exe … … 75 75 LIB32=link.exe -lib 76 76 # ADD BASE LIB32 /nologo 77 # ADD LIB32 /nologo /out:"..\..\lib\libportaudio-i386- vc6-debug.lib"77 # ADD LIB32 /nologo /out:"..\..\lib\libportaudio-i386-win32-vc6-debug.lib" 78 78 79 79 !ENDIF -
pjproject/branches/split-3rd-party/third_party/build/speex/libspeex.dsp
r1171 r1177 33 33 # PROP BASE Use_MFC 0 34 34 # PROP BASE Use_Debug_Libraries 0 35 # PROP BASE Output_Dir "output\libspeex-i386- vc6-release"36 # PROP BASE Intermediate_Dir "output\libspeex-i386- vc6-release"35 # PROP BASE Output_Dir "output\libspeex-i386-win32-vc6-release" 36 # PROP BASE Intermediate_Dir "output\libspeex-i386-win32-vc6-release" 37 37 # PROP BASE Target_Dir "" 38 38 # PROP Use_MFC 0 39 39 # PROP Use_Debug_Libraries 0 40 # PROP Output_Dir "output\libspeex-i386- vc6-release"41 # PROP Intermediate_Dir "output\libspeex-i386- vc6-release"40 # PROP Output_Dir "output\libspeex-i386-win32-vc6-release" 41 # PROP Intermediate_Dir "output\libspeex-i386-win32-vc6-release" 42 42 # PROP Target_Dir "" 43 43 F90=df.exe 44 44 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c 45 # ADD CPP /nologo /M T/GX /Ox /Ot /Og /Oi /Ob2 /I "." /I "../../speex/include" /I "../../../pjlib/include" /D inline=__inline /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /FD /c45 # ADD CPP /nologo /MD /GX /Ox /Ot /Og /Oi /Ob2 /I "." /I "../../speex/include" /I "../../../pjlib/include" /D inline=__inline /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /FD /c 46 46 # ADD BASE RSC /l 0x809 /d "NDEBUG" 47 47 # ADD RSC /l 0x809 /d "NDEBUG" … … 51 51 LIB32=link.exe -lib 52 52 # ADD BASE LIB32 /nologo 53 # ADD LIB32 /nologo /out:"..\..\lib\libspeex-i386- vc6-release.lib"53 # ADD LIB32 /nologo /out:"..\..\lib\libspeex-i386-win32-vc6-release.lib" 54 54 55 55 !ELSEIF "$(CFG)" == "libspeex - Win32 Debug" … … 57 57 # PROP BASE Use_MFC 0 58 58 # PROP BASE Use_Debug_Libraries 1 59 # PROP BASE Output_Dir "output\libspeex-i386- vc6-debug"60 # PROP BASE Intermediate_Dir "output\libspeex-i386- vc6-debug"59 # PROP BASE Output_Dir "output\libspeex-i386-win32-vc6-debug" 60 # PROP BASE Intermediate_Dir "output\libspeex-i386-win32-vc6-debug" 61 61 # PROP BASE Target_Dir "" 62 62 # PROP Use_MFC 0 63 63 # PROP Use_Debug_Libraries 1 64 # PROP Output_Dir "output\libspeex-i386- vc6-debug"65 # PROP Intermediate_Dir "output\libspeex-i386- vc6-debug"64 # PROP Output_Dir "output\libspeex-i386-win32-vc6-debug" 65 # PROP Intermediate_Dir "output\libspeex-i386-win32-vc6-debug" 66 66 # PROP Target_Dir "" 67 67 F90=df.exe 68 68 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c 69 # ADD CPP /nologo /MTd /W3 /GX /ZI /Od / Ob0 /I "." /I "../../speex/include" /I "../../../pjlib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /FD /c69 # ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "." /I "../../speex/include" /I "../../../pjlib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /FD /c 70 70 # ADD BASE RSC /l 0x809 /d "_DEBUG" 71 71 # ADD RSC /l 0x809 /d "_DEBUG" … … 75 75 LIB32=link.exe -lib 76 76 # ADD BASE LIB32 /nologo 77 # ADD LIB32 /nologo /out:"..\..\lib\libspeex-i386- vc6-debug.lib"77 # ADD LIB32 /nologo /out:"..\..\lib\libspeex-i386-win32-vc6-debug.lib" 78 78 79 79 !ENDIF -
pjproject/branches/split-3rd-party/third_party/resample/src/resamplesubs.c
r1176 r1177 1 1 /* $Id$ */ 2 2 /* 3 * Based on:4 * resample-1.8.tar.gz from the5 3 * Digital Audio Resampling Home Page located at 6 4 * http://www-ccrma.stanford.edu/~jos/resample/. … … 42 40 * - const correctness. 43 41 */ 44 #include <pjmedia/resample.h> 45 #include <pjmedia/errno.h> 46 #include <pj/assert.h> 47 #include <pj/log.h> 48 #include <pj/pool.h> 49 50 51 #define THIS_FILE "resample.c" 52 53 54 /* 55 * Taken from stddefs.h 56 */ 57 #ifndef PI 58 #define PI (3.14159265358979232846) 59 #endif 60 61 #ifndef PI2 62 #define PI2 (6.28318530717958465692) 63 #endif 64 65 #define D2R (0.01745329348) /* (2*pi)/360 */ 66 #define R2D (57.29577951) /* 360/(2*pi) */ 67 68 #ifndef MAX 69 #define MAX(x,y) ((x)>(y) ?(x):(y)) 70 #endif 71 #ifndef MIN 72 #define MIN(x,y) ((x)<(y) ?(x):(y)) 73 #endif 74 75 #ifndef ABS 76 #define ABS(x) ((x)<0 ?(-(x)):(x)) 77 #endif 78 79 #ifndef SGN 80 #define SGN(x) ((x)<0 ?(-1):((x)==0?(0):(1))) 81 #endif 82 83 typedef char RES_BOOL; 84 typedef short RES_HWORD; 85 typedef int RES_WORD; 86 typedef unsigned short RES_UHWORD; 87 typedef unsigned int RES_UWORD; 88 89 #define MAX_HWORD (32767) 90 #define MIN_HWORD (-32768) 91 92 #ifdef DEBUG 93 #define INLINE 94 #else 95 #define INLINE inline 96 #endif 97 98 /* 99 * Taken from resample.h 100 * 101 * The configuration constants below govern 102 * the number of bits in the input sample and filter coefficients, the 103 * number of bits to the right of the binary-point for fixed-point math, etc. 104 * 105 */ 106 107 /* Conversion constants */ 108 #define Nhc 8 109 #define Na 7 110 #define Np (Nhc+Na) 111 #define Npc (1<<Nhc) 112 #define Amask ((1<<Na)-1) 113 #define Pmask ((1<<Np)-1) 114 #define Nh 16 115 #define Nb 16 116 #define Nhxn 14 117 #define Nhg (Nh-Nhxn) 118 #define NLpScl 13 119 120 /* Description of constants: 121 * 122 * Npc - is the number of look-up values available for the lowpass filter 123 * between the beginning of its impulse response and the "cutoff time" 124 * of the filter. The cutoff time is defined as the reciprocal of the 125 * lowpass-filter cut off frequence in Hz. For example, if the 126 * lowpass filter were a sinc function, Npc would be the index of the 127 * impulse-response lookup-table corresponding to the first zero- 128 * crossing of the sinc function. (The inverse first zero-crossing 129 * time of a sinc function equals its nominal cutoff frequency in Hz.) 130 * Npc must be a power of 2 due to the details of the current 131 * implementation. The default value of 512 is sufficiently high that 132 * using linear interpolation to fill in between the table entries 133 * gives approximately 16-bit accuracy in filter coefficients. 134 * 135 * Nhc - is log base 2 of Npc. 136 * 137 * Na - is the number of bits devoted to linear interpolation of the 138 * filter coefficients. 139 * 140 * Np - is Na + Nhc, the number of bits to the right of the binary point 141 * in the integer "time" variable. To the left of the point, it indexes 142 * the input array (X), and to the right, it is interpreted as a number 143 * between 0 and 1 sample of the input X. Np must be less than 16 in 144 * this implementation. 145 * 146 * Nh - is the number of bits in the filter coefficients. The sum of Nh and 147 * the number of bits in the input data (typically 16) cannot exceed 32. 148 * Thus Nh should be 16. The largest filter coefficient should nearly 149 * fill 16 bits (32767). 150 * 151 * Nb - is the number of bits in the input data. The sum of Nb and Nh cannot 152 * exceed 32. 153 * 154 * Nhxn - is the number of bits to right shift after multiplying each input 155 * sample times a filter coefficient. It can be as great as Nh and as 156 * small as 0. Nhxn = Nh-2 gives 2 guard bits in the multiply-add 157 * accumulation. If Nhxn=0, the accumulation will soon overflow 32 bits. 158 * 159 * Nhg - is the number of guard bits in mpy-add accumulation (equal to Nh-Nhxn) 160 * 161 * NLpScl - is the number of bits allocated to the unity-gain normalization 162 * factor. The output of the lowpass filter is multiplied by LpScl and 163 * then right-shifted NLpScl bits. To avoid overflow, we must have 164 * Nb+Nhg+NLpScl < 32. 165 */ 42 43 #include <resamplesubs.h> 44 #include "config.h" 45 #include "stddefs.h" 46 #include "resample.h" 166 47 167 48 … … 174 55 #endif 175 56 176 #if defined( PJMEDIA_HAS_SMALL_FILTER) && PJMEDIA_HAS_SMALL_FILTER!=057 #if defined(RESAMPLE_HAS_SMALL_FILTER) && RESAMPLE_HAS_SMALL_FILTER!=0 177 58 # include "smallfilter.h" 178 59 #else … … 184 65 #endif 185 66 186 #if defined( PJMEDIA_HAS_LARGE_FILTER) && PJMEDIA_HAS_LARGE_FILTER!=067 #if defined(RESAMPLE_HAS_LARGE_FILTER) && RESAMPLE_HAS_LARGE_FILTER!=0 187 68 # include "largefilter.h" 188 69 #else … … 439 320 440 321 441 /* *************************************************************************** 442 * 443 * PJMEDIA RESAMPLE 444 * 445 * *************************************************************************** 446 */ 447 448 struct pjmedia_resample 449 { 450 double factor; /* Conversion factor = rate_out / rate_in. */ 451 pj_bool_t large_filter; /* Large filter? */ 452 pj_bool_t high_quality; /* Not fast? */ 453 unsigned xoff; /* History and lookahead size, in samples */ 454 unsigned frame_size; /* Samples per frame. */ 455 pj_int16_t *buffer; /* Input buffer. */ 456 }; 457 458 459 PJ_DEF(pj_status_t) pjmedia_resample_create( pj_pool_t *pool, 460 pj_bool_t high_quality, 461 pj_bool_t large_filter, 462 unsigned channel_count, 463 unsigned rate_in, 464 unsigned rate_out, 465 unsigned samples_per_frame, 466 pjmedia_resample **p_resample) 467 { 468 pjmedia_resample *resample; 469 470 PJ_ASSERT_RETURN(pool && p_resample && rate_in && 471 rate_out && samples_per_frame, PJ_EINVAL); 472 473 resample = pj_pool_alloc(pool, sizeof(pjmedia_resample)); 474 PJ_ASSERT_RETURN(resample, PJ_ENOMEM); 475 476 PJ_UNUSED_ARG(channel_count); 477 478 /* 479 * If we're downsampling, always use the fast algorithm since it seems 480 * to yield the same quality. 481 */ 482 if (rate_out < rate_in) { 483 //no this is not a good idea. It sounds pretty good with speech, 484 //but very poor with background noise etc. 485 //high_quality = 0; 486 } 487 488 #if !defined(PJMEDIA_HAS_LARGE_FILTER) || PJMEDIA_HAS_LARGE_FILTER==0 489 /* 490 * If large filter is excluded in the build, then prevent application 491 * from using it. 492 */ 493 if (high_quality && large_filter) { 494 large_filter = PJ_FALSE; 495 PJ_LOG(5,(THIS_FILE, 496 "Resample uses small filter because large filter is " 497 "disabled")); 498 } 499 #endif 500 501 #if !defined(PJMEDIA_HAS_SMALL_FILTER) || PJMEDIA_HAS_SMALL_FILTER==0 502 /* 503 * If small filter is excluded in the build and application wants to 504 * use it, then drop to linear conversion. 505 */ 506 if (high_quality && large_filter == 0) { 507 high_quality = PJ_FALSE; 508 PJ_LOG(4,(THIS_FILE, 509 "Resample uses linear because small filter is disabled")); 510 } 511 #endif 512 513 resample->factor = rate_out * 1.0 / rate_in; 514 resample->large_filter = large_filter; 515 resample->high_quality = high_quality; 516 resample->frame_size = samples_per_frame; 517 518 if (high_quality) { 519 unsigned size; 520 521 /* This is a bug in xoff calculation, thanks Stephane Lussier 522 * of Macadamian dot com. 523 * resample->xoff = large_filter ? 32 : 6; 524 */ 525 if (large_filter) 526 resample->xoff = (LARGE_FILTER_NMULT + 1) / 2.0 * 527 MAX(1.0, 1.0/resample->factor); 322 int res_SrcLinear(const RES_HWORD X[], RES_HWORD Y[], 323 double pFactor, RES_UHWORD nx) 324 { 325 return SrcLinear(X, Y, pFactor, nx); 326 } 327 328 int res_Resample(const RES_HWORD X[], RES_HWORD Y[], double pFactor, 329 RES_UHWORD nx, RES_BOOL LargeF, RES_BOOL Interp) 330 { 331 if (pFactor >= 1) { 332 333 if (LargeF) 334 return SrcUp(X, Y, pFactor, nx, 335 LARGE_FILTER_NWING, LARGE_FILTER_SCALE, 336 LARGE_FILTER_IMP, LARGE_FILTER_IMPD, Interp); 528 337 else 529 resample->xoff = (SMALL_FILTER_NMULT + 1) / 2.0 * 530 MAX(1.0, 1.0/resample->factor); 531 532 533 size = (samples_per_frame + 2*resample->xoff) * sizeof(pj_int16_t); 534 resample->buffer = pj_pool_alloc(pool, size); 535 PJ_ASSERT_RETURN(resample->buffer, PJ_ENOMEM); 536 537 pjmedia_zero_samples(resample->buffer, resample->xoff*2); 538 338 return SrcUp(X, Y, pFactor, nx, 339 SMALL_FILTER_NWING, SMALL_FILTER_SCALE, 340 SMALL_FILTER_IMP, SMALL_FILTER_IMPD, Interp); 539 341 540 342 } else { 541 resample->xoff = 0; 542 } 543 544 *p_resample = resample; 545 546 PJ_LOG(5,(THIS_FILE, "resample created: %s qualiy, %s filter, in/out " 547 "rate=%d/%d", 548 (high_quality?"high":"low"), 549 (large_filter?"large":"small"), 550 rate_in, rate_out)); 551 return PJ_SUCCESS; 552 } 553 554 555 556 PJ_DEF(void) pjmedia_resample_run( pjmedia_resample *resample, 557 const pj_int16_t *input, 558 pj_int16_t *output ) 559 { 560 PJ_ASSERT_ON_FAIL(resample, return); 561 562 if (resample->high_quality) { 563 pj_int16_t *dst_buf; 564 const pj_int16_t *src_buf; 565 566 /* Okay chaps, here's how we do resampling. 567 * 568 * The original resample algorithm requires xoff samples *before* the 569 * input buffer as history, and another xoff samples *after* the 570 * end of the input buffer as lookahead. Since application can only 571 * supply framesize buffer on each run, PJMEDIA needs to arrange the 572 * buffer to meet these requirements. 573 * 574 * So here comes the trick. 575 * 576 * First of all, because of the history and lookahead requirement, 577 * resample->buffer need to accomodate framesize+2*xoff samples in its 578 * buffer. This is done when the buffer is created. 579 * 580 * On the first run, the input frame (supplied by application) is 581 * copied to resample->buffer at 2*xoff position. The first 2*xoff 582 * samples are initially zeroed (in the initialization). The resample 583 * algorithm then invoked at resample->buffer+xoff ONLY, thus giving 584 * it one xoff at the beginning as zero, and one xoff at the end 585 * as the end of the original input. The resample algorithm will see 586 * that the first xoff samples in the input as zero. 587 * 588 * So here's the layout of resample->buffer on the first run. 589 * 590 * run 0 591 * +------+------+--------------+ 592 * | 0000 | 0000 | frame0... | 593 * +------+------+--------------+ 594 * ^ ^ ^ ^ 595 * 0 xoff 2*xoff size+2*xoff 596 * 597 * (Note again: resample algorithm is called at resample->buffer+xoff) 598 * 599 * At the end of the run, 2*xoff samples from the end of 600 * resample->buffer are copied to the beginning of resample->buffer. 601 * The first xoff part of this will be used as history for the next 602 * run, and the second xoff part of this is actually the start of 603 * resampling for the next run. 604 * 605 * And the first run completes, the function returns. 606 * 607 * 608 * On the next run, the input frame supplied by application is again 609 * copied at 2*xoff position in the resample->buffer, and the 610 * resample algorithm is again invoked at resample->buffer+xoff 611 * position. So effectively, the resample algorithm will start its 612 * operation on the last xoff from the previous frame, and gets the 613 * history from the last 2*xoff of the previous frame, and the look- 614 * ahead from the last xoff of current frame. 615 * 616 * So on this run, the buffer layout is: 617 * 618 * run 1 619 * +------+------+--------------+ 620 * | frm0 | frm0 | frame1... | 621 * +------+------+--------------+ 622 * ^ ^ ^ ^ 623 * 0 xoff 2*xoff size+2*xoff 624 * 625 * As you can see from above diagram, the resampling algorithm is 626 * actually called from the last xoff part of previous frame (frm0). 627 * 628 * And so on the process continues for the next frame, and the next, 629 * and the next, ... 630 * 631 */ 632 dst_buf = resample->buffer + resample->xoff*2; 633 pjmedia_copy_samples(dst_buf, input, resample->frame_size); 634 635 if (resample->factor >= 1) { 636 637 if (resample->large_filter) { 638 SrcUp(resample->buffer + resample->xoff, output, 639 resample->factor, resample->frame_size, 640 LARGE_FILTER_NWING, LARGE_FILTER_SCALE, 641 LARGE_FILTER_IMP, LARGE_FILTER_IMPD, 642 PJ_TRUE); 643 } else { 644 SrcUp(resample->buffer + resample->xoff, output, 645 resample->factor, resample->frame_size, 646 SMALL_FILTER_NWING, SMALL_FILTER_SCALE, 647 SMALL_FILTER_IMP, SMALL_FILTER_IMPD, 648 PJ_TRUE); 649 } 650 651 } else { 652 653 if (resample->large_filter) { 654 655 SrcUD( resample->buffer + resample->xoff, output, 656 resample->factor, resample->frame_size, 657 LARGE_FILTER_NWING, 658 LARGE_FILTER_SCALE * resample->factor + 0.5, 659 LARGE_FILTER_IMP, LARGE_FILTER_IMPD, 660 PJ_TRUE); 661 662 } else { 663 664 SrcUD( resample->buffer + resample->xoff, output, 665 resample->factor, resample->frame_size, 666 SMALL_FILTER_NWING, 667 SMALL_FILTER_SCALE * resample->factor + 0.5, 668 SMALL_FILTER_IMP, SMALL_FILTER_IMPD, 669 PJ_TRUE); 670 671 } 672 673 } 674 675 dst_buf = resample->buffer; 676 src_buf = input + resample->frame_size - resample->xoff*2; 677 pjmedia_copy_samples(dst_buf, src_buf, resample->xoff * 2); 678 679 } else { 680 SrcLinear( input, output, resample->factor, resample->frame_size); 681 } 682 } 683 684 PJ_DEF(unsigned) pjmedia_resample_get_input_size(pjmedia_resample *resample) 685 { 686 PJ_ASSERT_RETURN(resample != NULL, 0); 687 return resample->frame_size; 688 } 689 690 PJ_DEF(void) pjmedia_resample_destroy(pjmedia_resample *resample) 691 { 692 PJ_UNUSED_ARG(resample); 693 } 694 695 343 344 if (LargeF) 345 return SrcUD(X, Y, pFactor, nx, 346 LARGE_FILTER_NWING, LARGE_FILTER_SCALE * pFactor + 0.5, 347 LARGE_FILTER_IMP, LARGE_FILTER_IMPD, Interp); 348 else 349 return SrcUD(X, Y, pFactor, nx, 350 SMALL_FILTER_NWING, SMALL_FILTER_SCALE * pFactor + 0.5, 351 SMALL_FILTER_IMP, SMALL_FILTER_IMPD, Interp); 352 353 } 354 } 355 356 int res_GetXOFF(double pFactor, RES_BOOL LargeF) 357 { 358 if (LargeF) 359 return (LARGE_FILTER_NMULT + 1) / 2.0 * 360 MAX(1.0, 1.0/pFactor); 361 else 362 return (SMALL_FILTER_NMULT + 1) / 2.0 * 363 MAX(1.0, 1.0/pFactor); 364 } 365
Note: See TracChangeset
for help on using the changeset viewer.
