Commit Graph
68 Commits
Author SHA1 Message Date
Martin Storsjö 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
Martin Storsjö 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
Martin Storsjö af037f8098 Cosmetics: reindent
Originally committed as revision 21969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 19:47:22 +00:00
Martin Storsjö 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ö 2efc97c2fe Cosmetics: reindent after applying patches
Originally committed as revision 21967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 16:11:38 +00:00
Martin Storsjö 35cfd6464e Don't follow RTSP redirects when used as a muxer
Originally committed as revision 21966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 15:57:40 +00:00
Martin Storsjö 3e24c7701c Add a function rtsp_setup_output_streams for announcing the SDP
and setting up the internal RTSPStream data structures when using
the RTSP code in muxer mode.

Originally committed as revision 21965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 15:56:18 +00:00
Martin Storsjö fd450a5177 Create AVFormatContext objects as private transport for output RTSP sessions
Originally committed as revision 21964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 15:46:56 +00:00
Martin StorsjöandRonald S. Bultje 4280f9bbcd Split rtsp_read_header() into two functions, so that the main part (now also
known as rtsp_connect()) can be used in the RTSP muxer.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:23:40 +00:00
Martin StorsjöandRonald S. Bultje e23d195deb Split out input-specific parts of rtsp_read_header() into its own, new,
function (rtsp_setup_input_streams()), as preparation for the upcoming
RTSP muxer.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21914 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:21:44 +00:00
Martin StorsjöandRonald S. Bultje 30ff7c5cbc Only send out NAT-punching RTP/RTCP packets when we're in demuxer mode, i.e.
don't send them when acting as a RTSP muxer.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:13:21 +00:00
Martin StorsjöandRonald S. Bultje 69adcc4ffb Use mode=receive instead of mode=play if in RTSP muxer (instead of demuxer)
mode.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:11:59 +00:00
Martin StorsjöandRonald S. Bultje 52aa4338cc Make rtsp_close_streams() take a AVFormatContext instead of a RTSPState
argument, so we can use AVFormatContext->* here in the future.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:10:19 +00:00
Martin StorsjöandRonald S. Bultje 251f050481 Remove stale function declaration.
Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 17:26:33 +00:00
Martin StorsjöandRonald S. Bultje c02fd3d2e8 Rename RTSP_STATE_PLAYING to _STREAMING, since that better covers the
future use of the rtsp* codebase for RTSP muxing.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 16:26:21 +00:00
Martin StorsjöandRonald S. Bultje dfd017bf0a Add functions to send RTSP commands with content attached to them. This will
be used eventually in the RTSP muxer (see thread "[PATCH] RTSP muxer, round
3" on mailinglist).

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21862 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-17 19:24:02 +00:00
Martin StorsjöandRonald S. Bultje 9c8fa20d7e When using RTP-over-UDP, send dummy packets during stream setup, similar to
what e.g. RealPlayer does. This allows proper port forwarding setup in NAT-
based environments.

Patch by Martin Storsjö <$firstname at $firstname dot st>.

Originally committed as revision 21856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-16 22:50:50 +00:00
Martin StorsjöandRamiro Polla 6023d84a2b Load the proper getaddrinfo functions from ws2_32.dll, if they're present.
Patch by Martin Storsjö <martin at martin dot st>.

Originally committed as revision 21443 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-25 01:28:01 +00:00
Martin StorsjöandRamiro Polla 3debf366c8 Check for getaddrinfo in the winsock headers.
This makes us link directly to getaddrinfo if it is available, making
binaries incompatible with anything prior to windows XP. If compatibility
is desired, compile with --target-os=mingw32-prexp.

Patch by Martin Storsjö <martin at martin dot st>.

Originally committed as revision 21442 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-25 01:26:54 +00:00
Martin StorsjöandRamiro Polla d9cd11ad44 Only define _WIN32_WINNT=0x0501 if $target_os = "mingw32".
If compatibility with pre-XP versions is desired, use
--target-os=mingw32-prexp
Patch by Martin Storsjö <martin at martin dot st>.

Originally committed as revision 21441 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-25 01:25:59 +00:00
Martin StorsjöandStefano Sabatini a52ce57d4e Replace deprecated guess_format() with av_guess_format().
Patch by Martin Storsjö reverse(<ts.nitram@nitram>).

Originally committed as revision 21387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 23:09:08 +00:00
Martin StorsjöandRonald S. Bultje 7c823d8b7f Rename a function which is no longer ipv6-specific. Patch by Martin Storsjö
<$firstname () $firstname st>.

Originally committed as revision 21382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 16:10:08 +00:00
Martin StorsjöandBenoit Fouet 073189917e Make output-example.c handle AAC audio.
Patch by Martin Storsjö martin martin st

Originally committed as revision 21367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 17:10:13 +00:00
Martin StorsjöandRonald S. Bultje b4d68544c8 Remove IPv4-only codepath. Patch by Martin Storsjö <$first $first st>.
Originally committed as revision 21365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 15:42:05 +00:00
Martin StorsjöandRonald S. Bultje 3d7b42f97b Use the configure check from r21351 and use it to properly define struct
sockaddr (in case it's not missing) so it always works on the system that
we are defining it for, in a RFC-2553/3493-compliant way (i.e. containing
a ss_family field). which is used in udp.c. Patch by Martin Storsjö
<$firstname $firstname st>.

Originally committed as revision 21352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-20 17:26:14 +00:00
Martin StorsjöandLuca Abeni 51a269cd97 Make sure the destination address is written as an IP address in the SDP
Patch by Martin Storsjo (martin AT martin DOT st)

Originally committed as revision 21163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 10:56:43 +00:00
Martin StorsjöandRonald S. Bultje 5d629b72cb Provide a fallback for getnameinfo() also. Patch by Martin Storsjö
<$firstname()$firstname,st>.

Originally committed as revision 21150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:45:17 +00:00
Martin StorsjöandRonald S. Bultje 34a65f1fdd Implement a fallback for struct sockaddr_storage if not available.
Patch by Martin Storsjö <$firstname()$firstname,st>.

Originally committed as revision 21149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:42:35 +00:00
Martin StorsjöandRonald S. Bultje 33a4dbdd03 Check for struct sockaddr_storage. Patch by Martin Storsjö
<$firstname()$firstname,st>.

Originally committed as revision 21148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:42:15 +00:00
Martin StorsjöandRonald S. Bultje fdcdd5396e Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsjö
<$firstname()$firstname,st>.

Originally committed as revision 21147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:32:40 +00:00
Martin StorsjöandRonald S. Bultje f1888474fa Deprecate resolve_host(). Patch by Martin Storsjö <$firstname()$firstname,st>.
Originally committed as revision 21146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:28:55 +00:00
Martin StorsjöandRonald S. Bultje fa053ca725 Provide fallback implementations of getaddrinfo() and freeaddrinfo().
Patch by Martin Storsjö <$firstname()$firstname,st>.

Originally committed as revision 21145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:27:07 +00:00
Martin StorsjöandRonald S. Bultje c001861351 Check for struct addrinfo availability. Patch by Martin Storsjö
<$firstname()$firstname,st>.

Originally committed as revision 21144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:17:01 +00:00
Martin StorsjöandRonald S. Bultje 84882df62b Check for getaddrinfo(), patch by Martin Storsjö <$firstname()$firstname,st>.
Originally committed as revision 21142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:01:56 +00:00
Martin StorsjöandMåns Rullgård ae550ce9eb configure: Make check_type handle type names containing spaces
Patch by Martin Storsjö <martin at martin st>

Originally committed as revision 21139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 14:22:29 +00:00
Martin StorsjöandRonald S. Bultje b827f4eb47 Currently, the replacement which is used if inet_aton isn't available,
only works correctly on little-endian. The attached patch makes it endian
independent.

Patch by Martin Storsjö <$firstname()$firstname,st>.

Originally committed as revision 21080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 00:04:23 +00:00
Martin StorsjöandLuca Abeni 9ea7f03aa0 Always set the destination address even if no port was found.
Patch by Martin Storsjo (martin AT martin DOT st)

Originally committed as revision 21057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 08:24:44 +00:00
Martin StorsjöandLuca Abeni c47b0738b5 Check the URL used for the SDP destination.
Patch by Martin Storsjo (martin AT martin DOT st)

Originally committed as revision 21056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 08:11:56 +00:00
Martin StorsjöandKostya Shishkov 4aaebf78f5 Reply to RTMP ping with the same value as received by client.
Patch by Martin Storsjö ($name at $name dot \163\164)

Originally committed as revision 20881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 12:49:38 +00:00
Martin StorsjöandKostya Shishkov f8caa5441b 5l trocadero: don't forget to free packet in gen_connect()
Patch by Martin Storsjö ($name at $name dot `abbreviation for "street"`)

Originally committed as revision 20798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 15:31:58 +00:00
Martin StorsjöandKostya Shishkov 72b870b95b Do not try to interact with RTMP server after "stop" command was received.
Patch by Martin Storsjö ($name at $name dot `Sao Tome and Principe domain`)

Originally committed as revision 20797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 11:37:21 +00:00
Martin StorsjöandKostya Shishkov eec69b399a Do not compile ZLib data uncompressing function in TIFF decoder when ZLib is
not present.
Patch by Martin Storsjö
($firstname <at> $firstname <dot> two first letters of $lastname)

Originally committed as revision 20058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-27 09:43:11 +00:00
Martin StorsjöandMichael Niedermayer ff19d438dc Init i to 0 (10l fix).
Patch by Martin Storsjö / martin von martin aus st

Originally committed as revision 19855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 13:09:34 +00:00
Martin StorsjöandDiego Biurrun b126dee964 Use all 32 bits of the timestamp when calculating flv duration.
At the moment, duration is mainly set from the metadata packet. If that is not
available, the fallback is checking the low 24 bits of the last packet. This is
not enough for files over 4,6 hours in length, so read all 32 bits instead.
patch by Martin Storsjö, martin martin st

Originally committed as revision 19791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 10:49:51 +00:00
Martin StorsjöandBenoit Fouet 9d3f4f5070 Fix typo in MinGWCE support in configure.
Patch by Martin Storsjö and Måns.

Originally committed as revision 19523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-28 08:50:58 +00:00
Martin StorsjöandDiego Biurrun 1aa71e258d MinGWCE support in configure; networking is disabled for now.
patch by Martin Storsjö, martin martin st and Ismail Dönmez, ismail namtrac org

Originally committed as revision 19521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 16:14:57 +00:00
Martin StorsjöandDiego Biurrun e9a832e508 Change type of received_sigterm variable from sig_atomic_t to int,
which is more portable (works on Windows CE).
patch by Martin Storsjö, martin martin st

Originally committed as revision 19515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 13:01:44 +00:00
Martin StorsjöandDiego Biurrun e21a892163 Conditionally compile ELF-specific ARM assembly bits that fail on Windows CE.
patch by Martin Storsjö, martin martin st

Originally committed as revision 19514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 12:53:44 +00:00
Martin StorsjöandBenoit Fouet fbf7e805b0 Only consider -1 as an error return value for open().
This is:
 - what Posix says (-1 on error, >=0 on success)
 - fixing a bug on winCE (<0 sometimes)

Patch by Martin Storsjö: martin martin st

Originally committed as revision 19513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 12:36:22 +00:00
Martin StorsjöandRamiro Polla a2f4324bb6 Check for HAVE_ISATTY.
Patch by Martin Storsjö <martin at martin dot st>

Originally committed as revision 19505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-24 00:13:59 +00:00
Martin StorsjöandRamiro Polla abfc8d056e Check for the isatty function.
Patch by Martin Storsjö <martin at martin dot st>

Originally committed as revision 19504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-24 00:12:55 +00:00
Martin StorsjöandDiego Biurrun 1eb0811e8d Update project URL for OpenCORE AMR.
patch by Martin Storsjö, martin martin st

Originally committed as revision 19441 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-16 16:12:57 +00:00
Martin StorsjöandRamiro Polla 2b2c2a8179 Fix check_func_headers. The reference to the function under test was being
optimized out by gcc when the headers lied about the function existing,
rendering the test useless in that situation.
This new test throws a warning in mingw-w64, but that should not be a problem.
Patch by Martin Storsjö <martin at martin dot st>

Originally committed as revision 19440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-16 16:02:50 +00:00
Martin StorsjöandDiego Biurrun 73c1326809 Use ff_neterrno instead of errno in tcp.c.
If ff_neterrno() is checked instead of errno, that's probably what should be
used in the return value.
As a sideeffect, this gives better compatibility with Windows (CE), where
network errors aren't visible in errno.)
patch by Martin Storsjö, martin martin st

Originally committed as revision 19433 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-15 05:52:49 +00:00
Martin StorsjöandDiego Biurrun f4c1387249 Improve linker check for Winsock library name.
On Windows CE, the Winsock library name is ws2, not ws2_32.
patch by Martin Storsjö, martin martin st

Originally committed as revision 19431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-14 14:02:09 +00:00
Martin StorsjöandRamiro Polla b9349ff4ca Install the mingw import libraries, too.
Patch by Martin Storsjö <martin at martin dot st>

Originally committed as revision 19427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-13 21:59:26 +00:00
Martin StorsjöandRamiro Polla 336cc1b0ee Enable creation of microsoft-style import libraries on arm.
Patch by Martin Storsjö <martin at martin dot st>

Originally committed as revision 19426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-13 19:08:27 +00:00
Martin StorsjöandBenoit Fouet a2ce9a9914 Use IF1 frame sizes in AMR-WB.
Patch by Martin Storsjö: martin (remove that) at martin (oh and this too) st

Originally committed as revision 18880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-20 08:57:32 +00:00
Martin StorsjöandCarl Eugen Hoyos 3ac56e28b0 Move img_convert_ctx to VideoState and free it in stream_close().
Patch by Martin Storsjö, martin martin st

Originally committed as revision 18854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 10:29:55 +00:00
Martin StorsjöandCarl Eugen Hoyos 7c5ab14540 Add missing frees to stream_close() and do_exit().
Patch by Martin Storsjö, martin martin st

Originally committed as revision 18853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 10:26:41 +00:00
Martin StorsjöandDiego Biurrun 29382bc1eb Check for Decoder_Interface_init() instead of Speech_Decode_Frame_init() when
trying to enable libamrnb support. The latter function is actually used.
patch by Martin Storsjö, martin martin st

Originally committed as revision 18526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-15 17:29:20 +00:00
Martin StorsjöandLuca Abeni 2b12317a90 Fix documentation for the "-ps" option
Patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-09 21:52:12 +00:00
Martin StorsjöandLuca Abeni d2ce53b786 Fix two checks in the AAC packetiser, which were too conservative
Patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-09 21:37:11 +00:00
Martin StorsjöandLuca Abeni 08e696c0b2 Add support for AMR audio in the RTP muxer
patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-08 07:16:14 +00:00
Martin StorsjöandLuca Abeni 9edfaf3c6c Add support for H.263 video in the RTP muxer
patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 06:41:55 +00:00
Martin StorsjöandLuca Abeni 99f373f3a6 Only insert the SPS and PPS NALs in sprop-parameter-sets
Patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-06 21:04:26 +00:00
Martin StorsjöandAndreas Öman 916ff02261 Fix memory leak in libgsm wrapper.
Patch by Martin Storsjö, martin at martin dot st

Originally committed as revision 15798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-10 20:02:00 +00:00
Martin StorsjöandBaptiste Coudurier 4027ed1d06 fix bug when __GNUC__ isn't defined and when compiling for a non-x86 architecture, patch by Martin Storsjö, martin at martin st
Originally committed as revision 7261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08 13:25:37 +00:00