virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
26,230 Commits 37 Branches 400 Tags 465 MiB
2344dc6bb6
Commit Graph

300 Commits

Author SHA1 Message Date
Martin Storsjö
5fe8021a6a rtsp/sdp: Move code into correct ifdefs 
This makes the code dependencies correct. Previously, the SDP demuxer
wasn't buildable on its own.

This also reverts rev 25343.

Originally committed as revision 25354 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 19:46:25 +00:00
Diego Biurrun
a44da176ac Remove some pointless CONFIG_RTSP_DEMUXER #ifdefs. 
They reside within a large CONFIG_RTSP_DEMUXER block and are thus pointless.

Originally committed as revision 25343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 11:06:32 +00:00
Diego Biurrun
2e802e3855 Add some #endif comments to ease understanding. 
Originally committed as revision 25342 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 11:03:48 +00:00
Martin Storsjö
d7810f4541 rtsp: In the muxer, show the generated with verbose log level 
It is only useful for debugging, so it doesn't have to be shown every time.

Originally committed as revision 25323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 11:56:38 +00:00
Martin Storsjö
6ecd741713 rtsp: Show the received SDP 
Originally committed as revision 25322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 11:55:16 +00:00
Martin Storsjö
321259c1ab rtsp: Return a queued packet if it has been in the queue for longer than max_delay 
Originally committed as revision 25295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:52:26 +00:00
Martin Storsjö
58ee09911e rtpdec: Reorder received RTP packets according to the seq number 
Reordering is enabled only when receiving over UDP.

Originally committed as revision 25294 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:50:24 +00:00
Martin Storsjö
c690fa97e5 Reindent/rewrap 
Originally committed as revision 25291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:44:53 +00:00
Martin Storsjö
38f8c80b62 rtsp: Reorganize if statements in rtsp_read_play 
Originally committed as revision 25290 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:44:18 +00:00
Martin Storsjö
ad4ad27fb6 rtsp/rtpdec: Allow rtp_parse_packet to take ownership of the packet buffer 
Do the same change for ff_rdt_parse_packet, too, to keep the interfaces
similar.

Originally committed as revision 25289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:43:27 +00:00
Martin Storsjö
96a7c9753e rtsp: Use a dynamically allocated receive buffer 
Originally committed as revision 25288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:41:31 +00:00
Martin Storsjö
160918d588 rtsp: Handle standard assigned codec names for private payload types, too 
Originally committed as revision 25126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-15 17:39:25 +00:00
Ronald S. Bultje
7bac991fd9 Reindent after r25032. 
Originally committed as revision 25033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 19:26:27 +00:00
John Wimer
619298a84d Send NAT punching messages to the address specified in the Transport: 
message, if available (RFC 2326, section 12.39), fixes issue 2212.

Patch by John Wimer <john at god vtic net>.

Originally committed as revision 25032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 19:25:59 +00:00
Martin Storsjö
744a882f6c rtsp: 10l, try to update the correct rtp stream 
This fixes a bug from rev 22917. Now RTSP streams where the individual RTCP
sender reports aren't sent at the same time actually are synced properly.

Originally committed as revision 25029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 07:10:21 +00:00
Josh Allmann
b20359f51a rtsp: Return AVERROR_EOF when all streams have received an RTCP BYE packet 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 10:25:16 +00:00
Josh Allmann
a1ba71aace rtsp: Check the RTCP file handle for new packets, too 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 10:16:54 +00:00
Martin Storsjö
7934b15d5a Handle IPv6 in the RTSP code 
Originally committed as revision 24925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 15:32:29 +00:00
Martin Storsjö
3fbd12d109 Handle IPv6 in the SDP demuxer 
Originally committed as revision 24924 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 15:32:00 +00:00
Martin Storsjö
2401660d2f rtsp: Return EOF if the TCP control channel is closed 
Originally committed as revision 24920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 13:42:17 +00:00
Ronald S. Bultje
27014bf5a3 Send OPTIONS request at a regular basis to standard RTSP servers as well, 
this prevents a time-out which closes the TCP connection and kills our
session.

see "Re: [FFmpeg-devel] [PATCH] rtsp.c: keep-alive" thread on mailinglist.

Originally committed as revision 24785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-12 13:39:38 +00:00
Aurelien Jacobs
be73ba2fa4 get rid of MAX_STREAMS limit in RTSP 
Originally committed as revision 24752 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-09 23:00:13 +00:00
Reinhard Tartler
2901cc9a95 Fix spelling in comment(s) 
Originally committed as revision 24737 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 14:11:43 +00:00
Josh Allmann
91af5601c1 Add RTP packetization of Theora and Vorbis 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 11:16:07 +00:00
Luca Barbato
d93fdcbf5c Preserve status reason 
It is used to provide meaningful error messages.

