8d168a9207
Fix a crash when opening WMS RTSP streams
...
Fixes issue 1948
Originally committed as revision 23181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-19 09:46:29 +00:00
2ef6c1242a
Mark av_metadata_set() as deprecated, and use av_metadata_set2()
...
in its place.
av_metadata_set() is going to be dropped at the next major bump.
Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-25 14:27:42 +00:00
5948f82227
Reset RTCP timestamps after seeking, add range start offset to the packets timestamps
...
If these aren't reset, the timestamps make a huge jump when the next RTCP
is received.
Originally committed as revision 22918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 07:38:52 +00:00
2cab6b48ad
Revert svn rev 21857, readd first_rtcp_ntp_time in RTPDemuxContext
...
In order to sync RTP streams that get their initial RTCP timestamp at
different times, propagate the NTP timestamp of the first RTCP packet
to all other streams.
This makes the timestamps of returned packets start at (near) zero instead
of at any random offset.
Originally committed as revision 22917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 07:34:28 +00:00
adef229efb
AVERROR(FF_NETERROR(x)) -> FF_NETERROR(x)
...
FF_NETERROR is implicitly an AVERROR.
Originally committed as revision 22888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-16 00:20:11 +00:00
4aecee7fc3
Fix compile error on mingw where ETIMEDOUT is missing (because it's a WSA error).
...
This patch also changes FF_NETERROR() to be an AVERROR(), i.e. it is always
negative, whereas it was previously positive.
Originally committed as revision 22887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-15 18:27:27 +00:00
3370289a4c
Zero-initialize the reply struct
...
The status_code field is read in the fail codepath, where it could be
read uninitialized earlier. Found by clang.
Originally committed as revision 22801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-04 21:59:06 +00:00
0e64218889
Remove a redundant assignment, found by clang
...
Originally committed as revision 22790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-03 12:16:33 +00:00
f3c68c5b45
ETIME -> ETIMEDOUT. Patch by Sam Gerstein <sgerstein bluefinlab com>.
...
Originally committed as revision 22785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 20:14:55 +00:00
339f5f3957
Merge Vorbis / Theora depayloaders.
...
Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>.
Originally committed as revision 22768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 21:43:22 +00:00
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
32e543f866
Replace @returns by @return.
...
Originally committed as revision 22729 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 15:50:57 +00:00
c2bfd81605
Some spelling fixes.
...
Originally committed as revision 22720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 19:17:49 +00:00
9cba6f5f40
Add a timeout to the select() call. Patch by Sam Gerstein <sgerstein bluefinlab
...
com>.
Originally committed as revision 22718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 17:36:08 +00:00
4bc5cc2313
Reassemble the RTSP URL before replacing hostname with the numerical IP
...
Originally committed as revision 22681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 22:21:09 +00:00
7b4a36450b
Simplify ff_rtsp_send_cmd_with_content_async, remove an unnecessary buffer
...
Originally committed as revision 22680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 22:04:41 +00:00
30af077942
Don't force basic auth in RTSP, but retry with the server-specified method on failure
...
Originally committed as revision 22678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 21:49:43 +00:00
2626308abb
Actually parse the auth headers in RTSP
...
Originally committed as revision 22677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 21:48:58 +00:00
aa8bf2fb80
Make RTSP use the generic http authentication code
...
Still hardcoded to use Basic auth, without parsing the reply headers
Originally committed as revision 22676 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 21:47:33 +00:00
b17d11c632
Add separate method/url parameters to the rtsp_send_cmd functions
...
Originally committed as revision 22675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 21:46:14 +00:00
e9fea405a7
Reindent
...
Originally committed as revision 22672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 19:47:26 +00:00
b1cc5540e7
Make ff_rtsp_send_cmd simply call ff_rtsp_send_cmd_with_content
...
Originally committed as revision 22663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 23:06:58 +00:00
7ed8211b3e
Issue a warning if the received CSeq isn't the expected one
...
Originally committed as revision 22661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 22:38:48 +00:00
3032276b18
Handle errors returned from ff_rtsp_read_reply in udp_read_packet properly
...
Originally committed as revision 22657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 18:52:27 +00:00
7a033e08ea
Handle multiple RTSP transport options properly by adding all of them into the mask
...
Originally committed as revision 22644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 08:00:37 +00:00
602eb77975
Parse options in the RTSP URL only from the last question mark onwards
...
This helps if the URL (erroneously?) contains question marks within the path.
Originally committed as revision 22643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 07:59:23 +00:00
2a21adf924
Reconstruct the RTSP URL, in order to remove the auth part from the URL sent to the server
...
Don't modify the user-specified s->filename at all, keep all modifications
locally and in rt->control_uri.
Originally committed as revision 22642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 07:55:15 +00:00
685e76b554
Reindent
...
Originally committed as revision 22635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 15:07:36 +00:00
b7dc88fc68
Add support for TCP as lower transport in the RTSP muxer
...
Originally committed as revision 22634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 15:07:05 +00:00
6e69f6c47f
Use the caller's RTSPMessageHeader in rtsp_setup_input_streams
...
Currently, the caller doesn't get the status_code and location for rediects,
since rtsp_setup_input_streams uses a copy of RTSPMessageHeader of its own.
Originally committed as revision 22630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 14:42:52 +00:00
ec55edba31
Make rtsp_skip_packet non-static, add ff prefix
...
Originally committed as revision 22547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 16:31:15 +00:00
c040badb70
Reindent
...
Originally committed as revision 22546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 16:15:51 +00:00
c07c6f8183
RTSP: Synchronize the start time of the chained RTP muxers
...
This makes sure that the streams get correctly synchronized when viewed,
previously the streams were out of sync by as much time as it took
between the initialization of the individual muxers.
Originally committed as revision 22545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 14:20:07 +00:00
e4a9e3cc7c
move ff_url_split() and ff_url_join() declarations to internal.h
...
those functions are not part of the public API
Originally committed as revision 22534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 23:59:48 +00:00
5c7fd91010
Cosmetics, break a long line, fix brace placement
...
Originally committed as revision 22465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 08:33:04 +00:00
26cb700c82
RTSP muxer: Create the SDP with the numerical IP of the peer
...
instead of using the original host name
Originally committed as revision 22464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 08:24:18 +00:00
cbfa66d0cf
Include os_support.h which has a fallback declaration of socklen_t
...
This fixes compilation on some OSes
Patch by Dave Yeo, daveryeo at telus dot net
Originally committed as revision 22426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 07:44:51 +00:00
db76ca7f35
Use rt->control_uri consequently instead of s->filename in all RTSP commands
...
Originally committed as revision 22403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 16:04:41 +00:00
03f8fc0897
RTSP: Resolve and use the actual IP address of the peer we're connected to,
...
instead of using the original host name, since the RTP (and UDP) protocols
may choose another IP address if the host name resolves into several different
addresses.
Originally committed as revision 22398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:59:40 +00:00
f984dcf6dd
Reindent
...
Originally committed as revision 22322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 09:05:03 +00:00
c5c6e67c28
Rename url_split to ff_url_split
...
Since this function isn't in the public API, it should have an ff_ prefix.
Originally committed as revision 22321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 09:03:25 +00:00
ac11d562e5
Localize the #define _SVID_SOURCE needed for inet_aton() to os_support.c
...
Originally committed as revision 22284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 19:48:59 +00:00
57b5555c91
Use ff_url_join for assembling URLs, instead of snprintf
...
This ensures proper escaping of numerical IPv6 addresses.
The RTSP (de)muxer needs its own network initialization, since it isn't
a protocol and url_open hasn't been called yet.
Originally committed as revision 22226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 22:35:21 +00:00
f65919af7e
Rename RTP depacketizer files from rtp_* to rtpdec_*
...
Originally committed as revision 22109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 11:03:14 +00:00
9399393333
Cosmetics: reindent
...
Originally committed as revision 21995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 11:05:36 +00:00
3307e6ea86
Prefix non-static RTSP functions with ff_.
...
Originally committed as revision 21974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 00:35:50 +00:00
6f5a3d0a7b
Add an RTSP muxer
...
Originally committed as revision 21971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 21:28:19 +00:00
f86f665623
Free metadata in chained RTP muxers in the RTSP muxer
...
This fixes a minor memory leak
Originally committed as revision 21970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 21:20:30 +00:00
af037f8098
Cosmetics: reindent
...
Originally committed as revision 21969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 19:47:22 +00:00
15ba23150e
Add declarations and doxygen documentation of generic rtsp support functions
...
to rtsp.h, and make the functions non-static
Originally committed as revision 21968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 19:44:08 +00:00
Martin Storsjö
Stefano Sabatini
Ramiro Polla
Ronald S. Bultje
Sam Gerstein
Josh Allmann
Benoit Fouet
Reimar Döffinger
Luca Barbato
Aurelien Jacobs
Dave Yeo
David Conrad