virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
35,365 Commits 37 Branches 400 Tags 460 MiB
7a12d97eb1
Commit Graph

441 Commits

Author SHA1 Message Date
Diego Biurrun
11d4e92ed9 avformat: Remove non-compiling and/or silly commented-out printf/av_log statements 2012-10-01 10:24:28 +02:00
Martin Storsjö
e6153f173a avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-04 23:13:44 +03:00
Martin Storsjö
d58dd4b5b5 avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-04 23:13:38 +03:00
Martin Storsjö
124134e424 avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-04 23:13:32 +03:00
Martin Storsjö
125c6c0752 rtsp: Free the rtpdec context properly 
The condition for calling the rtpdec cleanup was broken in
df8cf076c8.

This fixes a memory leak.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-08-27 12:29:47 +03:00
Jordi Ortiz
e7993ece9b rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle() 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-08-17 22:15:46 +03:00
Martin Storsjö
1243c72251 rtsp: Support mpegts in raw udp packets 
This is basically the same way as mpegts packets are parsed in
rtpdec.c.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-08-09 00:25:57 +03:00
Martin Storsjö
df8cf076c8 rtsp: Support receiving plain data over UDP without any RTP encapsulation 
EvoStream Media Server can serve data in this format, and
VLC/live555 already supports it.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-08-09 00:25:15 +03:00
Anton Khirnov
36ef5369ee Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
Diego Biurrun
6774247a9d avformat: Drop pointless "format" from container long names 2012-07-30 13:59:06 +02:00
Anton Khirnov
c4ef6a3e4b Add missing libavutil/time.h includes. 2012-07-28 09:02:07 +02:00
Ronald S. Bultje
5354a904fe rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro. 
This makes usage of the macro look more natural when
used with array entries.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-07-21 15:35:01 -04:00
Jordi Ortiz
a8ad6ffafe rtsp: Add listen mode 
This makes the RTSP demuxer act as a server, listening for an
incoming connection.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-10 22:00:28 +03:00
Jordi Ortiz
6e71c1202b rtsp: Make rtsp_open_transport_ctx() non-static 
This is required for the upcoming RTSP listen mode.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-10 21:21:19 +03:00
Jordi Ortiz
45b068580b rtsp: Parse the mode=receive/record parameter in transport lines 
We need to support the nonstandard mode=receive, for compatibility
with older libavformat clients.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-10 21:20:04 +03:00
Mans Rullgard
6501dcfb5e Remove unnecessary inclusions of [sys/]time.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-06-20 11:46:46 +01:00
Martin Storsjö
bbc8038614 rtsp: Send mode=record instead of mode=receive 
This seems to be the correct mode to send, according to the
original RTSP RFC, and matches the method RECORD which is
sent later when starting to send data.

Darwin Streaming Server works fine with either of them.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-18 21:35:28 +03:00
Martin Storsjö
6099543ad4 rtsp: Check for dynamic payload handlers if no static payload mapping was found 
Some systems abuse the static payload types 35 or 36 (which
according to IANA are unassigned) for H264.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 21:58:18 +03:00
Martin Storsjö
68c813081b rtpenc_chain: Return an error code instead of just a plain pointer 
Also check the return value in sapenc.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 13:35:44 +03:00
Jordi Ortiz
fcd0298c05 rtsp: Add content-type message header parsing 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-05-08 10:18:35 -07:00
Mans Rullgard
ddce7dabd2 rtsp: avoid const warnings from strtol() call 
The strtol() interface makes it difficult to use with
const-qualified pointers.  With this change, although
the const is still lost, the compiler does not warn
about it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-06 12:04:25 +01:00
Martin Storsjö
62c3c8ca78 rtsp: Don't use uninitialized data if there are no streams 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-04-08 15:51:32 +03:00
Martin Storsjö
456001486e rtsp: Don't expose the MS-RTSP RTX data stream to the caller 
This avoids exposing a dummy AVStream which won't get any data
and which will make avformat_find_stream_info wait for info about
this stream.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-04-08 12:04:22 +03:00
Diego Biurrun
a92be9b856 Replace memset(0) by zero initializations. 
Also remove one pointless zero initialization in rangecoder.c.
 2012-03-28 09:38:33 +02:00
Martin Storsjö
ccfa8aa26f rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers 
This enables reordering of UDP packets by default, unless the caller
explicitly sets -max_delay 0.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-20 10:53:49 +02:00
Martin Storsjö
4fa57d524f libavformat: Set the default for the max_delay option to -1 
Make the muxers/demuxers that use the field handle the default
-1 in the same way as 0.

