Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavformat/rtmpproto.c
AgeCommit message (Collapse)Author
2017-05-07rtmpproto: send swfverify value as swfurl if latter is unusedRicardo Constantino
Replicates lavf/librtmp.c behavior in L149-156 and rtmpdump's behavior with "--swfVfy <url>" passing the url to swfUrl. Fixes trac ticket #5549. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-29Merge commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6'Clément Bœsch
* commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6': rtmpproto: Restructure zlib code to avoid unreachable code warning Merged-by: Clément Bœsch <u@pkh.me>
2017-03-27Merge commit 'c541a44e029e8a4f21db028c34fee3ad1c10a409'Clément Bœsch
* commit 'c541a44e029e8a4f21db028c34fee3ad1c10a409': Revert "rtmpproto: Don't include a client version in the unencrypted C1 handshake" Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23Merge commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1'Clément Bœsch
* commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1': rtmpproto: Don't include a client version in the unencrypted C1 handshake Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23Merge commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56'Clément Bœsch
* commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56': rtmpproto: Don't include the libavformat version as "clientid" Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23Merge commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830'Clément Bœsch
* commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830': rtmpproto: Send chunk size on the network channel Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23Merge commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe'Clément Bœsch
* commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe': rtmpproto: Lengthen the filename buffer when receiving streams Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23Merge commit '7395784ba72742b6daa62d35db4028e09f3fdf06'Clément Bœsch
* commit '7395784ba72742b6daa62d35db4028e09f3fdf06': rtmpproto: Check the return from ff_amf_read_string Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22avformat/rtmpproto: change rtmp_open from url_open to url_open2Steven Liu
use the option set by user Reported-by: Lancelot Lai <laihy23@gmail.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-01-25lavf/rtmpproto: Make bytes_read variables 64bit.Carl Eugen Hoyos
When bytes_read overflowed, last_bytes_read did not yet overflow and no bytes-read report was created leading to a timeout. Analyzed-by: Thomas Bernhard Fixes ticket #5836.
2016-11-02rtmpproto: Restructure zlib code to avoid unreachable code warningDiego Biurrun
libavformat\rtmpproto.c(1165) : warning C4702: unreachable code
2016-10-30Revert "rtmpproto: Don't include a client version in the unencrypted C1 ↵Luca Barbato
handshake" This reverts commit 7d8d726be7dc46343ab1c98c339c1ed44bcb07c1.
2016-10-21avformat/rtmpproto: Fix RTMP control message handling error in listen mode.Hiroyuki OYAMA
Fix problem to fail by a RTMP Control Message except "Set Chunk Size (1)" after an RTMP handshake. When 'nginx-rtmp-module' relays an RTMP, it sends not only control message 'Set Chunk Size (1)' but also 'Window Acknowledgement Size (5)'. Reviewed-by: Steven Liu <lingjiujianke@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-10-14rtmpproto: Don't include a client version in the unencrypted C1 handshakeMartin Storsjö
According to the public RTMP specification, these 4 bytes should be zero. librtmp in server mode assumes that the RTMPE (FP9) handshake is used if these bytes are nonzero. Signed-off-by: Martin Storsjö <martin@martin.st>
2016-10-14rtmpproto: Don't include the libavformat version as "clientid"Martin Storsjö
When acting as server, the server can include a "clientid" property in some status messages. But this should be a unique number identifying the client session, not identifying the server itself. In practice, omitting it works just as well as including this incorrect field. Signed-off-by: Martin Storsjö <martin@martin.st>
2016-10-14rtmpproto: Send chunk size on the network channelMartin Storsjö
This makes sure that e.g. Adobe FME actually reacts to it. As long as the value we've been sending is the default one (128), the bug hasn't been noticed. Signed-off-by: Martin Storsjö <martin@martin.st>
2016-10-14rtmpproto: Lengthen the filename buffer when receiving streamsMartin Storsjö
Some applications such as Adobe FME append lots of parameters here, making it easily overflow the current limit. Signed-off-by: Martin Storsjö <martin@martin.st>
2016-10-14rtmpproto: Check the return from ff_amf_read_stringMartin Storsjö
If this failed, we used to continue with an uninitialized filename buffer. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-04-21Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'Derek Buitenhuis
* commit 'fab8156b2f30666adabe227b3d7712fd193873b1': avio: Copy URLContext generic options into child URLContexts Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-03-24avio: Copy URLContext generic options into child URLContextsMartin Storsjö
Since all URLContexts have the same AVOptions, such AVOptions will be applied on the outermost context only and removed from the dict, while they probably make sense on all contexts. This makes sure that rw_timeout gets propagated to the innermost URLContext (to make sure it gets passed to the tcp protocol, when opening a http connection for instance). Alternatively, such matching options would be kept in the dict and only removed after the ffurl_connect call. Signed-off-by: Martin Storsjö <martin@martin.st>
2016-03-04avformat: Add a protocol blacklisting APIDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-29Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'Derek Buitenhuis
This commit also disables the async fate test, because it used internal APIs in a non-kosher way, which no longer exists. * commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d': lavf: reorganize URLProtocols Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-22urlprotocol: receive a list of protocols from the callerAnton Khirnov
This way, the decisions about which protocols are available for use in any given situations can be delegated to the caller.
2016-02-22lavf: reorganize URLProtocolsAnton Khirnov
Instead of a linked list constructed at av_register_all(), store them in a constant array of pointers. Since no registration is necessary now, this removes some global state from lavf. This will also allow the urlprotocol layer caller to limit the available protocols in a simple and flexible way in the following commits.
2016-02-02Update demuxers and protocols for protocol whitelist supportMichael Niedermayer
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-01-01Merge commit '64f8c439fd663fec4d57ac21af572d498fe21f7a'Hendrik Leppkes
* commit '64f8c439fd663fec4d57ac21af572d498fe21f7a': rtmpproto: Include the full path as app when "slist=" is found Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-14rtmpproto: Include the full path as app when "slist=" is foundMartin Storsjö
This matches what librtmp does. This fixes automatic url parsing of crunchyroll urls. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-10-14Merge commit 'e55376a1fd5abebbb0a082aa20739d58c2260a37'Hendrik Leppkes
* commit 'e55376a1fd5abebbb0a082aa20739d58c2260a37': rtmpproto: Write correct flv packet sizes at the end of packets Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-14rtmpproto: Write correct flv packet sizes at the end of packetsMichael Niedermayer
In one case it was written as zero, one case left it uninitialized, missed the 11 bytes for the flv header. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-10-02avformat/rtmpproto: Fix 2 more cases of the 2nd packet size being wrongMichael Niedermayer
This should fix RTMP input which was broken by cbbd906be6150be38dfc14b6bc67dcac8da8aea4 the 40 + 11 case is untested as it did not occur in the testcase Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-16avformat/rtmpproto: Fix 2nd packet sizeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-30rtmpproto: free hmac context properlyJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
2015-07-30avformat/rtmpproto: free hmac context properlyJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-29rtmpproto: use AVHMAC instead of a custom implementationJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
2015-07-29avformat/rtmpproto: use AVHMAC instead of a custom implementationJames Almer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-01avformat/rtmpproto: increase hardcoded url/path lengthsPaul B Mahol
Fixes #4103. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-04-20Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-19Replace av_dlog with normal av_log at trace levelVittorio Giovara
This applies to every library where performance is not critical.
2014-12-22avformat/rtmpproto: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-29Merge commit '491805636cef50d3f582bd345e1460eeb739ea48'Michael Niedermayer
* commit '491805636cef50d3f582bd345e1460eeb739ea48': rtmpproto: Fix a typo in a comment Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-28rtmpproto: Fix a typo in a commentMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-28Merge commit '01eac895ab350027467ffbe7278740f89ae8be75'Michael Niedermayer
* commit '01eac895ab350027467ffbe7278740f89ae8be75': rtmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccess Conflicts: libavformat/rtmpproto.c See: 60fd790f381cd404ffdafa8a86a6dc93c9d80f99 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-28Merge commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352'Michael Niedermayer
* commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352': rtmpproto: Simplify code for copying data into the output packet Conflicts: libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-28Merge commit '857e6667f9061ae261c0b951113e4efc4329b05e'Michael Niedermayer
* commit '857e6667f9061ae261c0b951113e4efc4329b05e': rtmpproto: Clarify a comment Conflicts: libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-28rtmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccessMartin Storsjö
Currently, when streaming to an RTMP server, any time a packet of type RTMP_PT_NOTIFY is encountered, the packet is prepended with @setDataFrame before it gets sent to the server. This is incorrect; only packets for onMetaData and |RtmpSampleAccess should invoke @setDataFrame on the RTMP server. Specifically, the current bug manifests itself when trying to stream onTextData or onCuePoint invocations. This fix addresses that problem and ensures that the @setDataFrame is only prepended for onMetaData and |RtmpSampleAccess. Since data is fed to the rtmp_write function in smaller pieces (depending on the calling IO buffer size), we can't generally assume that the whole packet (or even the whole command string) is available at once, therefore we can only check the command string once the full packet has been transferred to us for sending. Based on a patch by Jeffrey Wescott. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-28rtmpproto: Simplify code for copying data into the output packetMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-28rtmpproto: Clarify a commentMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-24avformat/rtmpproto: only prepend @setMetaData for onMetaData and ↵Jeffrey Wescott
|RtmpSampleAccess In current versions of ffmpeg, when streaming to an RTMP server, anytime a packet of type RTMP_PT_NOTIFY is encountered, the packet is prepended with @setDataFrame before it gets sent to the server. This is incorrect; only packets for onMetaData and |RtmpSampleAccess should invoke @setDataFrame on the RTMP server. Specifically, the current bug manifests itself when trying to stream onTextData or onCuePoint invocations. This fix addresses that problem and ensures that the @setDataFrame is only prepended for onMetaData and |RtmpSampleAccess. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 09:32:12 +0300