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

Merge branch 'DTSC' of github.com:DDVTECH/DMS into DTSC. Forced to Jaron's style, for now. May change later.

Browse source 
Conflicts:
	Buffer/Makefile
	Connector_HTTP/Makefile
	Connector_RAW/Makefile
	Connector_RTMP/Makefile
This commit is contained in:
Thulinma 2012-04-27 21:11:10 +02:00
commit b271cd0fe7
6 changed files with 7 additions and 1163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -19,3 +19,4 @@ HTTP_Box_Parser/Box_Parser
gearbox/CPP/Client/Gearbox_Client gearbox/CPP/Client/Gearbox_Client
*.ts *.ts
/nbproject/private/

2
Connector_TS/Makefile
View file

@ -1,4 +1,4 @@
SRC = main.cpp ../util/socket.cpp ../util/dtsc.cpp ../util/util.cpp SRC = main.cpp ../util/socket.cpp ../util/http_parser.cpp ../util/flv_tag.cpp ../util/amf.cpp ../util/dtsc.cpp ../util/config.cpp ../util/base64.cpp
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
OUT = DDV_Conn_TS OUT = DDV_Conn_TS
INCLUDES = INCLUDES =

2
Connector_TS/main.cpp
View file

@ -335,7 +335,7 @@ int TS_Handler( Socket::Connection conn ) {
case 0: break;//not ready yet case 0: break;//not ready yet
default: default:
ss.spool(); ss.spool();
if ( stream.parsePacket( conn.Received() ) ) { if ( stream.parsePacket( ss.Received() ) ) {
if( stream.lastType() == DTSC::VIDEO ) { if( stream.lastType() == DTSC::VIDEO ) {
fprintf(stderr, "Video contains NALU\n" ); fprintf(stderr, "Video contains NALU\n" );
SendPAT( conn ); SendPAT( conn );

3
Controller/Makefile
View file

@ -9,6 +9,7 @@ COMPILED_USERNAME = testuser
COMPILED_PASSWORD = 179ad45c6ce2cb97cf1029e212046e81 COMPILED_PASSWORD = 179ad45c6ce2cb97cf1029e212046e81
#COMPILED_PASSWORD = testpass #COMPILED_PASSWORD = testpass
CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) -DCOMPILED_USERNAME=$(COMPILED_USERNAME) -DCOMPILED_PASSWORD=$(COMPILED_PASSWORD) -DVERSION=$(VERSION) CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) -DCOMPILED_USERNAME=$(COMPILED_USERNAME) -DCOMPILED_PASSWORD=$(COMPILED_PASSWORD) -DVERSION=$(VERSION)
INSTALL = install
CC = $(CROSS)g++ CC = $(CROSS)g++
LD = $(CROSS)ld LD = $(CROSS)ld
AR = $(CROSS)ar AR = $(CROSS)ar
@ -24,4 +25,6 @@ clean:
rm -rf $(OBJ) ../bin/$(OUT) Makefile.bak *~ rm -rf $(OBJ) ../bin/$(OUT) Makefile.bak *~
cversion: cversion:
rm -rf ../util/config.o rm -rf ../util/config.o
install: $(OUT)
$(INSTALL) -D ./$(OUT) $(DESTDIR)/usr/bin/$(OUT)

1160
server-rel.html
View file

File diff suppressed because one or more lines are too long

2
tools/TS_Analyser/main.cpp
View file

@ -347,7 +347,7 @@ void print_pmt( program_mapping_table PMT, bool Pointer_Field = false, std::stri
printf( "%s\t\tReserved\t\t%d\n", offset.c_str(), PMT.Entries[i].Reserved_2 ); printf( "%s\t\tReserved\t\t%d\n", offset.c_str(), PMT.Entries[i].Reserved_2 );
printf( "%s\t\tES Info Length\t\t%d\n", offset.c_str(), PMT.Entries[i].ES_Info_Length ); printf( "%s\t\tES Info Length\t\t%d\n", offset.c_str(), PMT.Entries[i].ES_Info_Length );
} }
printf( "%s\tCRC 32\t\t%X\n", offset.c_str(), PMT.CRC_32 ); printf( "%s\tCRC 32\t\t%8X\n", offset.c_str(), PMT.CRC_32 );
} }
/// Fills an AF structure with the right data /// Fills an AF structure with the right data