Originally committed as revision 24714 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-06 10:26:30 +00:00
Martin Storsjö
965a3ddb1f Remove mostly unnecessary rtpdec_*.h files, store the declarations in one file 
Originally committed as revision 24596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-30 12:04:27 +00:00
Martin Storsjö
2845006608 rtsp: Move the definition of SDP_MAX_SIZE up, use it in the RTSP muxer, too 
Originally committed as revision 24571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-28 09:26:15 +00:00
Axel Holzinger
354b757300 Zero-initialize structs/arrays with {0} instead of {}, which isn't proper C99 
Patch by Axel Holzinger, aholzinger at gmx dot de

Originally committed as revision 24391 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 17:27:28 +00:00
Luca Barbato
bf55cf19ca Report when a method gets an error status code 
That makes easier understand what went wrong.
In debug mode the whole reply gets printed.

Originally committed as revision 24212 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-12 10:17:20 +00:00
Måns Rullgård
f3bfe388b5 Make ff_url_split() public 
ff_url_split() is retained as an alias, as it was used by ffserver,
to avoid breaking ABI compatibility with it.

Originally committed as revision 23822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-27 14:16:46 +00:00
Josh Allmann
ca937a5508 RTSP, rtpdec: Move RTPPayloadData into rtpdec_mpeg4 and remove all references to rtp_payload_data in rtpdec and rtsp 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23772 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-25 08:02:50 +00:00
Josh Allmann
7fc8ac7fd8 RTSP: Move more SDP/FMTP stuff from rtsp.c to rtpdec_mpeg4.c 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23770 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-25 08:00:05 +00:00
Josh Allmann
9b3788efc3 RTSP: Decouple MPEG-4 and AAC specific parts from rtsp.c 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-25 07:58:38 +00:00
Josh Allmann
30619e6e59 RTSP: Remove skip_spaces in favor of strspn 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23768 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-25 07:56:45 +00:00
Martin Storsjö
9290f15d00 Make the http protocol open the connection immediately in http_open again 
Also make the RTSP protocol use url_alloc and url_connect instead of relying
on the delay open behaviour.

Originally committed as revision 23710 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 14:15:00 +00:00
Martin Storsjö
a8ead3322f RTSP: Use the same authentication for the HTTP POST session as for the GET 
Originally committed as revision 23686 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-21 19:41:02 +00:00
Martin Storsjö
10ed37b5d1 RTSP: Add the auth credentials to the HTTP tunnel URL, too 
Originally committed as revision 23651 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-19 21:57:45 +00:00
Martin Storsjö
6217b6451a RTSP: Set the connection handles to null after closing them 
This fixes a potential issue when doing redirects.

Originally committed as revision 23649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-19 21:46:39 +00:00
Josh Allmann
00e4a1f4e2 RTSP: Don't store the connection handles in local variables 
This removes some useless copying of handles, and simplifies error handling.

Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23648 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-19 21:36:13 +00:00
Martin Storsjö
d3f84dfc0e RTSP: Clean up rtsp_hd on failure 
Since rtsp_hd isn't assigned to rt->rtsp_hd until after the setup phase,
the initialized URLContext could be leaked on failures.

Originally committed as revision 23643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-18 17:54:56 +00:00
Martin Storsjö
48e77473e9 Cosmetics: Change connexion to connection in code comments 
Originally committed as revision 23601 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-14 09:09:59 +00:00
Josh Allmann
afcea58c53 RTSP: Shrink SDP fmtp parsing buffer size 
Since the parsing of Vorbis/Theora fmtp headers is handled by the
parse_sdp_a_line function pointer now, the buffer in sdp_parse_fmtp
doesn't need to be this large any longer.

Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23599 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-14 08:23:59 +00:00
Josh Allmann
41874d0a5d Reindent 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23598 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-14 08:12:40 +00:00
Josh Allmann
f5d33f5241 Add RTSP tunneling over HTTP 
Patch by Josh Allmann, joshua dot allmann at gmail dot com

Originally committed as revision 23536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-08 12:40:34 +00:00
Martin Storsjö
fc490fcf71 Cosmetics: Reindent/align/wrap 
Originally committed as revision 23498 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-05 19:49:55 +00:00
Josh Allmann
d0382374b7 RTSP: Propagate errors up from ff_rtsp_send_cmd* 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-05 19:45:46 +00:00
Martin Storsjö
c453d1bb8c Remove unused local variables 
Originally committed as revision 23496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-05 19:43:57 +00:00
Josh Allmann
b8c2c41d66 RTSP: Add a second URLContext for outgoing messages 
Done in preparation for RTSP over HTTP.
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-05 19:41:43 +00:00
Martin Storsjö
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
Stefano Sabatini
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