Luca Barbato
fbd54827b1
rtmp: Unbreak handle_notify
...
Commit 5626f994f2
2013-09-19 11:27:21 +02:00
Michael Niedermayer
20dfab33f5
Merge commit ' 5626f994f2'
...
* commit '5626f994f2
2013-09-19 11:01:26 +02:00
Luca Barbato
ae0f316a47
rtmp: Unbreak handle_notify
...
Commit 5626f994f2
2013-09-19 09:13:04 +02:00
Alexandra Khirnova
5626f994f2
avformat: Use av_reallocp() where suitable
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-09-18 18:28:38 +02:00
Michael Niedermayer
4131a3cb58
Merge commit ' 8583b14252'
...
* commit '8583b14252
2013-09-18 12:09:06 +02:00
Michael Niedermayer
c1840cbdbe
Merge commit ' dc4acc8200'
...
* commit 'dc4acc8200
2013-09-18 11:09:31 +02:00
Michael Niedermayer
e81411e88e
Merge commit ' 647d655d19'
...
* commit '647d655d19
2013-09-18 11:00:51 +02:00
Michael Niedermayer
7742edc03b
Merge commit ' 0d3784396b'
...
* commit '0d3784396b
2013-09-18 10:50:54 +02:00
Josh Allmann
8583b14252
rtmp: Support reading interleaved chunks.
...
A given packet won't always come in contiguously; sometimes
they may be broken up on chunk boundaries by packets of another
channel.
This support primarily involves tracking information about the
data that's been read, so the reader can pick up where it left
off for a given channel.
As a side effect, we no longer over-report the bytes read if
(toread = MIN(size, chunk_size)) == size
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 23:19:11 +03:00
Martin Storsjö
dc4acc8200
rtmpproto: Extend a comment to explain the prev_pkt arrays roles
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 20:09:25 +03:00
Martin Storsjö
647d655d19
rtmpproto: Consistently use the right prev_pkt array
...
prev_pkt[0] is used for input packets, while prev_pkt[1] is
used for output.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 20:09:24 +03:00
Martin Storsjö
0d3784396b
rtmpproto: Check for the right return code
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 20:09:22 +03:00
Michael Niedermayer
01b4689d20
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtmp: rename main_channel_id to stream_id.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-17 13:03:50 +02:00
Michael Niedermayer
208f9dd2ef
Merge commit ' d4aef99780'
...
* commit 'd4aef99780
2013-09-17 12:57:19 +02:00
Michael Niedermayer
c71541d42a
Merge commit ' 120af23cd5'
...
* commit '120af23cd5
2013-09-17 12:52:25 +02:00
Michael Niedermayer
a275ff7e01
Merge commit ' 92ed83e393'
...
* commit '92ed83e393
2013-09-17 11:39:45 +02:00
Michael Niedermayer
9589b61904
Merge commit ' fe0337e89b'
...
* commit 'fe0337e89b
2013-09-17 11:34:30 +02:00
Michael Niedermayer
c9eb2ce085
Merge commit ' 666ed7eda1'
...
* commit '666ed7eda1
2013-09-17 11:28:16 +02:00
Michael Niedermayer
953a4191b8
Merge commit ' ffb7669e47'
...
* commit 'ffb7669e47
2013-09-17 11:22:54 +02:00
Michael Niedermayer
0483cfe8ca
Merge commit ' 97d35fa89f'
...
* commit '97d35fa89f
2013-09-17 11:17:11 +02:00
Josh Allmann
f8d1bb6723
rtmp: rename main_channel_id to stream_id.
...
This more closely corresponds to the usage of the field.
Its usage here is unrelated to the channel ID.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 11:03:36 +03:00
Josh Allmann
d4aef99780
rtmp: Follow Flash player numbering for channels.
...
Channel 4 is typically used by the Flash player to transmit
audio, channel 6 for video, and various stream-specific invokes
get sent over channel 8, which is designated the source channel.
This more closely matches the behavior of the Flash player,
including the transmission of play requests over channel 8.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 11:03:36 +03:00
Josh Allmann
120af23cd5
rtmp: Send video on a separate channel.
...
Sending non-monotonic packets (e.g. when the audio and video
streams are monotonic within themselves but not muxed
monotonically) will lead to negative values the RTMP timestamp
field (where timestamps are transmitted only as deltas for each
channel), and this delta can end up being incorrectly written as
a large unsigned number.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-17 11:03:36 +03:00
Luca Barbato
92ed83e393
rtmp: Store all the notify messages
...
The onTextData is used to implement text data streams in flv.
2013-09-16 19:36:37 +02:00
Luca Barbato
fe0337e89b
rtmp: Do not send the first field twice within the handshake
2013-09-16 19:36:37 +02:00
Luca Barbato
666ed7eda1
rtmp: Drop an unneeded warning
...
Apparently a widely used streaming server requires that the second
field always presents a version during C1 phase.
2013-09-16 19:36:37 +02:00
Luca Barbato
ffb7669e47
rtmp: Support play method in listen mode
2013-09-16 19:36:37 +02:00
Luca Barbato
97d35fa89f
rtmp: Factor out publish specific code
...
Will be reused for supporting play.
2013-09-16 19:36:37 +02:00
Michael Niedermayer
5f9b1aae50
Merge commit ' 6454c44f9f'
...
* commit '6454c44f9f
2013-08-29 13:43:07 +02:00
Martin Storsjö
6454c44f9f
rtmpproto: Fix limelight authentication with abbreviated app names
...
When streaming to limelight, the app name is either a full
"appname/subaccount" or "appname/_definst_". In the latter case,
the app name can be simplified into simply "appname", but the
authentication hashing assumes the /_definst_ still to be present.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-28 17:54:51 +03:00
Michael Niedermayer
15c92f8c48
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtmp: Do not misuse memcmp
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11 11:54:37 +02:00
Michael Niedermayer
6c7a05352f
Merge commit ' 8e1fe34557'
...
* commit '8e1fe34557
2013-08-11 11:17:43 +02:00
Michael Niedermayer
06186a3160
Merge commit ' ba5393a609'
...
* commit 'ba5393a609
2013-08-11 11:11:40 +02:00
Michael Niedermayer
a2b0699f4f
Merge commit ' 4ebc7d659f'
...
* commit '4ebc7d659f
2013-08-11 11:02:37 +02:00
Luca Barbato
5718e3487b
rtmp: Do not misuse memcmp
...
CC: libav-stable@libav.org
2013-08-11 01:19:27 +02:00
Martin Storsjö
8e1fe34557
rtmp: Detect and warn if the user tries to pass librtmp style parameters
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-10 18:37:18 +03:00
Luca Barbato
ba5393a609
rtmp: rename data_size to size
2013-08-10 13:49:09 +02:00
Luca Barbato
4ebc7d659f
rtmp: Use PRId64 when needed.
2013-08-10 13:48:48 +02:00
Michael Niedermayer
8e970a5861
Merge commit ' 0d6fa3977b'
...
* commit '0d6fa3977b
2013-08-03 09:01:48 +02:00
Gavriloaie Eugen-Andrei
0d6fa3977b
rtmp: Add seek support
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-02 20:11:54 +03:00
Michael Niedermayer
4d4f5911d3
Merge commit ' 28306e6d62'
...
* commit '28306e6d62
2013-06-02 10:30:35 +02:00
Kostya Shishkov
de421b2085
use my full first name instead of short one in copyrights
2013-06-01 13:38:50 +02:00
Michael Niedermayer
efc08e00cc
Merge commit ' b3ea76624a'
...
* commit 'b3ea76624a
2013-05-16 09:56:43 +02:00
Diego Biurrun
2832ea26f3
Remove commented-out debug #define cruft
2013-05-16 00:23:30 +02:00
Michael Niedermayer
e7dd0365f2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtmp: Pass the parameters to do_adobe_auth in the right order
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 12:03:53 +01:00
Martin Storsjö
a5e6080a8d
rtmp: Pass the parameters to do_adobe_auth in the right order
...
do_adobe_auth takes the parameters in the order "opaque, challenge".
Due to the way they are treated, this didn't matter in the tested
setups though - if both are set, we only use one. In the tested
setups (Wowza and Akamai) either one of them were null or they
were both set to the same value, which is why this worked before.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-20 12:00:28 +02:00
Michael Niedermayer
da8ef5ac2f
rtmpproto: increase APP_MAX_LENGTH
...
Fixes second part of Ticket2292
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-23 17:24:15 +01:00
Michael Niedermayer
02ac3398eb
rtmpproto: Check APP_MAX_LENGTH
...
Fixes Ticket2292
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-23 17:18:22 +01:00
Michael Niedermayer
6dc8505417
rtmpproto: Fix assignments in if()
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-01-14 13:13:00 +02:00
Michael Niedermayer
a601eb9543
rtmpproto: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14 05:05:42 +01:00
