6aa4e88106
mmst: Use AVUNERROR() to convert error codes to the right range for strerror
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-06-19 20:23:19 +03:00
32b83aeec1
avio: Add an URLProtocol flag for indicating that a protocol uses network
...
This definition is in two files, since the definitions will move
to the private header at the next bump.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-01-05 23:56:52 +02:00
8fd35b1aac
Fix a bunch of typos.
2012-01-02 16:41:25 +01:00
c3b05d2159
proto: Realign struct initializers
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-12-01 13:47:28 +02:00
7e58050590
proto: Use .priv_data_size to allocate the private context
...
This simplifies the open functions by avoiding one function
call that needs error checking, reducing the amount of
extra bulk code.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-12-01 13:47:26 +02:00
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
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
59d96941f0
avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
...
Make AVIO_FLAG_ access constants work as flags, and in particular fix
the behavior of functions (such as avio_check()) which expect them to
be flags rather than modes.
This breaks API.
2011-04-19 19:47:58 +02:00
f35ff97f2e
lavf: use designated initializers for all protocols
...
This is more readable and makes it easier to reorder URLProtocol
members.
2011-04-08 11:08:26 +02:00
f87b1b373a
avio: AVIO_ prefixes for URL_ open flags.
2011-04-07 18:07:16 +02:00
6e37b45888
mmst: get rid of deprecated AVERRORs
2011-04-06 14:10:08 +02:00
e52a9145c8
avio: make url_close() internal.
2011-04-04 17:45:20 +02:00
925e908bc7
avio: make url_write() internal.
2011-04-04 17:45:20 +02:00
dce3756459
avio: make url_read_complete() internal.
2011-04-04 17:45:20 +02:00
0589da0aa5
avio: make url_open() internal.
2011-04-04 17:45:20 +02:00
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
e731b8d872
avio: move init_put_byte() to a new private header and rename it
...
init_put_byte should never be used outside of lavf, since
sizeof(AVIOContext) isn't part of public ABI.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:31 -05:00
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:15 -05:00
275189a2bd
mmst: fix reading uninitialized data for ping packets.
...
Fixes errors after a few minutes (first ping) when playing back
mmst://wm.bbc.co.uk/wms/bbc7coyopa/bbc7_-_friday_0430.wma
2011-02-14 09:55:14 -05:00
70630e35a4
mmst: print packet type with error status code message
...
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-13 16:49:39 -05:00
dfd2a005eb
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
2011-01-29 23:55:37 +01:00
c6610a216e
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-26 22:10:09 +00:00
dccbd97d72
lavf: move ff_put_str16_nolen from asf to avio and rename it
...
It will be useful in the mp3 muxer.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 20:21:51 +00:00
42f9582d8d
Set proper error if server flags indicate that it doesn't support mmst. This
...
prevents a read-after-close-induced segfault later. Fixes issue 2266.
Patch by qrtt1 <chingyichan dot tw gmail com>.
Originally committed as revision 25349 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-05 14:04:46 +00:00
67197656d1
Remove use of MAX_STREAMS in MMSContext->streams[] array. Instead, dynamically
...
allocate the array.
Originally committed as revision 24794 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-13 17:30:01 +00:00
99ab8ff049
Fix wrong command prefix for timing test in MMST protocol.
...
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-13 17:02:37 +00:00
fcd11c61ea
Move functions and structs shared between MMSH and MMST into their own file,
...
mms.c. Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 22:50:17 +00:00
edce93536a
Extract fields that are to be shared between MMST/MMSH into a common struct,
...
MMSContext. The other MMST-specific members go into MMSTContext.
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24778 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 22:43:54 +00:00
a46cd6e141
Use FFALIGN() in mmst.c where appropriate. Noticed by Benoit Fouet.
...
Originally committed as revision 24777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 22:27:29 +00:00
aaa91aa00e
Move read_mms_packet() code to be inlined in the calling function.
...
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 22:34:43 +00:00
05fc9a1bcf
Remove is_playing variable.
...
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 22:33:38 +00:00
b949875bf6
Move send_media_packet_request() and clear_stream_buffers() up.
...
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 22:32:43 +00:00
db9cc3a55a
Reindent after r24516.
...
Originally committed as revision 24517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 22:22:42 +00:00
e87b7d72c6
Use inverse error branches, i.e. instead of if(something){success} else {error},
...
use if(!something) {return error;} success;, which needs less indenting.
Originally committed as revision 24516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 22:22:20 +00:00
540ab68c64
Use av_log(.., AV_LOG_ERROR) instead of dprintf() for logging errors. This
...
should help in making mmst a little more userfriendly, or at least debuggable.
Also use helpful error return values instead of -1.
Originally committed as revision 24515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 22:21:14 +00:00
e4a28be67b
Allow the ASF header to be transferred split over multiple packets, as some
...
servers happen to do. For this, we also move several header-size-related
variables to the MMSTContext.
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 15:14:15 +00:00
d6cc1123e3
Explicitely set the size of the "ff_asf_head1_guid" header chunk, this is
...
part of the spec and causes problems otherwise.
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 15:11:44 +00:00
cbbb10810c
Align outgoing messages to 8 bytes, this is required to interact with
...
most servers. Also remove a case where we manually aligned to 8 bytes,
since this is now no longer needed.
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 15:07:31 +00:00
0c717a30e0
Fix a compile warning when compiling with DEBUG=1. The warning was:
...
format ‘%d’ expects type ‘int’, but argument 3 has type ‘uint64_t’
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 15:05:45 +00:00
9078eba062
Check the status code of each server responses, and fail if it indicates
...
a problem.
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 15:01:06 +00:00
414df121e0
Send a time test to the server, as the spec recommends.
...
Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 24357 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 14:59:23 +00:00
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
56023951be
Fix missing logging context in a series of dprintf()s. Partially based on
...
patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 23614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-15 14:24:19 +00:00
a24039861d
MMS-over-TCP protocol support. Patch by Zhentan Feng <spyfeng gmail com>.
...
Originally committed as revision 23301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 21:59:32 +00:00
Martin Storsjö
Diego Biurrun
Anton Khirnov
Stefano Sabatini
Mans Rullgard
Ronald S. Bultje
Francesco Cosoleto
Luca Barbato
Diego Elio Pettenò
qrtt1
Zhentan Feng