hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a bug

Browse source
This commit is contained in:
root 2010-09-02 00:47:16 +02:00
parent dc5a1dd8aa
commit 6047a71d56
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Connector_RTSP/Makefile
View file

@ -1,7 +1,7 @@
SRC = main.cpp ../sockets/sw_base.cpp ../sockets/sw_inet.cpp ../sockets/sw_unix.cpp SRC = main.cpp ../sockets/sw_base.cpp ../sockets/sw_inet.cpp ../sockets/sw_unix.cpp
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
OUT = Connector_RTSP OUT = Connector_RTSP
INCLUDES = INCLUDES = -I/usr/local/include/jthread/
CCFLAGS = -Wall -Wextra -funsigned-char -g CCFLAGS = -Wall -Wextra -funsigned-char -g
CC = $(CROSS)g++ CC = $(CROSS)g++
LD = $(CROSS)ld LD = $(CROSS)ld

2
Connector_RTSP/main.cpp
View file

@ -112,7 +112,7 @@ int main(){
rtp_connection.SendPacket( &FLVbuffer[16], FLV_len - 19, 98 , false , 1 ); rtp_connection.SendPacket( &FLVbuffer[16], FLV_len - 19, 98 , false , 1 );
} }
}//Datatype 0x12 = metadata, zouden we voor nu weggooien }//Datatype 0x12 = metadata, zouden we voor nu weggooien
FLV_Dump();//dump packet and get ready for next
} }
if ((SWBerr != SWBaseSocket::ok) && (SWBerr != SWBaseSocket::notReady)){ if ((SWBerr != SWBaseSocket::ok) && (SWBerr != SWBaseSocket::notReady)){
DEBUG("No more data! :-( (%s)\n", SWBerr.get_error().c_str()); DEBUG("No more data! :-( (%s)\n", SWBerr.get_error().c_str());

2
Server/playh264.sh
View file

@ -5,5 +5,5 @@
#ffmpeg -y -i "$1" -ar 44100 -vcodec libx264 -b 1000k -g 150 -r 20 -f flv - | ./Server_PLS 500 #ffmpeg -y -i "$1" -ar 44100 -vcodec libx264 -b 1000k -g 150 -r 20 -f flv - | ./Server_PLS 500
ffmpeg -i "$1" -re -acodec aac -ar 44100 -vcodec libx264 -b 700k -vpre ultrafast -refs 1 -bf 0 -g 150 -f flv - 2> /dev/null | ./Server_PLS 500 ffmpeg -i "$1" -re -acodec aac -ar 11025 -vcodec libx264 -b 700k -vpre ultrafast -refs 1 -bf 0 -g 150 -f flv - 2> /dev/null | ./Server_PLS 500