This allows distinguishing an intentionally set 0 from the default
value where the user hasn't set it.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-20 10:53:47 +02:00
Martin Storsjö
17934c1824 cosmetics: Align some AVInput/OutputFormat declarations 
Also add missing trailing commas.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-19 14:27:43 +02:00
Martin Storsjö
2f96cc1fc4 rtsp: Retry authentication if failed due to being stale 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-13 10:36:18 +02:00
Martin Storsjö
705eeb5eca rtsp: Fix a typo 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-12 16:27:00 +02:00
Martin Storsjö
6294d708b8 rtsp: Only set the ttl parameter if the server actually gave a value 
Passing ttl=0 to the rtp/udp url contexts makes packets never
leave the host machine.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-09 15:04:32 +02:00
Tommy Winther
1a6b9a98ce rtsp: Handle requests from server to client 
This returns 200 OK for OPTIONS requests and 501 Not Implemented
for all other requests.

Even though this doesn't do much actual handling of the requests,
it makes the code properly identify server requests as such, instead
of interpreting it as a reply to the client's request as it did
before.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-27 12:04:11 +02:00
Martin Storsjö
c2ff63e3ac rtpenc: Move the trailing comma into FF_RTP_FLAG_OPTS 
This simplifies adding more flags to the macro.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-23 15:27:42 +02:00
Martin Storsjö
298a587f44 rtp: Factorize the check for distinguishing RTCP packets from RTP 
The binary doesn't change after this patch.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-16 17:45:33 +01:00
Martin Storsjö
f3a094f2da sdp: Ignore RTCP packets when autodetecting RTP streams 
The rtp demuxer which listens for RTP packets and detects the
RTP payload type will currently get confused if the first packet
received is an RTCP packet. Thus ignore such packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-16 16:14:35 +01:00
Diego Biurrun
a846202343 rtsp: Remove some unused variables from ff_rtsp_connect(). 2012-01-30 10:19:47 +01:00
Alex Converse
7181c4edee cosmetics: Remove extra newlines at EOF 2012-01-27 17:19:09 -08:00
Anton Khirnov
adad5b88f8 lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft 2012-01-27 10:52:43 +01:00
Anton Khirnov
6e9651d106 lavf: remove AVFormatParameters from AVFormatContext.read_header signature 2012-01-27 10:51:57 +01:00
Dmitry Volyntsev
58f0978581 rtsp: Use a random offset for trying to open UDP ports for RTP 
This avoids (for all practical cases) the issue of reusing
the same UDP port as for an earlier connection. If the remote
doesn't know the previous session was closed, he might keep
on sending packets to that port. If we always start off trying
to open the same UDP port, we might get those packets intermixed
with the new ones.

This is occasionally an issue when testing RTSP stuff with
DSS, perhaps also with other servers.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-01-22 01:10:03 +02:00
Martin Storsjö
dbb06b8c0d rtsp: Allow specifying the UDP port range via AVOptions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-01-22 01:10:02 +02:00
Dmitry Volyntsev
bc495bad3d rtsp: Remove a leftover, currently pointless check 
This check isn't relevant in the way the code currently works.

Also change a case of if (x == 0) into if (!x).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-01-22 01:10:00 +02:00
Jean First
4be386b318 rtsp: Fix compiler warning for uninitialized variable 
This one won't ever be used uninitialized in practice, but
the compiler doesn't realize it.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-01-04 22:15:42 +02:00
Anton Khirnov
cd3716b9aa Replace all uses of av_close_input_file() with avformat_close_input(). 2011-12-12 20:34:38 +01:00
Anton Khirnov
3a7f7678eb lavf: deprecate av_close_input_stream(). 
And remove all its uses.
 2011-12-12 20:21:47 +01:00
Martin Storsjö
30266038bd rtsp: Initialize the media_type_mask in the rtp guessing demuxer 
The media_type_mask is initialized via AVOptions for the
rtsp and sdp demuxers, but it isn't available as an option
for the rtp guessing demuxer (since it doesn't really make
sense there). Therefore, it must be manually initialized
instead, since a zero value means no media types at all
are accepted.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-02 11:52:47 +02:00
Anton Khirnov
c3f9ebf743 lavf: make av_set_pts_info private. 
It's supposed to be called only from (de)muxers.
 2011-11-30 20:34:45 +01:00
Martin Storsjö
2583660664 rtpdec: Add an init function that can do custom codec context initialization 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-30 17:32:18 +02:00
Anton Khirnov
ddffc2fdc3 avio: add support for passing options to protocols. 
Not used anywhere yet, support for passing options from avio_open() will
follow.
 2011-11-13 13:14:39 +01:00
Martin Storsjö
6f1b7b3944 avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc 
Change all uses of these function to pass the relevant
callback on.
 2011-11-13 13:12:17 +01:00
Martin Storsjö
9957cdbfd5 avformat: Use ff_check_interrupt 2011-11-13 13:08:13 +01:00