Skip to content
GitLab
Commit 5eaeab81 authored by Stéphane Letz's avatar Stéphane Letz
Browse files

Swich to OPUS on OSX in progress.

parent 3069c742
Hide whitespace changes
Inline Side-by-side
common/JackNetInterface.cpp
View file @ 5eaeab81
......@@ -185,7 +185,7 @@ namespace Jack
fTxHeader.fIsLastPckt = (subproc == (fTxHeader.fNumPacket - 1)) ? 1 : 0;
fTxHeader.fPacketSize = HEADER_SIZE + buffer->RenderToNetwork(subproc, fTxHeader.fActivePorts);
memcpy(fTxBuffer, &fTxHeader, HEADER_SIZE);
// PacketHeaderDisplay(&fTxHeader);
//PacketHeaderDisplay(&fTxHeader);
if (Send(fTxHeader.fPacketSize, 0) == SOCKET_ERROR) {
return SOCKET_ERROR;
}
......@@ -458,7 +458,7 @@ namespace Jack
fTxHeader.fPacketSize = fParams.fMtu;
memcpy(fTxBuffer, &fTxHeader, HEADER_SIZE);
// PacketHeaderDisplay(&fTxHeader);
//PacketHeaderDisplay(&fTxHeader);
return Send(fTxHeader.fPacketSize, 0);
}
......@@ -936,7 +936,7 @@ namespace Jack
fTxHeader.fPacketSize = fParams.fMtu;
memcpy(fTxBuffer, &fTxHeader, HEADER_SIZE);
// PacketHeaderDisplay(&fTxHeader);
//PacketHeaderDisplay(&fTxHeader);
return Send(fTxHeader.fPacketSize, 0);
}
......
common/JackNetTool.cpp
View file @ 5eaeab81
......@@ -1210,6 +1210,7 @@ namespace Jack
SERVER_EXPORT void PacketHeaderHToN(packet_header_t* src_header, packet_header_t* dst_header)
{
//printf("PacketHeaderHToN _packet_header size %d\n", sizeof(_packet_header));
memcpy(dst_header, src_header, sizeof(packet_header_t));
dst_header->fDataType = htonl(src_header->fDataType);
dst_header->fDataStream = htonl(src_header->fDataStream);
......@@ -1225,6 +1226,7 @@ namespace Jack
SERVER_EXPORT void PacketHeaderNToH(packet_header_t* src_header, packet_header_t* dst_header)
{
//printf("PacketHeaderNToH _packet_header size %d\n", sizeof(_packet_header));
memcpy(dst_header, src_header, sizeof(packet_header_t));
dst_header->fDataType = ntohl(src_header->fDataType);
dst_header->fDataStream = ntohl(src_header->fDataStream);
......@@ -1240,7 +1242,6 @@ namespace Jack
SERVER_EXPORT void PacketHeaderDisplay(packet_header_t* header)
{
char bitdepth[16];
jack_info("********************Header********************");
jack_info("Data type : %c", header->fDataType);
jack_info("Data stream : %c", header->fDataStream);
......@@ -1250,8 +1251,8 @@ namespace Jack
jack_info("Active ports : %u", header->fActivePorts);
jack_info("DATA packets : %u", header->fNumPacket);
jack_info("DATA size : %u", header->fPacketSize);
jack_info("DATA frames : %d", header->fFrames);
jack_info("Last packet : '%s'", (header->fIsLastPckt) ? "yes" : "no");
jack_info("Bitdepth : %s", bitdepth);
jack_info("**********************************************");
}
......
macosx/Jackdmp.xcodeproj/project.pbxproj
View file @ 5eaeab81
......@@ -6366,7 +6366,6 @@
isa = PBXProject;
buildConfigurationList = 4B699DD5097D427F00A18468 /* Build configuration list for PBXProject "Jackdmp" */;
compatibilityVersion = "Xcode 2.4";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
......@@ -8989,12 +8988,10 @@
MACH_O_TYPE = mh_dylib;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT_API_0_7",
"-DHAVE_CELT",
"-DHAVE_OPUS",
"-DMACH_RPC_MACH_SEMA",
);
OTHER_LDFLAGS = (
libcelt.a,
"-framework",
Jackservermp,
"-framework",
......@@ -9040,12 +9037,10 @@
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT_API_0_7",
"-DHAVE_CELT",
"-DHAVE_OPUS",
"-DMACH_RPC_MACH_SEMA",
);
OTHER_LDFLAGS = (
libcelt.a,
"-framework",
Jackservermp,
"-framework",
......@@ -9142,7 +9137,6 @@
"-DMACH_RPC_MACH_SEMA",
);
OTHER_LDFLAGS = (
libcelt.a,
"-framework",
Jackservermp,
"-framework",
......@@ -9185,13 +9179,11 @@
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
"-DHAVE_OPUS",
"-DSERVER_SIDE",
"-DMACH_RPC_MACH_SEMA",
);
OTHER_LDFLAGS = (
libcelt.a,
"-framework",
Jackservermp,
"-framework",
......@@ -9889,7 +9881,7 @@
);
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\"";
OTHER_LDFLAGS = (
/usr/local/lib/libopus.a,
libopus.a,
"-framework",
Carbon,
"-framework",
......@@ -9947,8 +9939,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT_API_0_7",
"-DHAVE_CELT",
"-DHAVE_OPUS",
"-DSERVER_SIDE",
"-D__SMP__",
"-DMACH_RPC_MACH_SEMA",
......@@ -9958,7 +9949,7 @@
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\"";
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2 = "-DLIB_DIR=\\\"lib\\\"";
OTHER_LDFLAGS = (
libcelt.a,
libopus.a,
"-framework",
Carbon,
"-framework",
......@@ -14591,8 +14582,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT_API_0_7",
"-DHAVE_CELT",
"-DHAVE_OPUS",
"-DSERVER_SIDE",
"-D__SMP__",
"-DMACH_RPC_MACH_SEMA",
......@@ -14600,7 +14590,7 @@
);
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\"";
OTHER_LDFLAGS = (
libcelt.a,
libopus.a,
"-framework",
Carbon,
"-framework",
......@@ -14656,8 +14646,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT_API_0_7",
"-DHAVE_CELT",
"-DHAVE_OPUS",
"-DSERVER_SIDE",
"-D__SMP__",
"-DMACH_RPC_MACH_SEMA",
......@@ -14667,7 +14656,7 @@
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\"";
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2 = "-DLIB_DIR=\\\"lib\\\"";
OTHER_LDFLAGS = (
libcelt.a,
libopus.a,
"-framework",
Carbon,
"-framework",
......@@ -16910,7 +16899,7 @@
);
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\"";
OTHER_LDFLAGS = (
/usr/local/lib/libopus.a,
libopus.a,
"-framework",
Carbon,
"-framework",
......@@ -16969,8 +16958,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
"-DHAVE_OPUS",
"-DJACK_MONITOR",
"-DSERVER_SIDE",
"-D__SMP__",
......@@ -16981,7 +16969,7 @@
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\"";
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2 = "-DLIB_DIR=\\\"lib\\\"";
OTHER_LDFLAGS = (
libcelt.a,
libopus.a,
"-framework",
Carbon,
"-framework",
......@@ -17682,8 +17670,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
"-DHAVE_OPUS",
"-DSERVER_SIDE",
"-DMACH_RPC_MACH_SEMA",
);
......@@ -19325,8 +19312,7 @@
MACH_O_TYPE = mh_dylib;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT_API_0_7",
"-DHAVE_CELT",
"-DHAVE_OPUS",
"-DMACH_RPC_MACH_SEMA",
);
OTHER_LDFLAGS = (
......@@ -19379,8 +19365,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT_API_0_7",
"-DHAVE_CELT",
"-DHAVE_OPUS",
"-DMACH_RPC_MACH_SEMA",
);
OTHER_LDFLAGS = (
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment