Wat test troep en kleine edits

This commit is contained in:
Thulinma 2010-08-10 15:32:42 +02:00
parent 7ebe9019a3
commit 01834792d8
4 changed files with 11 additions and 5 deletions

View file

@ -9,7 +9,7 @@
int main() { int main() {
SWUnixSocket mySocket; SWUnixSocket mySocket;
mySocket.connect("../shared_socket"); mySocket.connect("/tmp/shared_socket");
char buffer[500000]; char buffer[500000];
int msg; int msg;
std::string input; std::string input;

View file

@ -1,4 +1,4 @@
#define DEBUG #undef DEBUG
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <cstdio> #include <cstdio>
@ -50,7 +50,7 @@ int main(){
if (ready4data){ if (ready4data){
if (!inited){ if (!inited){
//we are ready, connect the socket! //we are ready, connect the socket!
if (!ss.connect("../shared_socket")){ if (!ss.connect("/tmp/shared_socket")){
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "Could not connect to server!\n"); fprintf(stderr, "Could not connect to server!\n");
#endif #endif
@ -77,6 +77,9 @@ int main(){
FLVbuffer[6] = ts % 256; FLVbuffer[6] = ts % 256;
ts += ftst; ts += ftst;
SendMedia((unsigned char)FLVbuffer[0], (unsigned char *)FLVbuffer+11, FLV_len-15, ts); 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]);
//}
} }
} }
} }

View file

@ -37,8 +37,8 @@ int main( int argc, char * argv[] ) {
SWBaseSocket * incoming = 0; SWBaseSocket * incoming = 0;
SWBaseSocket::SWBaseError BError; SWBaseSocket::SWBaseError BError;
unlink("../shared_socket"); unlink("/tmp/shared_socket");
listener.bind("../shared_socket"); listener.bind("/tmp/shared_socket");
listener.listen(); listener.listen();
listener.set_timeout(0,50000); listener.set_timeout(0,50000);

3
Server/play1000kbit.sh Executable file
View file

@ -0,0 +1,3 @@
#!/bin/bash
ffmpeg -re -i "$1" -b 1024000 -ar 11025 -f flv - | ./Server_PLS 5000 5