Mercurial > mxe-octave
annotate src/librtmp-1-v2.4.patch @ 3789:08eb76a22fa0
Update README.html for NSIS installer (bug #44215).
* installer-files/README.html: Add a little more text to README. Wrap long
lines to less than 80 chars.
author | Rik <rik@octave.org> |
---|---|
date | Sat, 14 Feb 2015 21:22:13 -0800 |
parents | 5136e4e6e487 |
children |
rev | line source |
---|---|
2586
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1 From 272a91d06d71c2a326996f62797ed9ab42f69859 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
3 Date: Wed, 30 Jun 2010 22:34:59 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
4 Subject: [PATCH 01/34] zlib dependency is only when CRYPTO is enabled |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
5 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
6 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@536 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
7 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
8 Makefile | 9 +++++---- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
9 librtmp/hashswf.c | 4 ++-- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
10 2 files changed, 7 insertions(+), 6 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
11 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
12 diff --git a/Makefile b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
13 index 7470eb4..c7767b4 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
14 --- a/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
15 +++ b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
16 @@ -11,9 +11,10 @@ SYS=posix |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
17 CRYPTO=OPENSSL |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
18 #CRYPTO=POLARSSL |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
19 #CRYPTO=GNUTLS |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
20 -LIB_GNUTLS=-lgnutls -lgcrypt |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
21 -LIB_OPENSSL=-lssl -lcrypto |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
22 -LIB_POLARSSL=-lpolarssl |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
23 +LIBZ=-lz |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
24 +LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
25 +LIB_OPENSSL=-lssl -lcrypto$ (LIBZ) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
26 +LIB_POLARSSL=-lpolarssl $(LIBZ) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
27 CRYPTO_LIB=$(LIB_$(CRYPTO)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
28 DEF_=-DNO_CRYPTO |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
29 CRYPTO_DEF=$(DEF_$(CRYPTO)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
30 @@ -33,7 +34,7 @@ MANDIR=$(DESTDIR)$(mandir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
31 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
32 LIBS_posix= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
33 LIBS_mingw=-lws2_32 -lwinmm -lgdi32 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
34 -LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
35 +LIBS=$(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
36 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
37 THREADLIB_posix=-lpthread |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
38 THREADLIB_mingw= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
39 diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
40 index 06d2bbb..277f21c 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
41 --- a/librtmp/hashswf.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
42 +++ b/librtmp/hashswf.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
43 @@ -66,10 +66,10 @@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
44 extern void RTMP_TLS_Init(); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
45 extern TLS_CTX RTMP_TLS_ctx; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
46 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
47 -#endif /* CRYPTO */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
48 - |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
49 #include <zlib.h> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
50 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
51 +#endif /* CRYPTO */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
52 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
53 #define AGENT "Mozilla/5.0" |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
54 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
55 HTTPResult |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
56 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
57 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
58 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
59 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
60 From 6556b9f9328acb1199dc1cc3f22fa82c86b51c8a Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
61 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
62 Date: Thu, 1 Jul 2010 12:00:43 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
63 Subject: [PATCH 02/34] Fix typo |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
64 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
65 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@537 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
66 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
67 Makefile | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
68 1 file changed, 1 insertion(+), 1 deletion(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
69 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
70 diff --git a/Makefile b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
71 index c7767b4..1fcdd78 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
72 --- a/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
73 +++ b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
74 @@ -13,7 +13,7 @@ CRYPTO=OPENSSL |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
75 #CRYPTO=GNUTLS |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
76 LIBZ=-lz |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
77 LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
78 -LIB_OPENSSL=-lssl -lcrypto$ (LIBZ) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
79 +LIB_OPENSSL=-lssl -lcrypto $(LIBZ) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
80 LIB_POLARSSL=-lpolarssl $(LIBZ) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
81 CRYPTO_LIB=$(LIB_$(CRYPTO)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
82 DEF_=-DNO_CRYPTO |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
83 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
84 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
85 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
86 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
87 From 8a5901c8a74280c898deb4ebf1a2f5d6f68bce42 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
88 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
89 Date: Sat, 3 Jul 2010 10:25:48 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
90 Subject: [PATCH 03/34] Document the escape coding used for special characters |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
91 in values |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
92 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
93 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@538 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
94 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
95 librtmp/librtmp.3 | 11 ++++++++--- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
96 1 file changed, 8 insertions(+), 3 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
97 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
98 diff --git a/librtmp/librtmp.3 b/librtmp/librtmp.3 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
99 index 055b52b..a5a7558 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
100 --- a/librtmp/librtmp.3 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
101 +++ b/librtmp/librtmp.3 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
102 @@ -57,14 +57,19 @@ The session handle is freed using |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
103 .BR RTMP_Free (). |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
104 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
105 All data is transferred using FLV format. The basic session requires |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
106 -an RTMP URL. Additional options may be specified by appending |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
107 -space-separated key=value pairs to the URL. The RTMP URL format |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
108 -is of the form |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
109 +an RTMP URL. The RTMP URL format is of the form |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
110 .nf |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
111 rtmp[t][e|s]://hostname[:port][/app[/playpath]] |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
112 .fi |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
113 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
114 Plain rtmp, as well as tunneled and encrypted sessions are supported. |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
115 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
116 +Additional options may be specified by appending space-separated |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
117 +key=value pairs to the URL. Special characters in values may need |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
118 +to be escaped to prevent misinterpretation by the option parser. |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
119 +The escape encoding uses a backslash followed by two hexadecimal digits |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
120 +representing the ASCII value of the character. E.g., spaces must |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
121 +be escaped as \fB\\20\fP and backslashes must be escaped as \fB\\5c\fP. |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
122 .SH OPTIONS |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
123 .SS "Network Parameters" |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
124 These options define how to connect to the media server. |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
125 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
126 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
127 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
128 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
129 From c41568f57bec297581e8508a7e6a3d1e470dc81d Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
130 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
131 Date: Sat, 3 Jul 2010 10:28:57 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
132 Subject: [PATCH 04/34] Update from prev commit |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
133 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
134 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@539 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
135 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
136 librtmp/librtmp.3 | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
137 librtmp/librtmp.3.html | 13 +++++++++---- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
138 2 files changed, 10 insertions(+), 5 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
139 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
140 diff --git a/librtmp/librtmp.3 b/librtmp/librtmp.3 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
141 index a5a7558..66197d5 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
142 --- a/librtmp/librtmp.3 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
143 +++ b/librtmp/librtmp.3 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
144 @@ -1,4 +1,4 @@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
145 -.TH LIBRTMP 3 "2010-05-29" "RTMPDump v2.2e" |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
146 +.TH LIBRTMP 3 "2010-07-03" "RTMPDump v2.3" |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
147 .\" Copyright 2010 Howard Chu. |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
148 .\" Copying permitted according to the GNU General Public License V2. |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
149 .SH NAME |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
150 diff --git a/librtmp/librtmp.3.html b/librtmp/librtmp.3.html |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
151 index daf636f..e5e6f4b 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
152 --- a/librtmp/librtmp.3.html |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
153 +++ b/librtmp/librtmp.3.html |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
154 @@ -6,7 +6,7 @@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
155 <tr><td>LIBRTMP(3)<td align="center"><td align="right">LIBRTMP(3) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
156 </thead> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
157 <tfoot> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
158 -<tr><td>RTMPDump v2.2e<td align="center">2010-05-29<td align="right">LIBRTMP(3) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
159 +<tr><td>RTMPDump v2.3<td align="center">2010-07-03<td align="right">LIBRTMP(3) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
160 </tfoot> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
161 <tbody><tr><td colspan="3"><br><br><ul> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
162 <!-- Copyright 2010 Howard Chu. |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
163 @@ -75,14 +75,19 @@ The session handle is freed using |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
164 <b>RTMP_Free</b>(). |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
165 <p> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
166 All data is transferred using FLV format. The basic session requires |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
167 -an RTMP URL. Additional options may be specified by appending |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
168 -space-separated key=value pairs to the URL. The RTMP URL format |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
169 -is of the form |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
170 +an RTMP URL. The RTMP URL format is of the form |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
171 <pre> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
172 rtmp[t][e|s]://hostname[:port][/app[/playpath]] |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
173 </pre> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
174 <p> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
175 Plain rtmp, as well as tunneled and encrypted sessions are supported. |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
176 +<p> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
177 +Additional options may be specified by appending space-separated |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
178 +key=value pairs to the URL. Special characters in values may need |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
179 +to be escaped to prevent misinterpretation by the option parser. |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
180 +The escape encoding uses a backslash followed by two hexadecimal digits |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
181 +representing the ASCII value of the character. E.g., spaces must |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
182 +be escaped as <b>\20</b> and backslashes must be escaped as <b>\5c</b>. |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
183 </ul> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
184 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
185 <h3>OPTIONS</h3><ul> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
186 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
187 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
188 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
189 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
190 From f1c4f0ed07659cbeae4ffaa78ca8cce7500afa58 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
191 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
192 Date: Mon, 5 Jul 2010 20:07:39 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
193 Subject: [PATCH 05/34] Hide strtime() |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
194 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
195 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@541 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
196 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
197 librtmp/hashswf.c | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
198 1 file changed, 1 insertion(+), 1 deletion(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
199 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
200 diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
201 index 277f21c..23e754b 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
202 --- a/librtmp/hashswf.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
203 +++ b/librtmp/hashswf.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
204 @@ -435,7 +435,7 @@ make_unix_time(char *s) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
205 /* Convert a Unix time to a network time string |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
206 * Weekday, DD-MMM-YYYY HH:MM:SS GMT |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
207 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
208 -void |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
209 +static void |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
210 strtime(time_t * t, char *s) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
211 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
212 struct tm *tm; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
213 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
214 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
215 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
216 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
217 From da78eba764eda23fb3bf9aa91bd6c5fee1839932 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
218 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
219 Date: Mon, 5 Jul 2010 20:16:55 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
220 Subject: [PATCH 06/34] Remove obsolete XBOX defs |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
221 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
222 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@542 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
223 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
224 librtmp/rtmp_sys.h | 11 ++++------- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
225 1 file changed, 4 insertions(+), 7 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
226 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
227 diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
228 index 0874cbe..6a3f215 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
229 --- a/librtmp/rtmp_sys.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
230 +++ b/librtmp/rtmp_sys.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
231 @@ -24,17 +24,14 @@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
232 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
233 #ifdef _WIN32 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
234 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
235 -#ifdef _XBOX |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
236 -#include <xtl.h> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
237 -#include <winsockx.h> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
238 +#include <winsock2.h> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
239 +#include <ws2tcpip.h> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
240 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
241 +#ifdef _MSC_VER /* MSVC */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
242 #define snprintf _snprintf |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
243 #define strcasecmp stricmp |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
244 #define strncasecmp strnicmp |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
245 #define vsnprintf _vsnprintf |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
246 - |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
247 -#else /* !_XBOX */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
248 -#include <winsock2.h> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
249 -#include <ws2tcpip.h> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
250 #endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
251 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
252 #define GetSockError() WSAGetLastError() |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
253 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
254 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
255 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
256 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
257 From eef87483b92036a1631c98c9c85dc3cae66411ee Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
258 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
259 Date: Mon, 5 Jul 2010 20:17:16 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
260 Subject: [PATCH 07/34] Update XBOX/XBMC support |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
261 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
262 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@543 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
263 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
264 librtmp/hashswf.c | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
265 1 file changed, 1 insertion(+), 1 deletion(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
266 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
267 diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
268 index 23e754b..3c56b69 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
269 --- a/librtmp/hashswf.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
270 +++ b/librtmp/hashswf.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
271 @@ -466,7 +466,7 @@ RTMP_HashSWF(const char *url, unsigned int *size, unsigned char *hash, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
272 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
273 date[0] = '\0'; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
274 #ifdef _WIN32 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
275 -#ifdef _XBOX |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
276 +#ifdef XBMC4XBOX |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
277 hpre.av_val = "Q:"; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
278 hpre.av_len = 2; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
279 home.av_val = "\\UserData"; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
280 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
281 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
282 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
283 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
284 From 24f7e724fc10d737a0f14c7741711b6b542c9d45 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
285 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
286 Date: Thu, 8 Jul 2010 10:38:33 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
287 Subject: [PATCH 08/34] Don't link explicitly against static library |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
288 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
289 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@544 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
290 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
291 Makefile | 27 +++++++++++++-------------- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
292 1 file changed, 13 insertions(+), 14 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
293 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
294 diff --git a/Makefile b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
295 index 1fcdd78..741e438 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
296 --- a/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
297 +++ b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
298 @@ -34,7 +34,7 @@ MANDIR=$(DESTDIR)$(mandir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
299 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
300 LIBS_posix= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
301 LIBS_mingw=-lws2_32 -lwinmm -lgdi32 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
302 -LIBS=$(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
303 +LIBS=-L librtmp -lrtmp $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
304 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
305 THREADLIB_posix=-lpthread |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
306 THREADLIB_mingw= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
307 @@ -48,9 +48,11 @@ EXT_posix= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
308 EXT_mingw=.exe |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
309 EXT=$(EXT_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
310 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
311 -all: $(LIBRTMP) progs |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
312 +PROGS=rtmpdump rtmpgw rtmpsrv rtmpsuck |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
313 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
314 -progs: rtmpdump rtmpgw rtmpsrv rtmpsuck |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
315 +all: $(LIBRTMP) $(PROGS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
316 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
317 +$(PROGS): $(LIBRTMP) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
318 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
319 install: progs |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
320 -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
321 @@ -69,20 +71,17 @@ FORCE: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
322 $(LIBRTMP): FORCE |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
323 @cd librtmp; $(MAKE) all |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
324 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
325 -# note: $^ is GNU Make's equivalent to BSD $> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
326 -# we use both since either make will ignore the one it doesn't recognize |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
327 - |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
328 -rtmpdump: rtmpdump.o $(LIBRTMP) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
329 - $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
330 +rtmpdump: rtmpdump.o |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
331 + $(CC) $(LDFLAGS) -o $@$(EXT) $@.o $(LIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
332 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
333 -rtmpsrv: rtmpsrv.o thread.o $(LIBRTMP) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
334 - $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
335 +rtmpsrv: rtmpsrv.o thread.o |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
336 + $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
337 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
338 -rtmpsuck: rtmpsuck.o thread.o $(LIBRTMP) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
339 - $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
340 +rtmpsuck: rtmpsuck.o thread.o |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
341 + $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
342 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
343 -rtmpgw: rtmpgw.o thread.o $(LIBRTMP) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
344 - $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
345 +rtmpgw: rtmpgw.o thread.o |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
346 + $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
347 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
348 rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
349 rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
350 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
351 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
352 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
353 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
354 From 5a3d6003a9745595583015c5b3b24e7bea818790 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
355 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
356 Date: Thu, 8 Jul 2010 11:11:47 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
357 Subject: [PATCH 09/34] Fix install target |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
358 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
359 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@545 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
360 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
361 Makefile | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
362 1 file changed, 1 insertion(+), 1 deletion(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
363 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
364 diff --git a/Makefile b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
365 index 741e438..75628dd 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
366 --- a/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
367 +++ b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
368 @@ -54,7 +54,7 @@ all: $(LIBRTMP) $(PROGS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
369 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
370 $(PROGS): $(LIBRTMP) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
371 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
372 -install: progs |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
373 +install: $(PROGS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
374 -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
375 cp rtmpdump$(EXT) $(BINDIR) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
376 cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
377 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
378 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
379 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
380 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
381 From 2340f0e27cd21d624d5f915fc42182750be6fca6 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
382 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
383 Date: Mon, 12 Jul 2010 08:20:04 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
384 Subject: [PATCH 10/34] MacOSX/Darwin shared library flags |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
385 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
386 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@546 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
387 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
388 Makefile | 3 +++ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
389 README | 6 +++++- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
390 librtmp/Makefile | 11 ++++++++++- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
391 3 files changed, 18 insertions(+), 2 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
392 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
393 diff --git a/Makefile b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
394 index 75628dd..fda3c74 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
395 --- a/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
396 +++ b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
397 @@ -33,10 +33,12 @@ SBINDIR=$(DESTDIR)$(sbindir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
398 MANDIR=$(DESTDIR)$(mandir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
399 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
400 LIBS_posix= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
401 +LIBS_darwin= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
402 LIBS_mingw=-lws2_32 -lwinmm -lgdi32 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
403 LIBS=-L librtmp -lrtmp $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
404 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
405 THREADLIB_posix=-lpthread |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
406 +THREADLIB_darwin=-lpthread |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
407 THREADLIB_mingw= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
408 THREADLIB=$(THREADLIB_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
409 SLIBS=$(THREADLIB) $(LIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
410 @@ -45,6 +47,7 @@ LIBRTMP=librtmp/librtmp.a |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
411 INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
412 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
413 EXT_posix= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
414 +EXT_darwin= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
415 EXT_mingw=.exe |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
416 EXT=$(EXT_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
417 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
418 diff --git a/README b/README |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
419 index 6607a1d..5689853 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
420 --- a/README |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
421 +++ b/README |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
422 @@ -10,7 +10,11 @@ To compile type "make" with SYS=<platform name>, e.g. |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
423 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
424 $ make SYS=posix |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
425 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
426 -for Linux, MacOSX, Unix, etc. or |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
427 +for Linux, Unix, etc. or |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
428 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
429 + $ make SYS=darwin |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
430 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
431 +for MacOSX or |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
432 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
433 $ make SYS=mingw |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
434 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
435 diff --git a/librtmp/Makefile b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
436 index 6774db7..2fd5869 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
437 --- a/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
438 +++ b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
439 @@ -17,6 +17,7 @@ REQ_GNUTLS=gnutls |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
440 REQ_OPENSSL=libssl,libcrypto |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
441 LIBZ=-lz |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
442 LIBS_posix= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
443 +LIBS_darwin= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
444 LIBS_mingw=-lws2_32 -lwinmm -lgdi32 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
445 LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
446 LIB_OPENSSL=-lssl -lcrypto $(LIBZ) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
447 @@ -26,9 +27,16 @@ CRYPTO_REQ=$(REQ_$(CRYPTO)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
448 CRYPTO_DEF=$(DEF_$(CRYPTO)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
449 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
450 SO_posix=so.0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
451 +SO_darwin=so.0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
452 SO_mingw=dll |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
453 SO_EXT=$(SO_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
454 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
455 +SO_LDFLAGS_posix=-shared -Wl,-soname,$@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
456 +SO_LDFLAGS_darwin=-bundle -flat_namespace -undefined suppress -fno-common \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
457 + -headerpad_max_install_names |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
458 +SO_LDFLAGS_mingw= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
459 +SO_LDFLAGS=$(SO_LDFLAGS_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
460 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
461 SHARED=yes |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
462 SODEF_yes=-fPIC |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
463 SOLIB_yes=librtmp.$(SO_EXT) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
464 @@ -40,6 +48,7 @@ SO_INST=$(SOINST_$(SHARED)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
465 DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
466 OPT=-O2 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
467 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
468 +LDFLAGS=$(XLDFLAGS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
469 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
470 incdir=$(prefix)/include/librtmp |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
471 bindir=$(prefix)/bin |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
472 @@ -61,7 +70,7 @@ librtmp.a: $(OBJS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
473 $(AR) rs $@ $? |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
474 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
475 librtmp.$(SO_EXT): $(OBJS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
476 - $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
477 + $(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
478 ln -sf $@ librtmp.so |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
479 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
480 log.o: log.c log.h Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
481 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
482 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
483 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
484 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
485 From 13798268e10fc8c56eecf5fce297375f7fca1526 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
486 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
487 Date: Mon, 9 Aug 2010 21:46:31 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
488 Subject: [PATCH 11/34] Fixes for Darwin - use dylib, not bundle for shared |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
489 lib |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
490 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
491 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@547 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
492 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
493 Makefile | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
494 librtmp/Makefile | 17 +++++++++++------ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
495 2 files changed, 12 insertions(+), 7 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
496 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
497 diff --git a/Makefile b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
498 index fda3c74..c322e9a 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
499 --- a/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
500 +++ b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
501 @@ -35,7 +35,7 @@ MANDIR=$(DESTDIR)$(mandir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
502 LIBS_posix= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
503 LIBS_darwin= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
504 LIBS_mingw=-lws2_32 -lwinmm -lgdi32 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
505 -LIBS=-L librtmp -lrtmp $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
506 +LIBS=-Llibrtmp -lrtmp $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
507 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
508 THREADLIB_posix=-lpthread |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
509 THREADLIB_darwin=-lpthread |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
510 diff --git a/librtmp/Makefile b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
511 index 2fd5869..a4bf67e 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
512 --- a/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
513 +++ b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
514 @@ -26,13 +26,14 @@ CRYPTO_LIB=$(LIB_$(CRYPTO)) $(LIBS_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
515 CRYPTO_REQ=$(REQ_$(CRYPTO)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
516 CRYPTO_DEF=$(DEF_$(CRYPTO)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
517 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
518 -SO_posix=so.0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
519 -SO_darwin=so.0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
520 +SO_VERSION=0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
521 +SO_posix=so.$(SO_VERSION) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
522 +SO_darwin=$(SO_VERSION).dylib |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
523 SO_mingw=dll |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
524 SO_EXT=$(SO_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
525 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
526 SO_LDFLAGS_posix=-shared -Wl,-soname,$@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
527 -SO_LDFLAGS_darwin=-bundle -flat_namespace -undefined suppress -fno-common \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
528 +SO_LDFLAGS_darwin=-dynamiclib -flat_namespace -undefined suppress -fno-common \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
529 -headerpad_max_install_names |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
530 SO_LDFLAGS_mingw= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
531 SO_LDFLAGS=$(SO_LDFLAGS_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
532 @@ -92,9 +93,13 @@ install_base: librtmp.a librtmp.pc |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
533 cp librtmp.pc $(LIBDIR)/pkgconfig |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
534 cp librtmp.3 $(MANDIR)/man3 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
535 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
536 -install_so.0: librtmp.so.0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
537 - cp librtmp.so.0 $(LIBDIR) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
538 - cd $(LIBDIR); ln -sf librtmp.so.0 librtmp.so |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
539 +install_so.$(SO_VERSION): librtmp.$(SO_EXT) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
540 + cp librtmp.$(SO_EXT) $(LIBDIR) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
541 + cd $(LIBDIR); ln -sf librtmp.$(SO_EXT) librtmp.so |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
542 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
543 +install_$(SO_VERSION).dylib: librtmp.$(SO_EXT) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
544 + cp librtmp.$(SO_EXT) $(LIBDIR) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
545 + cd $(LIBDIR); ln -sf librtmp.$(SO_EXT) librtmp.dylib |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
546 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
547 install_dll: librtmp.dll |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
548 cp librtmp.dll $(BINDIR) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
549 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
550 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
551 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
552 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
553 From eb806247dc8eab25d8a675a4f633d3feaf2b2045 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
554 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
555 Date: Tue, 10 Aug 2010 06:41:50 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
556 Subject: [PATCH 12/34] More dynlib tweaks |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
557 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
558 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@548 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
559 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
560 librtmp/Makefile | 48 ++++++++++++++++++++++++++---------------------- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
561 1 file changed, 26 insertions(+), 22 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
562 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
563 diff --git a/librtmp/Makefile b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
564 index a4bf67e..6a1b08b 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
565 --- a/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
566 +++ b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
567 @@ -2,6 +2,15 @@ VERSION=v2.3 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
568 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
569 prefix=/usr/local |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
570 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
571 +incdir=$(prefix)/include/librtmp |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
572 +bindir=$(prefix)/bin |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
573 +libdir=$(prefix)/lib |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
574 +mandir=$(prefix)/man |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
575 +BINDIR=$(DESTDIR)$(bindir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
576 +INCDIR=$(DESTDIR)$(incdir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
577 +LIBDIR=$(DESTDIR)$(libdir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
578 +MANDIR=$(DESTDIR)$(mandir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
579 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
580 CC=$(CROSS_COMPILE)gcc |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
581 LD=$(CROSS_COMPILE)ld |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
582 AR=$(CROSS_COMPILE)ar |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
583 @@ -27,11 +36,20 @@ CRYPTO_REQ=$(REQ_$(CRYPTO)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
584 CRYPTO_DEF=$(DEF_$(CRYPTO)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
585 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
586 SO_VERSION=0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
587 -SO_posix=so.$(SO_VERSION) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
588 -SO_darwin=$(SO_VERSION).dylib |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
589 +SOX_posix=so |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
590 +SOX_darwin=dylib |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
591 +SOX_mingw=so # useless |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
592 +SOX=$(SOX_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
593 +SO_posix=$(SOX).$(SO_VERSION) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
594 +SO_darwin=$(SO_VERSION).$(SOX) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
595 SO_mingw=dll |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
596 SO_EXT=$(SO_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
597 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
598 +SODIR_posix=$(LIBDIR) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
599 +SODIR_darwin=$(LIBDIR) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
600 +SODIR_mingw=$(BINDIR) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
601 +SODIR=$(SODIR_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
602 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
603 SO_LDFLAGS_posix=-shared -Wl,-soname,$@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
604 SO_LDFLAGS_darwin=-dynamiclib -flat_namespace -undefined suppress -fno-common \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
605 -headerpad_max_install_names |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
606 @@ -41,7 +59,7 @@ SO_LDFLAGS=$(SO_LDFLAGS_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
607 SHARED=yes |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
608 SODEF_yes=-fPIC |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
609 SOLIB_yes=librtmp.$(SO_EXT) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
610 -SOINST_yes=install_$(SO_EXT) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
611 +SOINST_yes=install_so |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
612 SO_DEF=$(SODEF_$(SHARED)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
613 SO_LIB=$(SOLIB_$(SHARED)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
614 SO_INST=$(SOINST_$(SHARED)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
615 @@ -51,28 +69,20 @@ OPT=-O2 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
616 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
617 LDFLAGS=$(XLDFLAGS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
618 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
619 -incdir=$(prefix)/include/librtmp |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
620 -bindir=$(prefix)/bin |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
621 -libdir=$(prefix)/lib |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
622 -mandir=$(prefix)/man |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
623 -BINDIR=$(DESTDIR)$(bindir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
624 -INCDIR=$(DESTDIR)$(incdir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
625 -LIBDIR=$(DESTDIR)$(libdir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
626 -MANDIR=$(DESTDIR)$(mandir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
627 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
628 OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
629 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
630 all: librtmp.a $(SO_LIB) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
631 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
632 clean: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
633 - rm -f *.o *.a *.so *.$(SO_EXT) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
634 + rm -f *.o *.a *.$(SOX) *.$(SO_EXT) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
635 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
636 librtmp.a: $(OBJS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
637 $(AR) rs $@ $? |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
638 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
639 librtmp.$(SO_EXT): $(OBJS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
640 $(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
641 - ln -sf $@ librtmp.so |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
642 + ln -sf $@ librtmp.$(SOX) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
643 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
644 log.o: log.c log.h Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
645 rtmp.o: rtmp.c rtmp.h rtmp_sys.h handshake.h dh.h log.h amf.h Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
646 @@ -93,13 +103,7 @@ install_base: librtmp.a librtmp.pc |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
647 cp librtmp.pc $(LIBDIR)/pkgconfig |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
648 cp librtmp.3 $(MANDIR)/man3 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
649 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
650 -install_so.$(SO_VERSION): librtmp.$(SO_EXT) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
651 - cp librtmp.$(SO_EXT) $(LIBDIR) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
652 - cd $(LIBDIR); ln -sf librtmp.$(SO_EXT) librtmp.so |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
653 - |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
654 -install_$(SO_VERSION).dylib: librtmp.$(SO_EXT) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
655 - cp librtmp.$(SO_EXT) $(LIBDIR) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
656 - cd $(LIBDIR); ln -sf librtmp.$(SO_EXT) librtmp.dylib |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
657 +install_so: librtmp.$(SO_EXT) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
658 + cp librtmp.$(SO_EXT) $(SODIR) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
659 + cd $(SODIR); ln -sf librtmp.$(SO_EXT) librtmp.$(SOX) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
660 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
661 -install_dll: librtmp.dll |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
662 - cp librtmp.dll $(BINDIR) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
663 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
664 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
665 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
666 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
667 From 08bdebed5423602d195fa981b3f2663e62820677 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
668 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
669 Date: Fri, 13 Aug 2010 20:05:35 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
670 Subject: [PATCH 13/34] Substitute libdir in pkgconfig file |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
671 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
672 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@549 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
673 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
674 librtmp/Makefile | 3 ++- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
675 librtmp/librtmp.pc.in | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
676 2 files changed, 3 insertions(+), 2 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
677 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
678 diff --git a/librtmp/Makefile b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
679 index 6a1b08b..7cba62a 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
680 --- a/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
681 +++ b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
682 @@ -91,7 +91,8 @@ hashswf.o: hashswf.c http.h rtmp.h rtmp_sys.h Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
683 parseurl.o: parseurl.c rtmp.h rtmp_sys.h log.h Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
684 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
685 librtmp.pc: librtmp.pc.in Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
686 - sed -e "s;@prefix@;$(prefix);" -e "s;@VERSION@;$(VERSION);" \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
687 + sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
688 + -e "s;@VERSION@;$(VERSION);" \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
689 -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" librtmp.pc.in > $@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
690 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
691 install: install_base $(SO_INST) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
692 diff --git a/librtmp/librtmp.pc.in b/librtmp/librtmp.pc.in |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
693 index d58e269..70bd268 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
694 --- a/librtmp/librtmp.pc.in |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
695 +++ b/librtmp/librtmp.pc.in |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
696 @@ -1,6 +1,6 @@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
697 prefix=@prefix@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
698 exec_prefix=${prefix} |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
699 -libdir=${exec_prefix}/lib |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
700 +libdir=@libdir@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
701 incdir=${prefix}/include |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
702 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
703 Name: librtmp |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
704 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
705 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
706 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
707 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
708 From 59ca19036ed45667b08d98f09e4d4a7a727b77b3 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
709 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
710 Date: Fri, 13 Aug 2010 20:34:58 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
711 Subject: [PATCH 14/34] Less case-sensitive check for Content-length: header |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
712 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
713 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@550 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
714 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
715 librtmp/rtmp.c | 8 ++++++-- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
716 1 file changed, 6 insertions(+), 2 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
717 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
718 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
719 index f152648..5c678fd 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
720 --- a/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
721 +++ b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
722 @@ -3664,11 +3664,15 @@ HTTP_read(RTMP *r, int fill) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
723 return -1; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
724 if (strncmp(r->m_sb.sb_start, "HTTP/1.1 200 ", 13)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
725 return -1; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
726 - ptr = strstr(r->m_sb.sb_start, "Content-Length:"); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
727 + ptr = r->m_sb.sb_start + sizeof("HTTP/1.1 200"); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
728 + while ((ptr = strstr(ptr, "Content-"))) { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
729 + if (!strncasecmp(ptr+8, "length:", 7)) break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
730 + ptr += 8; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
731 + } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
732 if (!ptr) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
733 return -1; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
734 hlen = atoi(ptr+16); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
735 - ptr = strstr(ptr, "\r\n\r\n"); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
736 + ptr = strstr(ptr+16, "\r\n\r\n"); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
737 if (!ptr) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
738 return -1; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
739 ptr += 4; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
740 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
741 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
742 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
743 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
744 From 8afb3681407a0a83dcb1fec449b83854da440738 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
745 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
746 Date: Fri, 8 Oct 2010 07:45:54 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
747 Subject: [PATCH 15/34] Log error message for unsupported SWF Verification |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
748 types |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
749 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
750 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@551 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
751 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
752 librtmp/rtmp.c | 8 +++++++- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
753 1 file changed, 7 insertions(+), 1 deletion(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
754 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
755 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
756 index 5c678fd..3e4e00a 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
757 --- a/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
758 +++ b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
759 @@ -2789,11 +2789,17 @@ HandleCtrl(RTMP *r, const RTMPPacket *packet) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
760 if (nType == 0x1A) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
761 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
762 RTMP_Log(RTMP_LOGDEBUG, "%s, SWFVerification ping received: ", __FUNCTION__); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
763 + if (packet->m_nBodySize > 2 && packet->m_body[2] > 0x01) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
764 + { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
765 + RTMP_Log(RTMP_LOGERROR, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
766 + "%s: SWFVerification Type %d request not supported! Patches welcome...", |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
767 + __FUNCTION__, packet->m_body[2]); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
768 + } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
769 #ifdef CRYPTO |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
770 /*RTMP_LogHex(packet.m_body, packet.m_nBodySize); */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
771 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
772 /* respond with HMAC SHA256 of decompressed SWF, key is the 30byte player key, also the last 30 bytes of the server handshake are applied */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
773 - if (r->Link.SWFSize) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
774 + else if (r->Link.SWFSize) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
775 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
776 RTMP_SendCtrl(r, 0x1B, 0, 0); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
777 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
778 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
779 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
780 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
781 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
782 From 9ca7e22d94c6e07e8ef05acbf636809a5914f50c Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
783 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
784 Date: Tue, 26 Oct 2010 23:51:10 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
785 Subject: [PATCH 16/34] Timeout fix from Antti Ajanki |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
786 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
787 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@552 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
788 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
789 librtmp/rtmp.c | 3 +++ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
790 rtmpdump.c | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
791 2 files changed, 4 insertions(+), 1 deletion(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
792 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
793 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
794 index 3e4e00a..db882dc 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
795 --- a/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
796 +++ b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
797 @@ -1019,6 +1019,9 @@ RTMP_ToggleStream(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
798 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
799 if (!r->m_pausing) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
800 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
801 + if (RTMP_IsTimedout(r) && r->m_read.status == RTMP_READ_EOF) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
802 + r->m_read.status = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
803 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
804 res = RTMP_SendPause(r, TRUE, r->m_pauseStamp); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
805 if (!res) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
806 return res; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
807 diff --git a/rtmpdump.c b/rtmpdump.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
808 index 7aa19ab..c1cd95b 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
809 --- a/rtmpdump.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
810 +++ b/rtmpdump.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
811 @@ -583,7 +583,7 @@ Download(RTMP * rtmp, // connected RTMP object |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
812 #endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
813 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
814 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
815 - while (!RTMP_ctrlC && nRead > -1 && RTMP_IsConnected(rtmp)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
816 + while (!RTMP_ctrlC && nRead > -1 && RTMP_IsConnected(rtmp) && !RTMP_IsTimedout(rtmp)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
817 free(buffer); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
818 if (nRead < 0) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
819 nRead = rtmp->m_read.status; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
820 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
821 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
822 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
823 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
824 From 1379a2c0d22f238d97970a7e7420287a9bd794de Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
825 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
826 Date: Fri, 24 Dec 2010 22:35:35 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
827 Subject: [PATCH 17/34] Fix infinite loop on Error/Close |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
828 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
829 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@554 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
830 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
831 librtmp/rtmp.c | 4 ++-- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
832 1 file changed, 2 insertions(+), 2 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
833 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
834 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
835 index db882dc..e6e8ed8 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
836 --- a/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
837 +++ b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
838 @@ -3395,10 +3395,10 @@ RTMP_Close(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
839 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
840 if (r->m_stream_id > 0) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
841 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
842 - if ((r->Link.protocol & RTMP_FEATURE_WRITE)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
843 - SendFCUnpublish(r); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
844 i = r->m_stream_id; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
845 r->m_stream_id = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
846 + if ((r->Link.protocol & RTMP_FEATURE_WRITE)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
847 + SendFCUnpublish(r); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
848 SendDeleteStream(r, i); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
849 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
850 if (r->m_clientID.av_val) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
851 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
852 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
853 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
854 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
855 From 8c713f4c5c8e72369b48d15772e19d1c9ebd5a19 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
856 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
857 Date: Fri, 25 Feb 2011 05:51:40 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
858 Subject: [PATCH 18/34] Fix FLV timestamps during resume |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
859 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
860 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@557 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
861 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
862 librtmp/rtmp.c | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
863 1 file changed, 1 insertion(+), 1 deletion(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
864 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
865 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
866 index e6e8ed8..e2925a7 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
867 --- a/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
868 +++ b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
869 @@ -4083,7 +4083,7 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
870 /* grab first timestamp and see if it needs fixing */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
871 nTimeStamp = AMF_DecodeInt24(packetBody + 4); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
872 nTimeStamp |= (packetBody[7] << 24); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
873 - delta = packet.m_nTimeStamp - nTimeStamp; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
874 + delta = packet.m_nTimeStamp - nTimeStamp + r->m_read.nResumeTS; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
875 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
876 while (pos + 11 < nPacketLen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
877 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
878 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
879 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
880 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
881 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
882 From bca1ef01727cac659f7ac171c791490efe4e48d6 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
883 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
884 Date: Thu, 10 Mar 2011 14:30:06 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
885 Subject: [PATCH 19/34] Add Libs.private to pkgconfig for Windows |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
886 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
887 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@558 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
888 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
889 librtmp/Makefile | 6 ++++-- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
890 librtmp/librtmp.pc.in | 1 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
891 2 files changed, 5 insertions(+), 2 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
892 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
893 diff --git a/librtmp/Makefile b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
894 index 7cba62a..87618af 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
895 --- a/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
896 +++ b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
897 @@ -31,7 +31,8 @@ LIBS_mingw=-lws2_32 -lwinmm -lgdi32 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
898 LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
899 LIB_OPENSSL=-lssl -lcrypto $(LIBZ) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
900 LIB_POLARSSL=-lpolarssl $(LIBZ) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
901 -CRYPTO_LIB=$(LIB_$(CRYPTO)) $(LIBS_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
902 +PRIVATE_LIBS=$(LIBS_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
903 +CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
904 CRYPTO_REQ=$(REQ_$(CRYPTO)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
905 CRYPTO_DEF=$(DEF_$(CRYPTO)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
906 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
907 @@ -93,7 +94,8 @@ parseurl.o: parseurl.c rtmp.h rtmp_sys.h log.h Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
908 librtmp.pc: librtmp.pc.in Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
909 sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
910 -e "s;@VERSION@;$(VERSION);" \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
911 - -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" librtmp.pc.in > $@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
912 + -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
913 + -e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS));" librtmp.pc.in > $@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
914 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
915 install: install_base $(SO_INST) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
916 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
917 diff --git a/librtmp/librtmp.pc.in b/librtmp/librtmp.pc.in |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
918 index 70bd268..5933ca1 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
919 --- a/librtmp/librtmp.pc.in |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
920 +++ b/librtmp/librtmp.pc.in |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
921 @@ -9,4 +9,5 @@ Version: @VERSION@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
922 Requires: @CRYPTO_REQ@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
923 URL: http://rtmpdump.mplayerhq.hu |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
924 Libs: -L${libdir} -lrtmp -lz |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
925 +Libs.private; @PRIVATE_LIBS@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
926 Cflags: -I${incdir} |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
927 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
928 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
929 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
930 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
931 From 25447a0f675cc6e9eefc8eb420ad3a2725be8ab1 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
932 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
933 Date: Thu, 10 Mar 2011 14:33:32 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
934 Subject: [PATCH 20/34] Fix typos in prev commit |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
935 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
936 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@559 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
937 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
938 librtmp/Makefile | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
939 librtmp/librtmp.pc.in | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
940 2 files changed, 2 insertions(+), 2 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
941 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
942 diff --git a/librtmp/Makefile b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
943 index 87618af..1ea31a0 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
944 --- a/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
945 +++ b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
946 @@ -95,7 +95,7 @@ librtmp.pc: librtmp.pc.in Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
947 sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
948 -e "s;@VERSION@;$(VERSION);" \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
949 -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
950 - -e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS));" librtmp.pc.in > $@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
951 + -e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
952 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
953 install: install_base $(SO_INST) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
954 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
955 diff --git a/librtmp/librtmp.pc.in b/librtmp/librtmp.pc.in |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
956 index 5933ca1..a82beca 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
957 --- a/librtmp/librtmp.pc.in |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
958 +++ b/librtmp/librtmp.pc.in |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
959 @@ -9,5 +9,5 @@ Version: @VERSION@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
960 Requires: @CRYPTO_REQ@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
961 URL: http://rtmpdump.mplayerhq.hu |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
962 Libs: -L${libdir} -lrtmp -lz |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
963 -Libs.private; @PRIVATE_LIBS@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
964 +Libs.private: @PRIVATE_LIBS@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
965 Cflags: -I${incdir} |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
966 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
967 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
968 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
969 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
970 From 0a219ffeeb0094111fd00c509fce3ddd6eba2de2 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
971 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
972 Date: Mon, 14 Mar 2011 06:48:09 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
973 Subject: [PATCH 21/34] Bump up play command buffer sizes |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
974 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
975 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@560 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
976 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
977 rtmpsrv.c | 4 ++-- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
978 1 file changed, 2 insertions(+), 2 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
979 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
980 diff --git a/rtmpsrv.c b/rtmpsrv.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
981 index f2af85b..4d5699f 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
982 --- a/rtmpsrv.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
983 +++ b/rtmpsrv.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
984 @@ -266,7 +266,7 @@ static int |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
985 SendPlayStart(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
986 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
987 RTMPPacket packet; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
988 - char pbuf[384], *pend = pbuf+sizeof(pbuf); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
989 + char pbuf[512], *pend = pbuf+sizeof(pbuf); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
990 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
991 packet.m_nChannel = 0x03; // control channel (invoke) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
992 packet.m_headerType = 1; /* RTMP_PACKET_SIZE_MEDIUM; */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
993 @@ -298,7 +298,7 @@ static int |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
994 SendPlayStop(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
995 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
996 RTMPPacket packet; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
997 - char pbuf[384], *pend = pbuf+sizeof(pbuf); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
998 + char pbuf[512], *pend = pbuf+sizeof(pbuf); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
999 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1000 packet.m_nChannel = 0x03; // control channel (invoke) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1001 packet.m_headerType = 1; /* RTMP_PACKET_SIZE_MEDIUM; */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1002 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1003 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1004 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1005 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1006 From a1bcab1da064cca8a534d26970333220b57a72f0 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1007 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1008 Date: Wed, 16 Mar 2011 12:11:21 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1009 Subject: [PATCH 22/34] Fix rtmpt read hangs |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1010 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1011 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@561 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1012 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1013 librtmp/rtmp.c | 17 ++++++++++++++--- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1014 1 file changed, 14 insertions(+), 3 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1015 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1016 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1017 index e2925a7..3042c7f 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1018 --- a/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1019 +++ b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1020 @@ -877,7 +877,13 @@ RTMP_Connect1(RTMP *r, RTMPPacket *cp) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1021 r->m_clientID.av_val = NULL; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1022 r->m_clientID.av_len = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1023 HTTP_Post(r, RTMPT_OPEN, "", 1); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1024 - HTTP_read(r, 1); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1025 + if (HTTP_read(r, 1) != 0) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1026 + { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1027 + r->m_msgCounter = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1028 + RTMP_Log(RTMP_LOGDEBUG, "%s, Could not connect for handshake", __FUNCTION__); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1029 + RTMP_Close(r); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1030 + return 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1031 + } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1032 r->m_msgCounter = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1033 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1034 RTMP_Log(RTMP_LOGDEBUG, "%s, ... connected, handshaking", __FUNCTION__); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1035 @@ -1284,7 +1290,12 @@ ReadN(RTMP *r, char *buffer, int n) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1036 return 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1037 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1038 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1039 - HTTP_read(r, 0); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1040 + if (HTTP_read(r, 0) == -1) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1041 + { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1042 + RTMP_Log(RTMP_LOGDEBUG, "%s, No valid HTTP response found", __FUNCTION__); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1043 + RTMP_Close(r); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1044 + return 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1045 + } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1046 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1047 if (r->m_resplen && !r->m_sb.sb_size) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1048 RTMPSockBuf_Fill(&r->m_sb); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1049 @@ -3670,7 +3681,7 @@ HTTP_read(RTMP *r, int fill) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1050 if (fill) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1051 RTMPSockBuf_Fill(&r->m_sb); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1052 if (r->m_sb.sb_size < 144) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1053 - return -1; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1054 + return -2; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1055 if (strncmp(r->m_sb.sb_start, "HTTP/1.1 200 ", 13)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1056 return -1; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1057 ptr = r->m_sb.sb_start + sizeof("HTTP/1.1 200"); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1058 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1059 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1060 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1061 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1062 From aa2825fbb1d1f70652d558a730baed28149ebbdd Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1063 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1064 Date: Sat, 19 Mar 2011 23:32:53 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1065 Subject: [PATCH 23/34] Drop back on the handshake version, avoid rtmpe 9 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1066 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1067 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@562 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1068 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1069 librtmp/handshake.h | 6 ++++-- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1070 1 file changed, 4 insertions(+), 2 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1071 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1072 diff --git a/librtmp/handshake.h b/librtmp/handshake.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1073 index 958579a..d4d2913 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1074 --- a/librtmp/handshake.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1075 +++ b/librtmp/handshake.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1076 @@ -400,8 +400,10 @@ HandShake(RTMP * r, int FP9HandShake) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1077 /* set version to at least 9.0.115.0 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1078 if (encrypted) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1079 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1080 - clientsig[4] = 128; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1081 - clientsig[6] = 3; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1082 +/* clientsig[4] = 128; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1083 + clientsig[6] = 3; */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1084 + clientsig[4] = 0x7c; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1085 + clientsig[6] = 0x2; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1086 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1087 else |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1088 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1089 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1090 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1091 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1092 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1093 From ac1843db901184bef349615e3b67d7d2fcebdb7f Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1094 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1095 Date: Tue, 22 Mar 2011 15:13:18 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1096 Subject: [PATCH 24/34] Fix prev commit |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1097 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1098 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@563 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1099 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1100 librtmp/handshake.h | 4 ++-- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1101 1 file changed, 2 insertions(+), 2 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1102 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1103 diff --git a/librtmp/handshake.h b/librtmp/handshake.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1104 index d4d2913..b172dbf 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1105 --- a/librtmp/handshake.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1106 +++ b/librtmp/handshake.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1107 @@ -402,8 +402,8 @@ HandShake(RTMP * r, int FP9HandShake) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1108 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1109 /* clientsig[4] = 128; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1110 clientsig[6] = 3; */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1111 - clientsig[4] = 0x7c; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1112 - clientsig[6] = 0x2; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1113 + clientsig[4] = 9; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1114 + clientsig[6] = 0x7c; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1115 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1116 else |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1117 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1118 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1119 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1120 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1121 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1122 From 495e1e64106f10a7a1c15f0e2f870a02aa90605c Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1123 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1124 Date: Thu, 7 Apr 2011 19:07:31 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1125 Subject: [PATCH 25/34] Handle Play.PublishNotify like Play.Start |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1126 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1127 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@566 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1128 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1129 librtmp/rtmp.c | 5 ++++- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1130 1 file changed, 4 insertions(+), 1 deletion(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1131 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1132 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1133 index 3042c7f..286b6ae 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1134 --- a/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1135 +++ b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1136 @@ -2282,6 +2282,8 @@ static const AVal av_NetStream_Play_Complete = AVC("NetStream.Play.Complete"); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1137 static const AVal av_NetStream_Play_Stop = AVC("NetStream.Play.Stop"); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1138 static const AVal av_NetStream_Seek_Notify = AVC("NetStream.Seek.Notify"); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1139 static const AVal av_NetStream_Pause_Notify = AVC("NetStream.Pause.Notify"); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1140 +static const AVal av_NetStream_Play_PublishNotify = |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1141 +AVC("NetStream.Play.PublishNotify"); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1142 static const AVal av_NetStream_Play_UnpublishNotify = |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1143 AVC("NetStream.Play.UnpublishNotify"); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1144 static const AVal av_NetStream_Publish_Start = AVC("NetStream.Publish.Start"); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1145 @@ -2449,7 +2451,8 @@ HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1146 RTMP_Log(RTMP_LOGERROR, "Closing connection: %s", code.av_val); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1147 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1148 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1149 - else if (AVMATCH(&code, &av_NetStream_Play_Start)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1150 + else if (AVMATCH(&code, &av_NetStream_Play_Start) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1151 + || AVMATCH(&code, &av_NetStream_Play_PublishNotify)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1152 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1153 int i; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1154 r->m_bPlaying = TRUE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1155 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1156 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1157 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1158 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1159 From 041cf3f2c927b26dc4b27b5e802fbb89362ea3e2 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1160 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1161 Date: Thu, 7 Apr 2011 19:11:13 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1162 Subject: [PATCH 26/34] Handle multiple sessions at once (ugly) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1163 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1164 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@567 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1165 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1166 rtmpsuck.c | 13 ++++++++----- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1167 1 file changed, 8 insertions(+), 5 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1168 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1169 diff --git a/rtmpsuck.c b/rtmpsuck.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1170 index ce6d879..3293e8b 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1171 --- a/rtmpsuck.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1172 +++ b/rtmpsuck.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1173 @@ -718,15 +718,15 @@ controlServerThread(void *unused) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1174 TFRET(); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1175 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1176 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1177 -void doServe(STREAMING_SERVER * server, // server socket and state (our listening socket) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1178 - int sockfd // client connection socket |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1179 - ) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1180 +TFTYPE doServe(void *arg) // server socket and state (our listening socket) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1181 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1182 + STREAMING_SERVER *server = arg; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1183 RTMPPacket pc = { 0 }, ps = { 0 }; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1184 RTMPChunk rk = { 0 }; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1185 char *buf = NULL; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1186 unsigned int buflen = 131072; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1187 int paused = FALSE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1188 + int sockfd = server->socket; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1189 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1190 // timeout for http requests |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1191 fd_set rfds; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1192 @@ -990,7 +990,7 @@ quit: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1193 if (server->state == STREAMING_IN_PROGRESS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1194 server->state = STREAMING_ACCEPTING; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1195 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1196 - return; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1197 + TFRET(); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1198 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1199 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1200 TFTYPE |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1201 @@ -1003,6 +1003,7 @@ serverThread(void *arg) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1202 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1203 struct sockaddr_in addr; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1204 socklen_t addrlen = sizeof(struct sockaddr_in); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1205 + STREAMING_SERVER *srv2 = malloc(sizeof(STREAMING_SERVER)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1206 int sockfd = |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1207 accept(server->socket, (struct sockaddr *) &addr, &addrlen); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1208 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1209 @@ -1020,8 +1021,10 @@ serverThread(void *arg) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1210 RTMP_Log(RTMP_LOGDEBUG, "%s: accepted connection from %s\n", __FUNCTION__, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1211 inet_ntoa(addr.sin_addr)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1212 #endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1213 + *srv2 = *server; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1214 + srv2->socket = sockfd; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1215 /* Create a new thread and transfer the control to that */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1216 - doServe(server, sockfd); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1217 + ThreadCreate(doServe, srv2); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1218 RTMP_Log(RTMP_LOGDEBUG, "%s: processed request\n", __FUNCTION__); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1219 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1220 else |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1221 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1222 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1223 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1224 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1225 From 6155179b296f9749f713bb9bf47e9ca1fdb1a201 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1226 From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1227 Date: Thu, 7 Apr 2011 19:33:28 +0000 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1228 Subject: [PATCH 27/34] Use symbolic constants for packet types. From Peter |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1229 Miller @ opensource.org.au |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1230 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1231 git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@568 400ebc74-4327-4243-bc38-086b20814532 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1232 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1233 librtmp/rtmp.c | 132 ++++++++++++++++++++++++++++++-------------------------- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1234 librtmp/rtmp.h | 26 +++++++++-- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1235 rtmpsrv.c | 8 ++-- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1236 rtmpsuck.c | 112 ++++++++++++++++++++++++++--------------------- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1237 4 files changed, 161 insertions(+), 117 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1238 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1239 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1240 index 286b6ae..5ef3ae9 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1241 --- a/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1242 +++ b/librtmp/rtmp.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1243 @@ -1103,32 +1103,32 @@ RTMP_ClientPacket(RTMP *r, RTMPPacket *packet) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1244 int bHasMediaPacket = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1245 switch (packet->m_packetType) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1246 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1247 - case 0x01: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1248 + case RTMP_PACKET_TYPE_CHUNK_SIZE: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1249 /* chunk size */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1250 HandleChangeChunkSize(r, packet); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1251 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1252 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1253 - case 0x03: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1254 + case RTMP_PACKET_TYPE_BYTES_READ_REPORT: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1255 /* bytes read report */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1256 RTMP_Log(RTMP_LOGDEBUG, "%s, received: bytes read report", __FUNCTION__); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1257 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1258 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1259 - case 0x04: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1260 + case RTMP_PACKET_TYPE_CONTROL: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1261 /* ctrl */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1262 HandleCtrl(r, packet); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1263 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1264 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1265 - case 0x05: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1266 + case RTMP_PACKET_TYPE_SERVER_BW: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1267 /* server bw */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1268 HandleServerBW(r, packet); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1269 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1270 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1271 - case 0x06: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1272 + case RTMP_PACKET_TYPE_CLIENT_BW: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1273 /* client bw */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1274 HandleClientBW(r, packet); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1275 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1276 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1277 - case 0x08: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1278 + case RTMP_PACKET_TYPE_AUDIO: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1279 /* audio data */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1280 /*RTMP_Log(RTMP_LOGDEBUG, "%s, received: audio %lu bytes", __FUNCTION__, packet.m_nBodySize); */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1281 HandleAudio(r, packet); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1282 @@ -1139,7 +1139,7 @@ RTMP_ClientPacket(RTMP *r, RTMPPacket *packet) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1283 r->m_mediaStamp = packet->m_nTimeStamp; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1284 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1285 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1286 - case 0x09: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1287 + case RTMP_PACKET_TYPE_VIDEO: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1288 /* video data */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1289 /*RTMP_Log(RTMP_LOGDEBUG, "%s, received: video %lu bytes", __FUNCTION__, packet.m_nBodySize); */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1290 HandleVideo(r, packet); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1291 @@ -1150,19 +1150,22 @@ RTMP_ClientPacket(RTMP *r, RTMPPacket *packet) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1292 r->m_mediaStamp = packet->m_nTimeStamp; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1293 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1294 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1295 - case 0x0F: /* flex stream send */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1296 + case RTMP_PACKET_TYPE_FLEX_STREAM_SEND: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1297 + /* flex stream send */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1298 RTMP_Log(RTMP_LOGDEBUG, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1299 "%s, flex stream send, size %lu bytes, not supported, ignoring", |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1300 __FUNCTION__, packet->m_nBodySize); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1301 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1302 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1303 - case 0x10: /* flex shared object */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1304 + case RTMP_PACKET_TYPE_FLEX_SHARED_OBJECT: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1305 + /* flex shared object */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1306 RTMP_Log(RTMP_LOGDEBUG, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1307 "%s, flex shared object, size %lu bytes, not supported, ignoring", |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1308 __FUNCTION__, packet->m_nBodySize); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1309 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1310 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1311 - case 0x11: /* flex message */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1312 + case RTMP_PACKET_TYPE_FLEX_MESSAGE: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1313 + /* flex message */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1314 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1315 RTMP_Log(RTMP_LOGDEBUG, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1316 "%s, flex message, size %lu bytes, not fully supported", |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1317 @@ -1185,7 +1188,7 @@ RTMP_ClientPacket(RTMP *r, RTMPPacket *packet) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1318 bHasMediaPacket = 2; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1319 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1320 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1321 - case 0x12: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1322 + case RTMP_PACKET_TYPE_INFO: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1323 /* metadata (notify) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1324 RTMP_Log(RTMP_LOGDEBUG, "%s, received: notify %lu bytes", __FUNCTION__, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1325 packet->m_nBodySize); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1326 @@ -1193,12 +1196,12 @@ RTMP_ClientPacket(RTMP *r, RTMPPacket *packet) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1327 bHasMediaPacket = 1; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1328 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1329 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1330 - case 0x13: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1331 + case RTMP_PACKET_TYPE_SHARED_OBJECT: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1332 RTMP_Log(RTMP_LOGDEBUG, "%s, shared object, not supported, ignoring", |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1333 __FUNCTION__); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1334 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1335 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1336 - case 0x14: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1337 + case RTMP_PACKET_TYPE_INVOKE: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1338 /* invoke */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1339 RTMP_Log(RTMP_LOGDEBUG, "%s, received: invoke %lu bytes", __FUNCTION__, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1340 packet->m_nBodySize); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1341 @@ -1208,7 +1211,7 @@ RTMP_ClientPacket(RTMP *r, RTMPPacket *packet) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1342 bHasMediaPacket = 2; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1343 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1344 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1345 - case 0x16: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1346 + case RTMP_PACKET_TYPE_FLASH_VIDEO: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1347 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1348 /* go through FLV packets and handle metadata packets */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1349 unsigned int pos = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1350 @@ -1448,7 +1451,7 @@ SendConnectPacket(RTMP *r, RTMPPacket *cp) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1351 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1352 packet.m_nChannel = 0x03; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1353 packet.m_headerType = RTMP_PACKET_SIZE_LARGE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1354 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1355 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1356 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1357 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1358 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1359 @@ -1559,7 +1562,7 @@ SendBGHasStream(RTMP *r, double dId, AVal *playpath) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1360 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1361 packet.m_nChannel = 0x03; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1362 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1363 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1364 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1365 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1366 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1367 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1368 @@ -1591,7 +1594,7 @@ RTMP_SendCreateStream(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1369 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1370 packet.m_nChannel = 0x03; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1371 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1372 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1373 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1374 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1375 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1376 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1377 @@ -1617,7 +1620,7 @@ SendFCSubscribe(RTMP *r, AVal *subscribepath) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1378 char *enc; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1379 packet.m_nChannel = 0x03; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1380 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1381 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1382 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1383 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1384 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1385 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1386 @@ -1649,7 +1652,7 @@ SendReleaseStream(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1387 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1388 packet.m_nChannel = 0x03; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1389 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1390 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1391 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1392 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1393 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1394 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1395 @@ -1679,7 +1682,7 @@ SendFCPublish(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1396 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1397 packet.m_nChannel = 0x03; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1398 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1399 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1400 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1401 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1402 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1403 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1404 @@ -1709,7 +1712,7 @@ SendFCUnpublish(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1405 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1406 packet.m_nChannel = 0x03; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1407 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1408 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1409 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1410 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1411 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1412 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1413 @@ -1741,7 +1744,7 @@ SendPublish(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1414 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1415 packet.m_nChannel = 0x04; /* source channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1416 packet.m_headerType = RTMP_PACKET_SIZE_LARGE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1417 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1418 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1419 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1420 packet.m_nInfoField2 = r->m_stream_id; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1421 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1422 @@ -1776,7 +1779,7 @@ SendDeleteStream(RTMP *r, double dStreamId) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1423 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1424 packet.m_nChannel = 0x03; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1425 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1426 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1427 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1428 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1429 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1430 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1431 @@ -1805,7 +1808,7 @@ RTMP_SendPause(RTMP *r, int DoPause, int iTime) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1432 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1433 packet.m_nChannel = 0x08; /* video channel */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1434 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1435 - packet.m_packetType = 0x14; /* invoke */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1436 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1437 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1438 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1439 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1440 @@ -1842,7 +1845,7 @@ RTMP_SendSeek(RTMP *r, int iTime) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1441 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1442 packet.m_nChannel = 0x08; /* video channel */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1443 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1444 - packet.m_packetType = 0x14; /* invoke */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1445 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1446 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1447 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1448 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1449 @@ -1870,7 +1873,7 @@ RTMP_SendServerBW(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1450 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1451 packet.m_nChannel = 0x02; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1452 packet.m_headerType = RTMP_PACKET_SIZE_LARGE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1453 - packet.m_packetType = 0x05; /* Server BW */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1454 + packet.m_packetType = RTMP_PACKET_TYPE_SERVER_BW; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1455 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1456 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1457 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1458 @@ -1890,7 +1893,7 @@ RTMP_SendClientBW(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1459 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1460 packet.m_nChannel = 0x02; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1461 packet.m_headerType = RTMP_PACKET_SIZE_LARGE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1462 - packet.m_packetType = 0x06; /* Client BW */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1463 + packet.m_packetType = RTMP_PACKET_TYPE_CLIENT_BW; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1464 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1465 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1466 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1467 @@ -1911,7 +1914,7 @@ SendBytesReceived(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1468 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1469 packet.m_nChannel = 0x02; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1470 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1471 - packet.m_packetType = 0x03; /* bytes in */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1472 + packet.m_packetType = RTMP_PACKET_TYPE_BYTES_READ_REPORT; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1473 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1474 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1475 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1476 @@ -1937,7 +1940,7 @@ SendCheckBW(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1477 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1478 packet.m_nChannel = 0x03; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1479 packet.m_headerType = RTMP_PACKET_SIZE_LARGE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1480 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1481 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1482 packet.m_nTimeStamp = 0; /* RTMP_GetTime(); */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1483 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1484 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1485 @@ -1965,7 +1968,7 @@ SendCheckBWResult(RTMP *r, double txn) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1486 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1487 packet.m_nChannel = 0x03; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1488 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1489 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1490 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1491 packet.m_nTimeStamp = 0x16 * r->m_nBWCheckCounter; /* temp inc value. till we figure it out. */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1492 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1493 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1494 @@ -1994,7 +1997,7 @@ SendPong(RTMP *r, double txn) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1495 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1496 packet.m_nChannel = 0x03; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1497 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1498 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1499 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1500 packet.m_nTimeStamp = 0x16 * r->m_nBWCheckCounter; /* temp inc value. till we figure it out. */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1501 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1502 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1503 @@ -2021,7 +2024,7 @@ SendPlay(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1504 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1505 packet.m_nChannel = 0x08; /* we make 8 our stream channel */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1506 packet.m_headerType = RTMP_PACKET_SIZE_LARGE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1507 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1508 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1509 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1510 packet.m_nInfoField2 = r->m_stream_id; /*0x01000000; */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1511 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1512 @@ -2089,7 +2092,7 @@ SendPlaylist(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1513 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1514 packet.m_nChannel = 0x08; /* we make 8 our stream channel */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1515 packet.m_headerType = RTMP_PACKET_SIZE_LARGE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1516 - packet.m_packetType = 0x14; /* INVOKE */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1517 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1518 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1519 packet.m_nInfoField2 = r->m_stream_id; /*0x01000000; */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1520 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1521 @@ -2127,7 +2130,7 @@ SendSecureTokenResponse(RTMP *r, AVal *resp) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1522 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1523 packet.m_nChannel = 0x03; /* control channel (invoke) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1524 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1525 - packet.m_packetType = 0x14; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1526 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1527 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1528 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1529 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1530 @@ -2174,7 +2177,7 @@ RTMP_SendCtrl(RTMP *r, short nType, unsigned int nObject, unsigned int nTime) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1531 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1532 packet.m_nChannel = 0x02; /* control channel (ping) */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1533 packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1534 - packet.m_packetType = 0x04; /* ctrl */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1535 + packet.m_packetType = RTMP_PACKET_TYPE_CONTROL; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1536 packet.m_nTimeStamp = 0; /* RTMP_GetTime(); */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1537 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1538 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1539 @@ -3372,7 +3375,7 @@ RTMP_SendPacket(RTMP *r, RTMPPacket *packet, int queue) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1540 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1541 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1542 /* we invoked a remote method */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1543 - if (packet->m_packetType == 0x14) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1544 + if (packet->m_packetType == RTMP_PACKET_TYPE_INVOKE) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1545 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1546 AVal method; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1547 char *ptr; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1548 @@ -3748,8 +3751,8 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1549 char *packetBody = packet.m_body; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1550 unsigned int nPacketLen = packet.m_nBodySize; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1551 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1552 - /* Return -3 if this was completed nicely with invoke message |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1553 - * Play.Stop or Play.Complete |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1554 + /* Return RTMP_READ_COMPLETE if this was completed nicely with |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1555 + * invoke message Play.Stop or Play.Complete |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1556 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1557 if (rtnGetNextMediaPacket == 2) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1558 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1559 @@ -3760,17 +3763,17 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1560 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1561 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1562 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1563 - r->m_read.dataType |= (((packet.m_packetType == 0x08) << 2) | |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1564 - (packet.m_packetType == 0x09)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1565 + r->m_read.dataType |= (((packet.m_packetType == RTMP_PACKET_TYPE_AUDIO) << 2) | |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1566 + (packet.m_packetType == RTMP_PACKET_TYPE_VIDEO)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1567 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1568 - if (packet.m_packetType == 0x09 && nPacketLen <= 5) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1569 + if (packet.m_packetType == RTMP_PACKET_TYPE_VIDEO && nPacketLen <= 5) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1570 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1571 RTMP_Log(RTMP_LOGDEBUG, "ignoring too small video packet: size: %d", |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1572 nPacketLen); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1573 ret = RTMP_READ_IGNORE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1574 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1575 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1576 - if (packet.m_packetType == 0x08 && nPacketLen <= 1) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1577 + if (packet.m_packetType == RTMP_PACKET_TYPE_AUDIO && nPacketLen <= 1) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1578 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1579 RTMP_Log(RTMP_LOGDEBUG, "ignoring too small audio packet: size: %d", |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1580 nPacketLen); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1581 @@ -3787,7 +3790,7 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1582 RTMP_Log(RTMP_LOGDEBUG, "type: %02X, size: %d, TS: %d ms, abs TS: %d", |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1583 packet.m_packetType, nPacketLen, packet.m_nTimeStamp, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1584 packet.m_hasAbsTimestamp); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1585 - if (packet.m_packetType == 0x09) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1586 + if (packet.m_packetType == RTMP_PACKET_TYPE_VIDEO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1587 RTMP_Log(RTMP_LOGDEBUG, "frametype: %02X", (*packetBody & 0xf0)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1588 #endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1589 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1590 @@ -3797,7 +3800,7 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1591 if (packet.m_nTimeStamp == 0) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1592 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1593 if (r->m_read.nMetaHeaderSize > 0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1594 - && packet.m_packetType == 0x12) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1595 + && packet.m_packetType == RTMP_PACKET_TYPE_INFO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1596 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1597 AMFObject metaObj; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1598 int nRes = |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1599 @@ -3858,7 +3861,7 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1600 * in the first FLV stream chunk and we have to compare |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1601 * it and filter it out !! |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1602 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1603 - if (packet.m_packetType == 0x16) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1604 + if (packet.m_packetType == RTMP_PACKET_TYPE_FLASH_VIDEO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1605 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1606 /* basically we have to find the keyframe with the |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1607 * correct TS being nResumeTS |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1608 @@ -3970,7 +3973,7 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1609 * (seeking might put us somewhere before it) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1610 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1611 if (!(r->m_read.flags & RTMP_READ_GOTKF) && |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1612 - packet.m_packetType != 0x16) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1613 + packet.m_packetType != RTMP_PACKET_TYPE_FLASH_VIDEO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1614 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1615 RTMP_Log(RTMP_LOGWARNING, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1616 "Stream does not start with requested frame, ignoring data... "); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1617 @@ -3983,7 +3986,7 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1618 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1619 /* ok, do the same for FLV streams */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1620 if (!(r->m_read.flags & RTMP_READ_GOTFLVK) && |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1621 - packet.m_packetType == 0x16) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1622 + packet.m_packetType == RTMP_PACKET_TYPE_FLASH_VIDEO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1623 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1624 RTMP_Log(RTMP_LOGWARNING, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1625 "Stream does not start with requested FLV frame, ignoring data... "); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1626 @@ -4002,9 +4005,11 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1627 * the preceding if clause) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1628 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1629 if (!(r->m_read.flags & RTMP_READ_NO_IGNORE) && |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1630 - packet.m_packetType != 0x16) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1631 - { /* exclude type 0x16 (FLV) since it can |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1632 - * contain several FLV packets */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1633 + packet.m_packetType != RTMP_PACKET_TYPE_FLASH_VIDEO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1634 + { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1635 + /* exclude type RTMP_PACKET_TYPE_FLASH_VIDEO since it can |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1636 + * contain several FLV packets |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1637 + */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1638 if (packet.m_nTimeStamp == 0) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1639 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1640 ret = RTMP_READ_IGNORE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1641 @@ -4020,9 +4025,10 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1642 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1643 /* calculate packet size and allocate slop buffer if necessary */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1644 size = nPacketLen + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1645 - ((packet.m_packetType == 0x08 || packet.m_packetType == 0x09 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1646 - || packet.m_packetType == 0x12) ? 11 : 0) + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1647 - (packet.m_packetType != 0x16 ? 4 : 0); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1648 + ((packet.m_packetType == RTMP_PACKET_TYPE_AUDIO |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1649 + || packet.m_packetType == RTMP_PACKET_TYPE_VIDEO |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1650 + || packet.m_packetType == RTMP_PACKET_TYPE_INFO) ? 11 : 0) + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1651 + (packet.m_packetType != RTMP_PACKET_TYPE_FLASH_VIDEO ? 4 : 0); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1652 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1653 if (size + 4 > buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1654 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1655 @@ -4048,8 +4054,9 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1656 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1657 /* audio (0x08), video (0x09) or metadata (0x12) packets : |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1658 * construct 11 byte header then add rtmp packet's data */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1659 - if (packet.m_packetType == 0x08 || packet.m_packetType == 0x09 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1660 - || packet.m_packetType == 0x12) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1661 + if (packet.m_packetType == RTMP_PACKET_TYPE_AUDIO |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1662 + || packet.m_packetType == RTMP_PACKET_TYPE_VIDEO |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1663 + || packet.m_packetType == RTMP_PACKET_TYPE_INFO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1664 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1665 nTimeStamp = r->m_read.nResumeTS + packet.m_nTimeStamp; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1666 prevTagSize = 11 + nPacketLen; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1667 @@ -4059,7 +4066,7 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1668 ptr = AMF_EncodeInt24(ptr, pend, nPacketLen); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1669 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1670 #if 0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1671 - if(packet.m_packetType == 0x09) { /* video */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1672 + if(packet.m_packetType == RTMP_PACKET_TYPE_VIDEO) { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1673 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1674 /* H264 fix: */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1675 if((packetBody[0] & 0x0f) == 7) { /* CodecId = H264 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1676 @@ -4089,7 +4096,7 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1677 len = nPacketLen; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1678 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1679 /* correct tagSize and obtain timestamp if we have an FLV stream */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1680 - if (packet.m_packetType == 0x16) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1681 + if (packet.m_packetType == RTMP_PACKET_TYPE_FLASH_VIDEO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1682 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1683 unsigned int pos = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1684 int delta; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1685 @@ -4167,7 +4174,7 @@ Read_1_Packet(RTMP *r, char *buf, unsigned int buflen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1686 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1687 ptr += len; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1688 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1689 - if (packet.m_packetType != 0x16) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1690 + if (packet.m_packetType != RTMP_PACKET_TYPE_FLASH_VIDEO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1691 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1692 /* FLV tag packets contain their own prevTagSize */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1693 AMF_EncodeInt32(ptr, pend, prevTagSize); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1694 @@ -4352,11 +4359,12 @@ RTMP_Write(RTMP *r, const char *buf, int size) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1695 buf += 3; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1696 s2 -= 11; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1697 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1698 - if (((pkt->m_packetType == 0x08 || pkt->m_packetType == 0x09) && |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1699 - !pkt->m_nTimeStamp) || pkt->m_packetType == 0x12) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1700 + if (((pkt->m_packetType == RTMP_PACKET_TYPE_AUDIO |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1701 + || pkt->m_packetType == RTMP_PACKET_TYPE_VIDEO) && |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1702 + !pkt->m_nTimeStamp) || pkt->m_packetType == RTMP_PACKET_TYPE_INFO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1703 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1704 pkt->m_headerType = RTMP_PACKET_SIZE_LARGE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1705 - if (pkt->m_packetType == 0x12) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1706 + if (pkt->m_packetType == RTMP_PACKET_TYPE_INFO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1707 pkt->m_nBodySize += 16; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1708 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1709 else |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1710 @@ -4371,7 +4379,7 @@ RTMP_Write(RTMP *r, const char *buf, int size) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1711 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1712 enc = pkt->m_body; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1713 pend = enc + pkt->m_nBodySize; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1714 - if (pkt->m_packetType == 0x12) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1715 + if (pkt->m_packetType == RTMP_PACKET_TYPE_INFO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1716 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1717 enc = AMF_EncodeString(enc, pend, &av_setDataFrame); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1718 pkt->m_nBytesRead = enc - pkt->m_body; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1719 diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1720 index de0b795..1ece207 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1721 --- a/librtmp/rtmp.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1722 +++ b/librtmp/rtmp.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1723 @@ -71,9 +71,29 @@ extern "C" |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1724 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1725 uint32_t RTMP_GetTime(void); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1726 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1727 -#define RTMP_PACKET_TYPE_AUDIO 0x08 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1728 -#define RTMP_PACKET_TYPE_VIDEO 0x09 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1729 -#define RTMP_PACKET_TYPE_INFO 0x12 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1730 +/* RTMP_PACKET_TYPE_... 0x00 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1731 +#define RTMP_PACKET_TYPE_CHUNK_SIZE 0x01 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1732 +/* RTMP_PACKET_TYPE_... 0x02 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1733 +#define RTMP_PACKET_TYPE_BYTES_READ_REPORT 0x03 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1734 +#define RTMP_PACKET_TYPE_CONTROL 0x04 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1735 +#define RTMP_PACKET_TYPE_SERVER_BW 0x05 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1736 +#define RTMP_PACKET_TYPE_CLIENT_BW 0x06 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1737 +/* RTMP_PACKET_TYPE_... 0x07 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1738 +#define RTMP_PACKET_TYPE_AUDIO 0x08 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1739 +#define RTMP_PACKET_TYPE_VIDEO 0x09 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1740 +/* RTMP_PACKET_TYPE_... 0x0A */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1741 +/* RTMP_PACKET_TYPE_... 0x0B */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1742 +/* RTMP_PACKET_TYPE_... 0x0C */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1743 +/* RTMP_PACKET_TYPE_... 0x0D */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1744 +/* RTMP_PACKET_TYPE_... 0x0E */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1745 +#define RTMP_PACKET_TYPE_FLEX_STREAM_SEND 0x0F |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1746 +#define RTMP_PACKET_TYPE_FLEX_SHARED_OBJECT 0x10 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1747 +#define RTMP_PACKET_TYPE_FLEX_MESSAGE 0x11 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1748 +#define RTMP_PACKET_TYPE_INFO 0x12 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1749 +#define RTMP_PACKET_TYPE_SHARED_OBJECT 0x13 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1750 +#define RTMP_PACKET_TYPE_INVOKE 0x14 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1751 +/* RTMP_PACKET_TYPE_... 0x15 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1752 +#define RTMP_PACKET_TYPE_FLASH_VIDEO 0x16 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1753 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1754 #define RTMP_MAX_HEADER_SIZE 18 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1755 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1756 diff --git a/rtmpsrv.c b/rtmpsrv.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1757 index 4d5699f..f1b6c66 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1758 --- a/rtmpsrv.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1759 +++ b/rtmpsrv.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1760 @@ -175,7 +175,7 @@ SendConnectResult(RTMP *r, double txn) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1761 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1762 packet.m_nChannel = 0x03; // control channel (invoke) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1763 packet.m_headerType = 1; /* RTMP_PACKET_SIZE_MEDIUM; */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1764 - packet.m_packetType = 0x14; // INVOKE |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1765 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1766 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1767 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1768 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1769 @@ -236,7 +236,7 @@ SendResultNumber(RTMP *r, double txn, double ID) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1770 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1771 packet.m_nChannel = 0x03; // control channel (invoke) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1772 packet.m_headerType = 1; /* RTMP_PACKET_SIZE_MEDIUM; */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1773 - packet.m_packetType = 0x14; // INVOKE |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1774 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1775 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1776 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1777 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1778 @@ -270,7 +270,7 @@ SendPlayStart(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1779 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1780 packet.m_nChannel = 0x03; // control channel (invoke) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1781 packet.m_headerType = 1; /* RTMP_PACKET_SIZE_MEDIUM; */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1782 - packet.m_packetType = 0x14; // INVOKE |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1783 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1784 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1785 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1786 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1787 @@ -302,7 +302,7 @@ SendPlayStop(RTMP *r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1788 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1789 packet.m_nChannel = 0x03; // control channel (invoke) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1790 packet.m_headerType = 1; /* RTMP_PACKET_SIZE_MEDIUM; */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1791 - packet.m_packetType = 0x14; // INVOKE |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1792 + packet.m_packetType = RTMP_PACKET_TYPE_INVOKE; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1793 packet.m_nTimeStamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1794 packet.m_nInfoField2 = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1795 packet.m_hasAbsTimestamp = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1796 diff --git a/rtmpsuck.c b/rtmpsuck.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1797 index 3293e8b..661e64b 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1798 --- a/rtmpsuck.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1799 +++ b/rtmpsuck.c |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1800 @@ -461,67 +461,71 @@ ServePacket(STREAMING_SERVER *server, int which, RTMPPacket *packet) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1801 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1802 switch (packet->m_packetType) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1803 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1804 - case 0x01: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1805 + case RTMP_PACKET_TYPE_CHUNK_SIZE: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1806 // chunk size |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1807 // HandleChangeChunkSize(r, packet); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1808 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1809 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1810 - case 0x03: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1811 + case RTMP_PACKET_TYPE_BYTES_READ_REPORT: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1812 // bytes read report |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1813 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1814 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1815 - case 0x04: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1816 + case RTMP_PACKET_TYPE_CONTROL: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1817 // ctrl |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1818 // HandleCtrl(r, packet); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1819 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1820 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1821 - case 0x05: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1822 + case RTMP_PACKET_TYPE_SERVER_BW: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1823 // server bw |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1824 // HandleServerBW(r, packet); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1825 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1826 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1827 - case 0x06: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1828 + case RTMP_PACKET_TYPE_CLIENT_BW: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1829 // client bw |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1830 // HandleClientBW(r, packet); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1831 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1832 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1833 - case 0x08: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1834 + case RTMP_PACKET_TYPE_AUDIO: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1835 // audio data |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1836 //RTMP_Log(RTMP_LOGDEBUG, "%s, received: audio %lu bytes", __FUNCTION__, packet.m_nBodySize); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1837 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1838 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1839 - case 0x09: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1840 + case RTMP_PACKET_TYPE_VIDEO: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1841 // video data |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1842 //RTMP_Log(RTMP_LOGDEBUG, "%s, received: video %lu bytes", __FUNCTION__, packet.m_nBodySize); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1843 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1844 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1845 - case 0x0F: // flex stream send |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1846 + case RTMP_PACKET_TYPE_FLEX_STREAM_SEND: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1847 + // flex stream send |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1848 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1849 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1850 - case 0x10: // flex shared object |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1851 + case RTMP_PACKET_TYPE_FLEX_SHARED_OBJECT: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1852 + // flex shared object |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1853 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1854 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1855 - case 0x11: // flex message |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1856 + case RTMP_PACKET_TYPE_FLEX_MESSAGE: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1857 + // flex message |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1858 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1859 ret = ServeInvoke(server, which, packet, packet->m_body + 1); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1860 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1861 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1862 - case 0x12: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1863 + case RTMP_PACKET_TYPE_INFO: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1864 // metadata (notify) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1865 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1866 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1867 - case 0x13: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1868 + case RTMP_PACKET_TYPE_SHARED_OBJECT: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1869 /* shared object */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1870 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1871 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1872 - case 0x14: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1873 + case RTMP_PACKET_TYPE_INVOKE: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1874 // invoke |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1875 ret = ServeInvoke(server, which, packet, packet->m_body); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1876 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1877 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1878 - case 0x16: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1879 + case RTMP_PACKET_TYPE_FLASH_VIDEO: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1880 /* flv */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1881 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1882 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1883 default: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1884 RTMP_Log(RTMP_LOGDEBUG, "%s, unknown packet type received: 0x%02x", __FUNCTION__, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1885 packet->m_packetType); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1886 @@ -547,21 +551,21 @@ WriteStream(char **buf, // target pointer, maybe preallocated |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1887 unsigned int nPacketLen = packet->m_nBodySize; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1888 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1889 // skip video info/command packets |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1890 - if (packet->m_packetType == 0x09 && |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1891 + if (packet->m_packetType == RTMP_PACKET_TYPE_VIDEO && |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1892 nPacketLen == 2 && ((*packetBody & 0xf0) == 0x50)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1893 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1894 ret = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1895 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1896 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1897 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1898 - if (packet->m_packetType == 0x09 && nPacketLen <= 5) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1899 + if (packet->m_packetType == RTMP_PACKET_TYPE_VIDEO && nPacketLen <= 5) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1900 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1901 RTMP_Log(RTMP_LOGWARNING, "ignoring too small video packet: size: %d", |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1902 nPacketLen); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1903 ret = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1904 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1905 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1906 - if (packet->m_packetType == 0x08 && nPacketLen <= 1) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1907 + if (packet->m_packetType == RTMP_PACKET_TYPE_AUDIO && nPacketLen <= 1) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1908 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1909 RTMP_Log(RTMP_LOGWARNING, "ignoring too small audio packet: size: %d", |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1910 nPacketLen); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1911 @@ -571,19 +575,22 @@ WriteStream(char **buf, // target pointer, maybe preallocated |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1912 #ifdef _DEBUG |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1913 RTMP_Log(RTMP_LOGDEBUG, "type: %02X, size: %d, TS: %d ms", packet->m_packetType, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1914 nPacketLen, packet->m_nTimeStamp); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1915 - if (packet->m_packetType == 0x09) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1916 + if (packet->m_packetType == RTMP_PACKET_TYPE_VIDEO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1917 RTMP_Log(RTMP_LOGDEBUG, "frametype: %02X", (*packetBody & 0xf0)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1918 #endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1919 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1920 // calculate packet size and reallocate buffer if necessary |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1921 unsigned int size = nPacketLen |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1922 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1923 - ((packet->m_packetType == 0x08 || packet->m_packetType == 0x09 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1924 - || packet->m_packetType == 0x12) ? 11 : 0) + (packet->m_packetType != |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1925 - 0x16 ? 4 : 0); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1926 + ((packet->m_packetType == RTMP_PACKET_TYPE_AUDIO |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1927 + || packet->m_packetType == RTMP_PACKET_TYPE_VIDEO |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1928 + || packet->m_packetType == RTMP_PACKET_TYPE_INFO) ? 11 : 0) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1929 + + (packet->m_packetType != 0x16 ? 4 : 0); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1930 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1931 if (size + 4 > len) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1932 - { // the extra 4 is for the case of an FLV stream without a last prevTagSize (we need extra 4 bytes to append it) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1933 + { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1934 + /* The extra 4 is for the case of an FLV stream without a last |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1935 + * prevTagSize (we need extra 4 bytes to append it). */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1936 *buf = (char *) realloc(*buf, size + 4); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1937 if (*buf == 0) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1938 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1939 @@ -594,13 +601,15 @@ WriteStream(char **buf, // target pointer, maybe preallocated |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1940 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1941 char *ptr = *buf, *pend = ptr + size+4; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1942 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1943 - // audio (0x08), video (0x09) or metadata (0x12) packets : |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1944 - // construct 11 byte header then add rtmp packet's data |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1945 - if (packet->m_packetType == 0x08 || packet->m_packetType == 0x09 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1946 - || packet->m_packetType == 0x12) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1947 + /* audio (RTMP_PACKET_TYPE_AUDIO), video (RTMP_PACKET_TYPE_VIDEO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1948 + * or metadata (RTMP_PACKET_TYPE_INFO) packets: construct 11 byte |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1949 + * header then add rtmp packet's data. */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1950 + if (packet->m_packetType == RTMP_PACKET_TYPE_AUDIO |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1951 + || packet->m_packetType == RTMP_PACKET_TYPE_VIDEO |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1952 + || packet->m_packetType == RTMP_PACKET_TYPE_INFO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1953 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1954 // set data type |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1955 - //*dataType |= (((packet->m_packetType == 0x08)<<2)|(packet->m_packetType == 0x09)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1956 + //*dataType |= (((packet->m_packetType == RTMP_PACKET_TYPE_AUDIO)<<2)|(packet->m_packetType == RTMP_PACKET_TYPE_VIDEO)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1957 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1958 (*nTimeStamp) = packet->m_nTimeStamp; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1959 prevTagSize = 11 + nPacketLen; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1960 @@ -619,7 +628,7 @@ WriteStream(char **buf, // target pointer, maybe preallocated |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1961 unsigned int len = nPacketLen; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1962 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1963 // correct tagSize and obtain timestamp if we have an FLV stream |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1964 - if (packet->m_packetType == 0x16) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1965 + if (packet->m_packetType == RTMP_PACKET_TYPE_FLASH_VIDEO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1966 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1967 unsigned int pos = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1968 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1969 @@ -629,8 +638,11 @@ WriteStream(char **buf, // target pointer, maybe preallocated |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1970 *nTimeStamp = AMF_DecodeInt24(packetBody + pos + 4); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1971 *nTimeStamp |= (packetBody[pos + 7] << 24); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1972 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1973 - // set data type |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1974 - //*dataType |= (((*(packetBody+pos) == 0x08)<<2)|(*(packetBody+pos) == 0x09)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1975 +#if 0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1976 + /* set data type */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1977 + *dataType |= (((*(packetBody+pos) == RTMP_PACKET_TYPE_AUDIO) << 2) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1978 + | (*(packetBody+pos) == RTMP_PACKET_TYPE_VIDEO)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1979 +#endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1980 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1981 if (pos + 11 + dataSize + 4 > nPacketLen) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1982 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1983 @@ -680,7 +692,7 @@ WriteStream(char **buf, // target pointer, maybe preallocated |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1984 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1985 ptr += len; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1986 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1987 - if (packet->m_packetType != 0x16) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1988 + if (packet->m_packetType != RTMP_PACKET_TYPE_FLASH_VIDEO) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1989 { // FLV tag packets contain their own prevTagSize |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1990 AMF_EncodeInt32(ptr, pend, prevTagSize); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1991 //ptr += 4; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1992 @@ -828,7 +840,7 @@ TFTYPE doServe(void *arg) // server socket and state (our listening socket) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1993 if (RTMPPacket_IsReady(&ps)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1994 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1995 /* change chunk size */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1996 - if (ps.m_packetType == 0x01) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1997 + if (ps.m_packetType == RTMP_PACKET_TYPE_CHUNK_SIZE) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1998 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1999 if (ps.m_nBodySize >= 4) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2000 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2001 @@ -839,7 +851,7 @@ TFTYPE doServe(void *arg) // server socket and state (our listening socket) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2002 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2003 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2004 /* bytes received */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2005 - else if (ps.m_packetType == 0x03) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2006 + else if (ps.m_packetType == RTMP_PACKET_TYPE_BYTES_READ_REPORT) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2007 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2008 if (ps.m_nBodySize >= 4) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2009 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2010 @@ -849,7 +861,7 @@ TFTYPE doServe(void *arg) // server socket and state (our listening socket) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2011 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2012 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2013 /* ctrl */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2014 - else if (ps.m_packetType == 0x04) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2015 + else if (ps.m_packetType == RTMP_PACKET_TYPE_CONTROL) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2016 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2017 short nType = AMF_DecodeInt16(ps.m_body); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2018 /* UpdateBufferMS */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2019 @@ -875,13 +887,16 @@ TFTYPE doServe(void *arg) // server socket and state (our listening socket) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2020 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2021 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2022 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2023 - else if (ps.m_packetType == 0x11 || ps.m_packetType == 0x14) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2024 - if (ServePacket(server, 0, &ps) && server->f_cur) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2025 - { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2026 - fclose(server->f_cur->f_file); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2027 - server->f_cur->f_file = NULL; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2028 - server->f_cur = NULL; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2029 - } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2030 + else if (ps.m_packetType == RTMP_PACKET_TYPE_FLEX_MESSAGE |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2031 + || ps.m_packetType == RTMP_PACKET_TYPE_INVOKE) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2032 + { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2033 + if (ServePacket(server, 0, &ps) && server->f_cur) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2034 + { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2035 + fclose(server->f_cur->f_file); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2036 + server->f_cur->f_file = NULL; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2037 + server->f_cur = NULL; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2038 + } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2039 + } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2040 RTMP_SendPacket(&server->rc, &ps, FALSE); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2041 RTMPPacket_Free(&ps); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2042 break; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2043 @@ -902,7 +917,7 @@ TFTYPE doServe(void *arg) // server socket and state (our listening socket) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2044 server->rc.m_pausing = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2045 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2046 /* change chunk size */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2047 - if (pc.m_packetType == 0x01) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2048 + if (pc.m_packetType == RTMP_PACKET_TYPE_CHUNK_SIZE) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2049 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2050 if (pc.m_nBodySize >= 4) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2051 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2052 @@ -912,7 +927,7 @@ TFTYPE doServe(void *arg) // server socket and state (our listening socket) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2053 server->rs.m_outChunkSize = server->rc.m_inChunkSize; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2054 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2055 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2056 - else if (pc.m_packetType == 0x04) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2057 + else if (pc.m_packetType == RTMP_PACKET_TYPE_CONTROL) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2058 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2059 short nType = AMF_DecodeInt16(pc.m_body); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2060 /* SWFverification */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2061 @@ -929,17 +944,18 @@ TFTYPE doServe(void *arg) // server socket and state (our listening socket) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2062 #endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2063 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2064 else if (server->f_cur && ( |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2065 - pc.m_packetType == 0x08 || |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2066 - pc.m_packetType == 0x09 || |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2067 - pc.m_packetType == 0x12 || |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2068 - pc.m_packetType == 0x16) && |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2069 + pc.m_packetType == RTMP_PACKET_TYPE_AUDIO || |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2070 + pc.m_packetType == RTMP_PACKET_TYPE_VIDEO || |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2071 + pc.m_packetType == RTMP_PACKET_TYPE_INFO || |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2072 + pc.m_packetType == RTMP_PACKET_TYPE_FLASH_VIDEO) && |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2073 RTMP_ClientPacket(&server->rc, &pc)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2074 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2075 int len = WriteStream(&buf, &buflen, &server->stamp, &pc); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2076 if (len > 0 && fwrite(buf, 1, len, server->f_cur->f_file) != len) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2077 goto cleanup; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2078 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2079 - else if ( pc.m_packetType == 0x11 || pc.m_packetType == 0x14) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2080 + else if (pc.m_packetType == RTMP_PACKET_TYPE_FLEX_MESSAGE || |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2081 + pc.m_packetType == RTMP_PACKET_TYPE_INVOKE) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2082 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2083 if (ServePacket(server, 1, &pc) && server->f_cur) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2084 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2085 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2086 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2087 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2088 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2089 From e09abc08504988e5c286ffc9c92da3ba76f95a20 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2090 From: Compn <tempn@twmi.rr.com> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2091 Date: Tue, 5 Jul 2011 09:48:23 -0400 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2092 Subject: [PATCH 28/34] add -shared to mingw ldflags, fixes compilation error |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2093 patch by Martin Storsjo |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2094 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2095 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2096 librtmp/Makefile | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2097 1 file changed, 1 insertion(+), 1 deletion(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2098 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2099 diff --git a/librtmp/Makefile b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2100 index 1ea31a0..785e869 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2101 --- a/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2102 +++ b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2103 @@ -54,7 +54,7 @@ SODIR=$(SODIR_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2104 SO_LDFLAGS_posix=-shared -Wl,-soname,$@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2105 SO_LDFLAGS_darwin=-dynamiclib -flat_namespace -undefined suppress -fno-common \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2106 -headerpad_max_install_names |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2107 -SO_LDFLAGS_mingw= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2108 +SO_LDFLAGS_mingw=-shared |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2109 SO_LDFLAGS=$(SO_LDFLAGS_$(SYS)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2110 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2111 SHARED=yes |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2112 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2113 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2114 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2115 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2116 From 0e9b4917c1163227c48cd83e081aa972ed7d3111 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2117 From: Howard Chu <hyc@symas.com> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2118 Date: Mon, 11 Jul 2011 14:41:11 -0700 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2119 Subject: [PATCH 29/34] Revert "Drop back on the handshake version, avoid |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2120 rtmpe 9" |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2121 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2122 This reverts commit aa2825fbb1d1f70652d558a730baed28149ebbdd. |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2123 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2124 Conflicts: |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2125 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2126 librtmp/handshake.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2127 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2128 librtmp/handshake.h | 6 ++---- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2129 1 file changed, 2 insertions(+), 4 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2130 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2131 diff --git a/librtmp/handshake.h b/librtmp/handshake.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2132 index b172dbf..958579a 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2133 --- a/librtmp/handshake.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2134 +++ b/librtmp/handshake.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2135 @@ -400,10 +400,8 @@ HandShake(RTMP * r, int FP9HandShake) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2136 /* set version to at least 9.0.115.0 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2137 if (encrypted) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2138 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2139 -/* clientsig[4] = 128; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2140 - clientsig[6] = 3; */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2141 - clientsig[4] = 9; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2142 - clientsig[6] = 0x7c; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2143 + clientsig[4] = 128; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2144 + clientsig[6] = 3; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2145 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2146 else |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2147 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2148 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2149 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2150 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2151 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2152 From d1f14b147e03aa17c968b96d6573320410a5252c Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2153 From: Howard Chu <hyc@symas.com> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2154 Date: Mon, 11 Jul 2011 16:12:39 -0700 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2155 Subject: [PATCH 30/34] Add RTMPE type 9 handshake signature |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2156 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2157 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2158 librtmp/handshake.h | 349 +++++++++++++++++++++++++++++++++++++++++++++++++-- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2159 1 file changed, 336 insertions(+), 13 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2160 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2161 diff --git a/librtmp/handshake.h b/librtmp/handshake.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2162 index 958579a..98bf3c8 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2163 --- a/librtmp/handshake.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2164 +++ b/librtmp/handshake.h |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2165 @@ -358,6 +358,337 @@ static void rtmpe8_sig(uint8_t *in, uint8_t *out, int keyid) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2166 out[7] = v1; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2167 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2168 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2169 +/* RTMPE type 9 uses Blowfish on the regular signature |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2170 + * http://en.wikipedia.org/wiki/Blowfish_(cipher) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2171 + */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2172 +#define BF_ROUNDS 16 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2173 +typedef struct bf_key { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2174 + uint32_t s[4][256]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2175 + uint32_t p[BF_ROUNDS+2]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2176 +} bf_key; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2177 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2178 +static const uint32_t bf_sinit[][256] = { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2179 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2180 + /* S-Box 0 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2181 + { 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2182 + 0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2183 + 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2184 + 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2185 + 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2186 + 0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2187 + 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, 0x2aab10b6, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2188 + 0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2189 + 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2190 + 0x7a325381, 0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2191 + 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, 0xef845d5d, 0xe98575b1, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2192 + 0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2193 + 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, 0xf6e96c9a, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2194 + 0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2195 + 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, 0xa1f1651d, 0x39af0176, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2196 + 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2197 + 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, 0x4ed3aa62, 0x363f7706, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2198 + 0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2199 + 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2200 + 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2201 + 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2202 + 0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2203 + 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2204 + 0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2205 + 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2206 + 0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2207 + 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2208 + 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2209 + 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2210 + 0x62fb1341, 0xcee4c6e8, 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2211 + 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0, 0xafc725e0, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2212 + 0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2213 + 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2214 + 0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2215 + 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266, 0x80957705, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2216 + 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2217 + 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, 0x00250e2d, 0x2071b35e, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2218 + 0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2219 + 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5, 0x83260376, 0x6295cfa9, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2220 + 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2221 + 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2222 + 0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2223 + 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2224 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2225 + /* S-Box 1 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2226 + { 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2227 + 0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2228 + 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2229 + 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2230 + 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2231 + 0x3c971814, 0x6b6a70a1, 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2232 + 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2233 + 0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2234 + 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2235 + 0xc8b57634, 0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2236 + 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2237 + 0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2238 + 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2239 + 0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2240 + 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, 0xef1c1847, 0x3215d908, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2241 + 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2242 + 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2243 + 0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2244 + 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2245 + 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2246 + 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2247 + 0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2248 + 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2249 + 0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2250 + 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2251 + 0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2252 + 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2253 + 0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2254 + 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2255 + 0x11ed935f, 0x16681281, 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2256 + 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2257 + 0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2258 + 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2259 + 0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2260 + 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2, 0x5b8d2646, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2261 + 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2262 + 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2263 + 0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2264 + 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, 0xa6078084, 0x19f8509e, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2265 + 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2266 + 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2267 + 0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2268 + 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2269 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2270 + /* S-Box 2 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2271 + { 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2272 + 0xbcf46b2e, 0xd4a20068, 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2273 + 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2274 + 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2275 + 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2276 + 0x0a2c86da, 0xe9b66dfb, 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2277 + 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2278 + 0xce78a399, 0x406b2a42, 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2279 + 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2280 + 0x6841e7f7, 0xca7820fb, 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2281 + 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2282 + 0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2283 + 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2284 + 0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2285 + 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564, 0x257b7834, 0x602a9c60, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2286 + 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2287 + 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2288 + 0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2289 + 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2290 + 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2291 + 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2292 + 0xb5390f92, 0x690fed0b, 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2293 + 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2294 + 0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2295 + 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2296 + 0x3d25bdd8, 0xe2e1c3c9, 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2297 + 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2298 + 0x60787bf8, 0x6003604d, 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2299 + 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2300 + 0x55464299, 0xbf582e61, 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2301 + 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2302 + 0x846a0e79, 0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2303 + 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2304 + 0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2305 + 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, 0xdcb7da83, 0x573906fe, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2306 + 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2307 + 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2308 + 0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2309 + 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76, 0x6f05e409, 0x4b7c0188, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2310 + 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2311 + 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2312 + 0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2313 + 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2314 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2315 + /* S-Box 3 */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2316 + { 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2317 + 0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2318 + 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2319 + 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2320 + 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2321 + 0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2322 + 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2323 + 0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2324 + 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2325 + 0x2cf0b7d9, 0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2326 + 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, 0xe029ac71, 0xe019a5e6, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2327 + 0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2328 + 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, 0x88f46dba, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2329 + 0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2330 + 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, 0x7533d928, 0xb155fdf5, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2331 + 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2332 + 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2333 + 0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2334 + 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2335 + 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2336 + 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2337 + 0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2338 + 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2339 + 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2340 + 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2341 + 0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2342 + 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2343 + 0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2344 + 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2345 + 0x0f91fc71, 0x9b941525, 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2346 + 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2347 + 0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2348 + 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2349 + 0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2350 + 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 0xf523f357, 0xa6327623, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2351 + 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2352 + 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2353 + 0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2354 + 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, 0x53113ec0, 0x1640e3d3, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2355 + 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2356 + 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2357 + 0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2358 + 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2359 +}; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2360 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2361 +static const uint32_t bf_pinit[] = { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2362 + /* P-Box */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2363 + 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2364 + 0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2365 + 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2366 +}; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2367 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2368 +#define KEYBYTES 24 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2369 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2370 +static const unsigned char rtmpe9_keys[16][KEYBYTES] = { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2371 + { 0x79, 0x34, 0x77, 0x4c, 0x67, 0xd1, 0x38, 0x3a, 0xdf, 0xb3, 0x56, 0xbe, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2372 + 0x8b, 0x7b, 0xd0, 0x24, 0x38, 0xe0, 0x73, 0x58, 0x41, 0x5d, 0x69, 0x67, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2373 + { 0x46, 0xf6, 0xb4, 0xcc, 0x01, 0x93, 0xe3, 0xa1, 0x9e, 0x7d, 0x3c, 0x65, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2374 + 0x55, 0x86, 0xfd, 0x09, 0x8f, 0xf7, 0xb3, 0xc4, 0x6f, 0x41, 0xca, 0x5c, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2375 + { 0x1a, 0xe7, 0xe2, 0xf3, 0xf9, 0x14, 0x79, 0x94, 0xc0, 0xd3, 0x97, 0x43, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2376 + 0x08, 0x7b, 0xb3, 0x84, 0x43, 0x2f, 0x9d, 0x84, 0x3f, 0x21, 0x01, 0x9b, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2377 + { 0xd3, 0xe3, 0x54, 0xb0, 0xf7, 0x1d, 0xf6, 0x2b, 0x5a, 0x43, 0x4d, 0x04, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2378 + 0x83, 0x64, 0x3e, 0x0d, 0x59, 0x2f, 0x61, 0xcb, 0xb1, 0x6a, 0x59, 0x0d, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2379 + { 0xc8, 0xc1, 0xe9, 0xb8, 0x16, 0x56, 0x99, 0x21, 0x7b, 0x5b, 0x36, 0xb7, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2380 + 0xb5, 0x9b, 0xdf, 0x06, 0x49, 0x2c, 0x97, 0xf5, 0x95, 0x48, 0x85, 0x7e, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2381 + { 0xeb, 0xe5, 0xe6, 0x2e, 0xa4, 0xba, 0xd4, 0x2c, 0xf2, 0x16, 0xe0, 0x8f, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2382 + 0x66, 0x23, 0xa9, 0x43, 0x41, 0xce, 0x38, 0x14, 0x84, 0x95, 0x00, 0x53, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2383 + { 0x66, 0xdb, 0x90, 0xf0, 0x3b, 0x4f, 0xf5, 0x6f, 0xe4, 0x9c, 0x20, 0x89, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2384 + 0x35, 0x5e, 0xd2, 0xb2, 0xc3, 0x9e, 0x9f, 0x7f, 0x63, 0xb2, 0x28, 0x81, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2385 + { 0xbb, 0x20, 0xac, 0xed, 0x2a, 0x04, 0x6a, 0x19, 0x94, 0x98, 0x9b, 0xc8, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2386 + 0xff, 0xcd, 0x93, 0xef, 0xc6, 0x0d, 0x56, 0xa7, 0xeb, 0x13, 0xd9, 0x30, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2387 + { 0xbc, 0xf2, 0x43, 0x82, 0x09, 0x40, 0x8a, 0x87, 0x25, 0x43, 0x6d, 0xe6, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2388 + 0xbb, 0xa4, 0xb9, 0x44, 0x58, 0x3f, 0x21, 0x7c, 0x99, 0xbb, 0x3f, 0x24, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2389 + { 0xec, 0x1a, 0xaa, 0xcd, 0xce, 0xbd, 0x53, 0x11, 0xd2, 0xfb, 0x83, 0xb6, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2390 + 0xc3, 0xba, 0xab, 0x4f, 0x62, 0x79, 0xe8, 0x65, 0xa9, 0x92, 0x28, 0x76, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2391 + { 0xc6, 0x0c, 0x30, 0x03, 0x91, 0x18, 0x2d, 0x7b, 0x79, 0xda, 0xe1, 0xd5, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2392 + 0x64, 0x77, 0x9a, 0x12, 0xc5, 0xb1, 0xd7, 0x91, 0x4f, 0x96, 0x4c, 0xa3, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2393 + { 0xd7, 0x7c, 0x2a, 0xbf, 0xa6, 0xe7, 0x85, 0x7c, 0x45, 0xad, 0xff, 0x12, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2394 + 0x94, 0xd8, 0xde, 0xa4, 0x5c, 0x3d, 0x79, 0xa4, 0x44, 0x02, 0x5d, 0x22, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2395 + { 0x16, 0x19, 0x0d, 0x81, 0x6a, 0x4c, 0xc7, 0xf8, 0xb8, 0xf9, 0x4e, 0xcd, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2396 + 0x2c, 0x9e, 0x90, 0x84, 0xb2, 0x08, 0x25, 0x60, 0xe1, 0x1e, 0xae, 0x18, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2397 + { 0xe9, 0x7c, 0x58, 0x26, 0x1b, 0x51, 0x9e, 0x49, 0x82, 0x60, 0x61, 0xfc, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2398 + 0xa0, 0xa0, 0x1b, 0xcd, 0xf5, 0x05, 0xd6, 0xa6, 0x6d, 0x07, 0x88, 0xa3, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2399 + { 0x2b, 0x97, 0x11, 0x8b, 0xd9, 0x4e, 0xd9, 0xdf, 0x20, 0xe3, 0x9c, 0x10, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2400 + 0xe6, 0xa1, 0x35, 0x21, 0x11, 0xf9, 0x13, 0x0d, 0x0b, 0x24, 0x65, 0xb2, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2401 + { 0x53, 0x6a, 0x4c, 0x54, 0xac, 0x8b, 0x9b, 0xb8, 0x97, 0x29, 0xfc, 0x60, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2402 + 0x2c, 0x5b, 0x3a, 0x85, 0x68, 0xb5, 0xaa, 0x6a, 0x44, 0xcd, 0x3f, 0xa7, }, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2403 +}; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2404 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2405 +#define BF_ENC(X,S) \ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2406 + (((S[0][X>>24] + S[1][X>>16 & 0xff]) ^ S[2][(X>>8) & 0xff]) + S[3][X & 0xff]) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2407 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2408 +static void bf_enc(uint32_t *x, bf_key *key) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2409 +{ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2410 + uint32_t Xl; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2411 + uint32_t Xr; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2412 + uint32_t temp; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2413 + int i; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2414 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2415 + Xl = x[0]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2416 + Xr = x[1]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2417 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2418 + for (i = 0; i < BF_ROUNDS; ++i) { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2419 + Xl ^= key->p[i]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2420 + Xr ^= BF_ENC(Xl,key->s); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2421 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2422 + temp = Xl; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2423 + Xl = Xr; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2424 + Xr = temp; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2425 + } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2426 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2427 + Xl ^= key->p[BF_ROUNDS]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2428 + Xr ^= key->p[BF_ROUNDS + 1]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2429 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2430 + x[0] = Xr; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2431 + x[1] = Xl; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2432 +} |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2433 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2434 +static void bf_setkey(const unsigned char *kp, int keybytes, bf_key *key) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2435 +{ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2436 + int i; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2437 + int j; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2438 + int k; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2439 + uint32_t data; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2440 + uint32_t d[2]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2441 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2442 + memcpy(key->p, bf_pinit, sizeof(key->p)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2443 + memcpy(key->s, bf_sinit, sizeof(key->s)); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2444 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2445 + j = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2446 + for (i = 0; i < BF_ROUNDS + 2; ++i) { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2447 + data = 0x00000000; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2448 + for (k = 0; k < 4; ++k) { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2449 + data = (data << 8) | kp[j]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2450 + j = j + 1; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2451 + if (j >= keybytes) { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2452 + j = 0; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2453 + } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2454 + } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2455 + key->p[i] ^= data; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2456 + } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2457 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2458 + d[0] = 0x00000000; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2459 + d[1] = 0x00000000; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2460 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2461 + for (i = 0; i < BF_ROUNDS + 2; i += 2) { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2462 + bf_enc(d, key); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2463 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2464 + key->p[i] = d[0]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2465 + key->p[i + 1] = d[1]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2466 + } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2467 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2468 + for (i = 0; i < 4; ++i) { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2469 + for (j = 0; j < 256; j += 2) { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2470 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2471 + bf_enc(d, key); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2472 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2473 + key->s[i][j] = d[0]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2474 + key->s[i][j + 1] = d[1]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2475 + } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2476 + } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2477 +} |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2478 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2479 +static void rtmpe9_sig(uint8_t *in, uint8_t *out, int keyid) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2480 +{ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2481 + uint32_t d[2]; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2482 + bf_key key; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2483 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2484 + bf_setkey(rtmpe9_keys[keyid], KEYBYTES, &key); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2485 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2486 + /* input is little-endian */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2487 + d[0] = in[0] | (in[1] << 8) | (in[2] << 16) | (in[3] << 24); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2488 + d[1] = in[4] | (in[5] << 8) | (in[6] << 16) | (in[7] << 24); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2489 + bf_enc(d, &key); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2490 + out[0] = d[0] & 0xff; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2491 + out[1] = (d[0] >> 8) & 0xff; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2492 + out[2] = (d[0] >> 16) & 0xff; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2493 + out[3] = (d[0] >> 24) & 0xff; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2494 + out[4] = d[1] & 0xff; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2495 + out[5] = (d[1] >> 8) & 0xff; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2496 + out[6] = (d[1] >> 16) & 0xff; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2497 + out[7] = (d[1] >> 24) & 0xff; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2498 +} |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2499 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2500 static int |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2501 HandShake(RTMP * r, int FP9HandShake) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2502 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2503 @@ -605,8 +936,7 @@ HandShake(RTMP * r, int FP9HandShake) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2504 for (i=0; i<SHA256_DIGEST_LENGTH; i+=8) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2505 rtmpe8_sig(sig+i, sig+i, dptr[i] % 15); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2506 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2507 -#if 0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2508 - else if (type == 9)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2509 + else if (type == 9) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2510 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2511 uint8_t *dptr = digestResp; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2512 uint8_t *sig = signatureResp; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2513 @@ -615,7 +945,6 @@ HandShake(RTMP * r, int FP9HandShake) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2514 rtmpe9_sig(sig+i, sig+i, dptr[i] % 15); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2515 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2516 #endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2517 -#endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2518 RTMP_Log(RTMP_LOGDEBUG, "%s: Client signature calculated:", __FUNCTION__); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2519 RTMP_LogHex(RTMP_LOGDEBUG, signatureResp, SHA256_DIGEST_LENGTH); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2520 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2521 @@ -680,7 +1009,6 @@ HandShake(RTMP * r, int FP9HandShake) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2522 for (i=0; i<SHA256_DIGEST_LENGTH; i+=8) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2523 rtmpe8_sig(sig+i, sig+i, dptr[i] % 15); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2524 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2525 -#if 0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2526 else if (type == 9) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2527 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2528 uint8_t *dptr = digest; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2529 @@ -690,7 +1018,6 @@ HandShake(RTMP * r, int FP9HandShake) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2530 rtmpe9_sig(sig+i, sig+i, dptr[i] % 15); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2531 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2532 #endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2533 -#endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2534 RTMP_Log(RTMP_LOGDEBUG, "%s: Signature calculated:", __FUNCTION__); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2535 RTMP_LogHex(RTMP_LOGDEBUG, signature, SHA256_DIGEST_LENGTH); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2536 if (memcmp |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2537 @@ -964,8 +1291,7 @@ SHandShake(RTMP * r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2538 for (i=0; i<SHA256_DIGEST_LENGTH; i+=8) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2539 rtmpe8_sig(sig+i, sig+i, dptr[i] % 15); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2540 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2541 -#if 0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2542 - else if (type == 9)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2543 + else if (type == 9) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2544 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2545 uint8_t *dptr = digestResp; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2546 uint8_t *sig = signatureResp; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2547 @@ -974,7 +1300,6 @@ SHandShake(RTMP * r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2548 rtmpe9_sig(sig+i, sig+i, dptr[i] % 15); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2549 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2550 #endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2551 -#endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2552 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2553 /* some info output */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2554 RTMP_Log(RTMP_LOGDEBUG, |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2555 @@ -1030,17 +1355,15 @@ SHandShake(RTMP * r) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2556 for (i=0; i<SHA256_DIGEST_LENGTH; i+=8) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2557 rtmpe8_sig(sig+i, sig+i, dptr[i] % 15); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2558 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2559 -#if 0 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2560 - else if (type == 9)) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2561 + else if (type == 9) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2562 { |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2563 - uint8_t *dptr = digestResp; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2564 - uint8_t *sig = signatureResp; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2565 + uint8_t *dptr = digest; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2566 + uint8_t *sig = signature; |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2567 /* encrypt signatureResp */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2568 for (i=0; i<SHA256_DIGEST_LENGTH; i+=8) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2569 rtmpe9_sig(sig+i, sig+i, dptr[i] % 15); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2570 } |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2571 #endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2572 -#endif |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2573 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2574 /* show some information */ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2575 RTMP_Log(RTMP_LOGDEBUG, "%s: Digest key: ", __FUNCTION__); |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2576 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2577 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2578 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2579 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2580 From be0590a86af80df528e3556b86f110ad4b5cbb27 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2581 From: Howard Chu <hyc@symas.com> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2582 Date: Mon, 11 Jul 2011 16:41:28 -0700 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2583 Subject: [PATCH 31/34] Add LIB_RTMP macro |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2584 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2585 Allows changing to static linking on the cmd line |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2586 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2587 Makefile | 3 ++- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2588 1 file changed, 2 insertions(+), 1 deletion(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2589 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2590 diff --git a/Makefile b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2591 index c322e9a..1597be8 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2592 --- a/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2593 +++ b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2594 @@ -35,7 +35,8 @@ MANDIR=$(DESTDIR)$(mandir) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2595 LIBS_posix= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2596 LIBS_darwin= |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2597 LIBS_mingw=-lws2_32 -lwinmm -lgdi32 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2598 -LIBS=-Llibrtmp -lrtmp $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2599 +LIB_RTMP=-Llibrtmp -lrtmp |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2600 +LIBS=$(LIB_RTMP) $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2601 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2602 THREADLIB_posix=-lpthread |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2603 THREADLIB_darwin=-lpthread |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2604 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2605 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2606 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2607 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2608 From 4028a5aa7f72cac44a62b4aac596ff3c82e6e019 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2609 From: Howard Chu <hyc@symas.com> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2610 Date: Mon, 11 Jul 2011 17:19:25 -0700 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2611 Subject: [PATCH 32/34] Additional credit for RTMPE 9 keys |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2612 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2613 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2614 README | 5 +++-- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2615 1 file changed, 3 insertions(+), 2 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2616 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2617 diff --git a/README b/README |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2618 index 5689853..865c6c4 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2619 --- a/README |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2620 +++ b/README |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2621 @@ -1,7 +1,8 @@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2622 -RTMP Dump v2.3 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2623 +RTMP Dump v2.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2624 (C) 2009 Andrej Stepanchuk |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2625 -(C) 2009-2010 Howard Chu |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2626 +(C) 2009-2011 Howard Chu |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2627 (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2628 +(C) 2011 33ae1ce77301f4b4494faaa5f609f3c48b9dcf82 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2629 License: GPLv2 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2630 librtmp license: LGPLv2.1 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2631 http://rtmpdump.mplayerhq.hu/ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2632 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2633 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2634 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2635 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2636 From 3121324046e4ca1934e7e28293fc8326475d5053 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2637 From: Howard Chu <hyc@symas.com> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2638 Date: Mon, 11 Jul 2011 17:22:43 -0700 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2639 Subject: [PATCH 33/34] Version bump |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2640 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2641 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2642 Makefile | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2643 librtmp/Makefile | 2 +- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2644 2 files changed, 2 insertions(+), 2 deletions(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2645 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2646 diff --git a/Makefile b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2647 index 1597be8..6ef5742 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2648 --- a/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2649 +++ b/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2650 @@ -1,4 +1,4 @@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2651 -VERSION=v2.3 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2652 +VERSION=v2.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2653 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2654 prefix=/usr/local |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2655 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2656 diff --git a/librtmp/Makefile b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2657 index 785e869..d61e7a4 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2658 --- a/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2659 +++ b/librtmp/Makefile |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2660 @@ -1,4 +1,4 @@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2661 -VERSION=v2.3 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2662 +VERSION=v2.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2663 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2664 prefix=/usr/local |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2665 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2666 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2667 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2668 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2669 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2670 From c28f1bab7822de97353849e7787b59e50bbb1428 Mon Sep 17 00:00:00 2001 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2671 From: Howard Chu <hyc@symas.com> |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2672 Date: Mon, 11 Jul 2011 17:24:33 -0700 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2673 Subject: [PATCH 34/34] v2.4 changes |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2674 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2675 --- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2676 ChangeLog | 5 ++++- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2677 1 file changed, 4 insertions(+), 1 deletion(-) |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2678 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2679 diff --git a/ChangeLog b/ChangeLog |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2680 index f57c580..fb2319f 100644 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2681 --- a/ChangeLog |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2682 +++ b/ChangeLog |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2683 @@ -1,9 +1,12 @@ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2684 RTMPDump |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2685 Copyright 2008-2009 Andrej Stepanchuk; Distributed under the GPL v2 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2686 -Copyright 2009-2010 Howard Chu |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2687 +Copyright 2009-2011 Howard Chu |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2688 Copyright 2009 The Flvstreamer Team |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2689 http://rtmpdump.mplayerhq.hu/ |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2690 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2691 +11 July 2011, v2.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2692 +- add RTMPE type 9 handshake support |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2693 + |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2694 30 June 2010, v2.3 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2695 - fix RC4 cleanup for GnuTLS/gcrypt |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2696 - declare RTMP_Write buf as const |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2697 -- |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2698 1.7.10.4 |
5136e4e6e487
package librtmp: update to v2.4 and beyond
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2699 |