diff --git a/Client/main.cpp b/Client/main.cpp index 1917ae86..735afe80 100644 --- a/Client/main.cpp +++ b/Client/main.cpp @@ -9,7 +9,7 @@ int main() { SWUnixSocket mySocket; - mySocket.connect("../shared_socket"); + mySocket.connect("/tmp/shared_socket"); char buffer[500000]; int msg; std::string input; diff --git a/Connector_RTMP/main.cpp b/Connector_RTMP/main.cpp index f361f9de..fc0ddc1d 100644 --- a/Connector_RTMP/main.cpp +++ b/Connector_RTMP/main.cpp @@ -1,4 +1,4 @@ -#define DEBUG +#undef DEBUG #include #include #include @@ -50,7 +50,7 @@ int main(){ if (ready4data){ if (!inited){ //we are ready, connect the socket! - if (!ss.connect("../shared_socket")){ + if (!ss.connect("/tmp/shared_socket")){ #ifdef DEBUG fprintf(stderr, "Could not connect to server!\n"); #endif @@ -77,6 +77,9 @@ int main(){ FLVbuffer[6] = ts % 256; ts += ftst; SendMedia((unsigned char)FLVbuffer[0], (unsigned char *)FLVbuffer+11, FLV_len-15, ts); + //if (FLVbuffer[0] == 9){ + // fprintf(stderr, "first 2 bytes: 0x%hhx 0x%hhx\n", FLVbuffer[11], FLVbuffer[12]); + //} } } } diff --git a/Server/main.cpp b/Server/main.cpp index 146221ec..c914e475 100644 --- a/Server/main.cpp +++ b/Server/main.cpp @@ -37,8 +37,8 @@ int main( int argc, char * argv[] ) { SWBaseSocket * incoming = 0; SWBaseSocket::SWBaseError BError; - unlink("../shared_socket"); - listener.bind("../shared_socket"); + unlink("/tmp/shared_socket"); + listener.bind("/tmp/shared_socket"); listener.listen(); listener.set_timeout(0,50000); diff --git a/Server/play1000kbit.sh b/Server/play1000kbit.sh new file mode 100755 index 00000000..388e208a --- /dev/null +++ b/Server/play1000kbit.sh @@ -0,0 +1,3 @@ +#!/bin/bash +ffmpeg -re -i "$1" -b 1024000 -ar 11025 -f flv - | ./Server_PLS 5000 5 +