summaryrefslogtreecommitdiff
path: root/libavformat/rtsp.c
Commit message (Collapse)AuthorAge
...
| * libavformat: Use ffio_free_dyn_buf where applicableMartin Storsjö2015-02-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '078d43e23a7a3d64aafee8a58b380d3e139b3020'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | * commit '078d43e23a7a3d64aafee8a58b380d3e139b3020': rtpdec: Free depacketizers if the init function failed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Free depacketizers if the init function failedMartin Storsjö2015-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is different from how it is handled in codecs/demuxers/muxers though (where the close function isn't called if the open function failed), but since the number of depacketizers that have an .init function is quite limited, this is easy to change. The main point is that if the init function failed, we shouldn't try to use that depacketizer at all - this makes sure that the parse function doesn't need to check for the things that were initialized in the init function. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'bb4a310bb85f43e62240145a656b1e5285b14239'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bb4a310bb85f43e62240145a656b1e5285b14239': rtpdec: Don't free the payload context in the .free function Conflicts: libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_mpegts.c libavformat/rtpdec_xiph.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Don't free the payload context in the .free functionMartin Storsjö2015-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it more consistent with depacketizers that don't have any .free function at all, where the payload context is freed by the surrounding framework. Always free the context in the surrounding framework, having the individual depacketizers only free any data they've specifically allocated themselves. This is similar to how this works for demuxer/muxers/codecs - a component shouldn't free the priv_data that the framework has allocated for it. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f4b59334bd898c47c9ac30999a346176548630a8'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | * commit 'f4b59334bd898c47c9ac30999a346176548630a8': rtpdec: Remove the now unused .alloc field Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Remove the now unused .alloc fieldMartin Storsjö2015-02-24
| | | | | | | | | | | | Always use the .priv_data_size field instead. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e72605f80bf5cbe32053a554ccc137e0a99cf3dd'Michael Niedermayer2015-02-24
|\| | | | | | | | | | | | | * commit 'e72605f80bf5cbe32053a554ccc137e0a99cf3dd': rtpdec: Allow allocating and freeing the private data without explicit functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Allow allocating and freeing the private data without explicit functionsMartin Storsjö2015-02-24
| | | | | | | | | | | | This can reduce the amount of boilerplate in simple depacketizers. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b7a4c319fda22aa91ce29692d728ec6103b514f6'Michael Niedermayer2015-02-24
|\| | | | | | | | | | | | | * commit 'b7a4c319fda22aa91ce29692d728ec6103b514f6': rtpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandler Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandlerMartin Storsjö2015-02-24
| | | | | | | | | | | | | | | | | | | | This allows getting rid of quite a bit of boilerplate in depacketizers. The default value (initializing need_parsing to 0, aka AVSTREAM_PARSE_NONE) is the same as it is initialized to by default in AVStream. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '74d318f138f2a3f1b2fe81aea826d80d1e60f54c'Michael Niedermayer2015-02-24
|\| | | | | | | | | | | | | * commit '74d318f138f2a3f1b2fe81aea826d80d1e60f54c': rtsp: Fix the indentation of a linewrapped statement Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Fix the indentation of a linewrapped statementMartin Storsjö2015-02-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '26524e358147aade6e9dd18fff42d61b966bbc70'Michael Niedermayer2015-02-24
|\| | | | | | | | | | | | | | | * commit '26524e358147aade6e9dd18fff42d61b966bbc70': rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA See: afb0e5a810ae110a69b618e5fbed78a7c1b899f3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Interpret the text media type as AVMEDIA_TYPE_DATAMartin Storsjö2015-02-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'cdcc370293a159c321e41af7f0eef141c62d698d'Michael Niedermayer2015-02-23
|\| | | | | | | | | | | | | | | * commit 'cdcc370293a159c321e41af7f0eef141c62d698d': rtsp: punch holes again after pause See: 22bb5bd7a3b55c25bfef130ad89e8574dd47af1d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: punch holes again after pauseGilles Chanteperdrix2015-02-23
| | | | | | | | | | | | | | | | | | | | | | | | When a client behind a NAT issues a pause command, and stay paused for a long time, the router may stop the RTP/RTCP port redirection. Resend the hole punching packets before each PLAY command to cause the router to restart the port redirection in that case. Move the existing code for sending the packets from the SETUP phase to the PLAY phase. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: parse lang attribute in SDPGilles Chanteperdrix2015-02-21
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/rtsp: parse lang attribute in SDPGilles Chanteperdrix2015-02-13
| | | | | | | | | | Reviewed-by: Thomas Volkert <silvo@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtsp: allow receiving subtitles via RTPGilles Chanteperdrix2015-02-13
| | | | | | | | | | Reviewed-by: Thomas Volkert <silvo@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtsp: Use avio_closep() to avoid leaving stale pointers in memoryMichael Niedermayer2015-01-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtsp: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b'Michael Niedermayer2014-12-19
|\| | | | | | | | | | | | | * commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b': rtsp: check ffurl_get_file_handle() return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: check ffurl_get_file_handle() return valueVittorio Giovara2014-12-18
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 717844
* | Merge commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3'Michael Niedermayer2014-12-02
|\| | | | | | | | | | | | | | | | | | | * commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3': rtsp: move the CONFIG_ macros to the beginning of the check Conflicts: libavformat/rtsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: move the CONFIG_ macros to the beginning of the checkVittorio Giovara2014-12-02
| | | | | | | | | | With --disable-optimizations, the DCE of some compilers does not remove such unused code, causing linking failure.
* | Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea'Michael Niedermayer2014-10-24
|\| | | | | | | | | | | | | | | | | | | | | * commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea': lavf: Use av_gettime_relative Conflicts: libavformat/hls.c See: f78bc96b7c1c74caf99a7139cf81ce1110404965 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Use av_gettime_relativeMartin Storsjö2014-10-24
| | | | | | | | | | | | | | | | | | The ones left using av_gettime are NTP timestamps (for RTCP, which is specified to send the actual current realtime clock in RTCP SR packets), and the NUT muxer timestamper, which is documented as using wallclock time. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Check a memory allocationMichael Lynch2014-10-16
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/rtsp: pass return code from ffurl_open() on its failureAndrey Utkin2014-10-23
| | | | | | | | | | | | | | | | Previously, AVERROR(EIO) was returned. Now the value is passed from lower level, thus it is possible to distinguish ECONNREFUSED, ETIMEDOUT, ENETUNREACH etc. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtsp: add av_assert0() to clarify that the else case is supposed to ↵Michael Niedermayer2014-10-23
| | | | | | | | | | | | | | | | be unreachable If its reachable then theres a bug as err would be uninitialized Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtsp: Use ff_rtsp_averror()Andrey Utkin2014-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtsp: check memory allocationMichael Lynch2014-10-15
| | | | | | | | | | | | Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Commit message by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8b2e9636c57b22582143467a8a06b509b47b92f9'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | | | | | | | * commit '8b2e9636c57b22582143467a8a06b509b47b92f9': rtsp: Support tls-encapsulated RTSP Conflicts: libavformat/rtsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Support tls-encapsulated RTSPLuca Barbato2014-10-10
| |
* | Merge commit '2f172f1ae984b763c06069adb51d0053b3834f4b'Michael Niedermayer2014-09-25
|\| | | | | | | | | | | | | * commit '2f172f1ae984b763c06069adb51d0053b3834f4b': rtsp: Clear the session id on redirects Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Clear the session id on redirectsMartin Storsjö2014-09-24
| | | | | | | | | | | | | | This fixes handling redirects in case the server provided a session id within the redirect reply. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()James Almer2014-08-07
| | | | | | | | | | | | | | The were wrongly being exported and used by libavdevice Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtsp: use av_malloc_array()Michael Niedermayer2014-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix several typosMoritz Barsnick2014-06-20
| |
* | Merge commit 'c385313d2590fd26e26bb9bdacddef78162ab490'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | * commit 'c385313d2590fd26e26bb9bdacddef78162ab490': rtsp: Support misordered fmtp rtpmap Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Support misordered fmtp rtpmapJoshua Kordani2014-06-18
| | | | | | | | Issue present in Avigilon IP cameras.
* | Merge commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | * commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371': rtsp: Factor out fmtp parsing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Factor out fmtp parsingLuca Barbato2014-06-18
| |
* | Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3'Michael Niedermayer2014-05-31
|\| | | | | | | | | | | | | | | * commit 'f797b134cad4d248b1c8955659997980d0668bc3': rtpenc_chain: Don't copy the time base to the source stream by default See: 1fe40e1b0538a8eb8425123c47775b5d141ae084 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_chain: Don't copy the time base to the source stream by defaultMartin Storsjö2014-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only copy it manually in the muxers where it makes sense (rtspenc, sapenc). Don't touch the original AVStream in movenchint, where the original AVStream should be kept untouched. This fixes the normal tracks in RTP hinted files after abb810db - the hint tracks were ok while the normal media tracks were broken, noticed by Michael Niedermayer. This reverts abb810db but achieves the same effect for the other muxers. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat: extracting NTP timestamp from RTCPFred Rothganger2014-03-12
| | | | | | | | | | | | | | | | For muxing, it accepts both 0 and AV_NOPTS_VALUE. For demuxing, it will present AV_NOPTS_VALUE when start_time_realtime is unknown. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add "prefer_tcp" flag to "rtsp_flags"Andrey Utkin2014-03-04
| | | | | | | | | | | | | | If set, and if TCP is available as RTSP RTP transport, then TCP will be tried first as RTP transport. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/protocols/rtsp, lavf/rtsp: fix/extend options documentationStefano Sabatini2014-01-01
| |
* | Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'Michael Niedermayer2013-12-12
|\| | | | | | | | | | | | | | | | | | | | | * commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39': rtsp: suppress a incompatible pointer types warning Conflicts: libavformat/rtsp.c See: 00792322990188b1130ef2befd68ec1d51ab7365 Merged-by: Michael Niedermayer <michaelni@gmx.at>